diff --git a/flake.nix b/flake.nix index 4e235d8..21ccad7 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; home-manager = { - url = "github:ISnortPennies/home-manager"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; spicetify-nix.url = "github:the-argus/spicetify-nix"; diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix index e1f821a..c3236fe 100644 --- a/home-manager/neovim/default.nix +++ b/home-manager/neovim/default.nix @@ -1,22 +1,10 @@ {pkgs, ... }: -let - luaRequire = module: - builtins.readFile (builtins.toString - ./config - + "/${module}.lua"); - luaConfig = builtins.concatStringsSep "\n" (map luaRequire [ - "init" - "lspconfig" - "nvim-cmp" - ]); -in { programs.neovim = { enable = true; viAlias = true; vimAlias = true; vimdiffAlias = true; - luaInit = true; extraPackages = with pkgs; [gcc ripgrep fd]; plugins = with pkgs.vimPlugins; [ (nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars)) #syntax highlighting @@ -46,6 +34,22 @@ in vim-moonfly #color scheme lightline-vim #bottom bar ]; - extraConfig = luaConfig; + extraConfig = let + luaRequire = module: + builtins.readFile (builtins.toString + ./config + + "/${module}.lua"); + luaConfig = builtins.concatStringsSep "\n" (map luaRequire [ + "init" + "lspconfig" + "nvim-cmp" + ]); +in '' +lua << EOF +${luaConfig} +EOF + +''; }; } + diff --git a/suckless/st/config.h b/suckless/st/config.h index 5a6b5e8..040bda3 100644 --- a/suckless/st/config.h +++ b/suckless/st/config.h @@ -65,7 +65,7 @@ static unsigned int blinktimeout = 0; /* * thickness of underline and bar cursors */ -static unsigned int cursorthickness = 1; +static unsigned int cursorthickness = 2; /* * enable smooth box drawing */ @@ -129,7 +129,7 @@ static const char *colorname[] = { /* more colors can be added after 255 to use with DefaultXX */ [256] = "#282a36", [257] = "#f8f8f2", - [258]= "#eeeeee", + [258] = "#eeeeee", [259] = "#080808", }; @@ -140,8 +140,8 @@ static const char *colorname[] = { */ unsigned int defaultfg = 258; unsigned int defaultbg = 259; -unsigned int defaultcs = 256; -static unsigned int defaultrcs = 257; +unsigned int defaultcs = 257; +static unsigned int defaultrcs = 256; /* * Default shape of cursor