changed back to main home-manager repo

This commit is contained in:
ISnortPennies 2022-09-23 15:47:52 -04:00
parent 532ae0d63e
commit ca947d62b9
3 changed files with 22 additions and 18 deletions

View file

@ -3,7 +3,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
home-manager = { home-manager = {
url = "github:ISnortPennies/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
spicetify-nix.url = "github:the-argus/spicetify-nix"; spicetify-nix.url = "github:the-argus/spicetify-nix";

View file

@ -1,22 +1,10 @@
{pkgs, ... }: {pkgs, ... }:
let
luaRequire = module:
builtins.readFile (builtins.toString
./config
+ "/${module}.lua");
luaConfig = builtins.concatStringsSep "\n" (map luaRequire [
"init"
"lspconfig"
"nvim-cmp"
]);
in
{ {
programs.neovim = { programs.neovim = {
enable = true; enable = true;
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;
vimdiffAlias = true; vimdiffAlias = true;
luaInit = true;
extraPackages = with pkgs; [gcc ripgrep fd]; extraPackages = with pkgs; [gcc ripgrep fd];
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
(nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars)) #syntax highlighting (nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars)) #syntax highlighting
@ -46,6 +34,22 @@ in
vim-moonfly #color scheme vim-moonfly #color scheme
lightline-vim #bottom bar 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
'';
}; };
} }

View file

@ -65,7 +65,7 @@ static unsigned int blinktimeout = 0;
/* /*
* thickness of underline and bar cursors * thickness of underline and bar cursors
*/ */
static unsigned int cursorthickness = 1; static unsigned int cursorthickness = 2;
/* /*
* enable smooth box drawing * enable smooth box drawing
*/ */
@ -140,8 +140,8 @@ static const char *colorname[] = {
*/ */
unsigned int defaultfg = 258; unsigned int defaultfg = 258;
unsigned int defaultbg = 259; unsigned int defaultbg = 259;
unsigned int defaultcs = 256; unsigned int defaultcs = 257;
static unsigned int defaultrcs = 257; static unsigned int defaultrcs = 256;
/* /*
* Default shape of cursor * Default shape of cursor