update nixvim, create disks and fish with home manager

modules/programs/neovim/keymaps.nix

@@ -30,6 +30,51 @@
         action = "<cmd>BufferLineCyclePrev<CR>";
         key = "<S-tab>";
       }
+      {
+        mode = [ "x" ];
+        action = "<gv";
+        key = "<";
+      }
+      {
+        mode = [ "x" ];
+        action = ">gv";
+        key = ">";
+      }
+      {
+        mode = [ "n" ];
+        action = ''"_d'';
+        key = "d";
+      }
+      {
+        mode = [ "n" ];
+        action = ''"_dd'';
+        key = "dd";
+      }
+      {
+        mode = [ "v" ];
+        action = ''"_d'';
+        key = "d";
+      }
+      {
+        mode = [ "v" ];
+        action = ''"_p'';
+        key = "p";
+      }
+      {
+        mode = [ "n" ];
+        action = "<cmd>Telescope live_grep<CR>";
+        key = "<leader>rg";
+      }
+      {
+        mode = [ "n" ];
+        action = "<cmd>Telescope find_files<CR>";
+        key = "<leader>ff";
+      }
+      {
+        mode = [ "n" ];
+        action = "<cmd>:lua vim.diagnostic.open_float<CR>";
+        key = "<leader>k";
+      }
     ];
   };
 }

modules/programs/neovim/neovim.nix

@@ -12,7 +12,7 @@
   ];
 
   programs.nixvim = {
-    enable = false;
+    enable = true;
     defaultEditor = true;
 
     clipboard.register = "unnamedplus";
@@ -26,50 +26,18 @@
       tabstop = 2;
       softtabstop = 2;
 
+      showmode = false;
+
       fillchars.eob = " ";
       ignorecase = true;
       smartcase = true;
       mouse = "a";
     };
 
-    # colorschemes.nightfox = {
-    #   enable = true;
-    #   settings = {
-    #     # style = "moon";
-    #     flavor = "carbonfox";
-    #     options.transparent = true;
-    #     styles = {
-    #       sidebars = "transparent";
-    #       floats = "transparent";
-    #     };
-    #   };
-    # };
-
-    colorschemes.base16 = {
-      enable = true;
-
-      settings = {
-        base00 = "11121d";
-        base01 = "282934";
-        base02 = "353747"; # slightly lighter than base01 (or reuse 282934)
-        base03 = "565b6b"; # comment color; you'll probably want to tweak this
-        base04 = "abb2bf";
-        base05 = "abb2bf";
-        base06 = "b2b9c6";
-        base07 = "ffffff";
-
-        base08 = "ee6d85";
-        base09 = "f3627a";
-        base0A = "dfae67";
-        base0B = "95c561";
-        base0C = "a485dd"; # no cyan in your palette, so purple works
-        base0D = "7199ee";
-        base0E = "a485dd";
-        base0F = "f3627a";
-      };
-    };
-
-    extraPlugins = [ pkgs.vimPlugins.boole-nvim ];
+    extraPlugins = with pkgs.vimPlugins; [
+      boole-nvim
+      tokyodark-nvim
+    ];
     extraConfigLua = ''
       require('boole').setup({
         mappings = {
@@ -81,6 +49,21 @@
           {'true', 'false'}
         }
       })
+
+      require('tokyodark').setup({
+        gamma = 0.9,
+        transparent_background = true,
+        terminal_colors = false,
+        custom_highlights = function(_, palette)
+            return {
+                ["@variable"] = {
+                    fg = "#A0A8CD",
+                },
+            }
+        end,
+      })
+
+      vim.cmd.colorscheme("tokyodark")
     '';
 
     plugins = {
@@ -91,7 +74,19 @@
           options = {
             show_buffer_close_icons = false;
             show_close_icon = false;
+            themable = true;
+            separator_style = "thin";
+            indicator.style = "none";
+            always_show_bufferline = false;
+            color_icons = true;
+            show_buffer_icons = true;
           };
+          # highlights = {
+          #   fill.bg = "NONE";
+          #   separator.fg = "NONE";
+          #   separator_selected.fg = "NONE";
+          #   separator_visible.fg = "NONE";
+          # };
         };
       };
       yazi.enable = true;
@@ -128,38 +123,12 @@
       };
       persisted.enable = true;
       render-markdown.enable = true;
-      transparent = {
+      oil = {
         enable = true;
-        autoLoad = true;
         settings = {
-          groups = [
-            "Normal"
-            "NormalNC"
-            "Comment"
-            "Constant"
-            "Special"
-            "Identifier"
-            "Statement"
-            "PreProc"
-            "Type"
-            "Underlined"
-            "Todo"
-            "String"
-            "Function"
-            "Conditional"
-            "Repeat"
-            "Operator"
-            "Structure"
-            "LineNr"
-            "NonText"
-            "SignColumn"
-            "CursorLine"
-            "CursorLineNr"
-            "StatusLine"
-            "StatusLineNC"
-            "EndOfBuffer"
-          ];
-
+          view_options = {
+            show_hidden = true;
+          };
         };
       };
     };