Update to 24.11pre

Update to nixpkgs past 24.05
Update hm unstable
Update nur
Replace nixneovim with nixvim
This commit is contained in:
Greg Hellings
2024-06-10 11:09:40 -05:00
parent b6cc370795
commit efedbbd39b
6 changed files with 216 additions and 201 deletions
+4 -1
View File
@@ -3,9 +3,12 @@
host ? "most",
...}:
let
system = pkgs.system;
in
{
imports = [
inputs.nixneovim.nixosModules.default
inputs.nixvim.homeManagerModules.default
./modules
./ansible.nix
./bash.nix
+24 -16
View File
@@ -27,9 +27,9 @@ in
pyright
];
programs.nixneovim = {
programs.nixvim = {
enable = true;
colorscheme = "gruvbox";
colorschemes.gruvbox.enable = true;
globals = {
indent_guides_enable_on_vim_startup = 1;
nix_recommended_style = 0;
@@ -40,7 +40,7 @@ in
"\\.class$"
];
};
options = {
opts = {
background = "dark";
backup = false;
copyindent = true;
@@ -68,22 +68,30 @@ in
wrap = false;
writebackup = false;
};
mappings = {
normalVisualOp = {
"<C-e>" = ''"<Esc>:BufExplorer<CR>"'';
"<C-t>" = ''"<Esc>:NERDTreeToggle<CR>"'';
"<F6>" = ''"<Esc>:Files<CR>"'';
"<C-j>" = ''"<C-w>j<C-w><CR>"'';
"<C-k>" = ''"<C-w>k<C-w><CR>"'';
"<C-h>" = ''"<C-w>h<C-w><CR>"'';
"<C-l>" = ''"<C-w>l<C-w><CR>"'';
"<C-o>" = ''":GFiles?<CR>"'';
};
};
keymaps = let
winMove = key: { mode = "n"; key = "<C-${key}>"; action = "<C-w>${key}<C-w><CR>"; };
in [ {
mode = "n";
key = "<C-e>";
action = "<Esc><leader>BufExplorer<CR>";
} {
mode = "n";
key = "<C-t>";
action = "<Esc><leader>NERDTreeToggle<CR>";
} {
mode = "n";
key = "<C-o>";
action = "<leader>GFiles?<CR>";
}
(winMove "h")
(winMove "j")
(winMove "k")
(winMove "l")
];
plugins = {
airline = {
enable = true;
theme = "gruvbox";
settings.theme = "gruvbox";
};
gitgutter.enable = true;
fugitive.enable = true;