more work on neovim config, added keyboard sound thing for kitty

modules/home/programs/nixvim/keymaps.nix

@@ -52,9 +52,94 @@
         mode = [ "n" "t" ];
       }
       {
-        action = "<cmd>COQnow<CR>";
-        key = "!cq";
-        mode = "n";
+        action = "<cmd>lua require('treesj').toggle()<CR>";
+        key = "<space>j";
+        mode = [ "n" ];
+      }
+      {
+        action = "<C-\\><C-n>";
+        key = "<C-e>";
+        mode = [ "t" ];
+      }
+      {
+        action = ''"+y'';
+        key = "<space>y";
+        mode = [ "n" "x" ];
+      }
+      {
+        action = ''"+p'';
+        key = "<space>p";
+        mode = [ "n" "x" ];
+      }
+      {
+        action.__raw = /*lua*/''function() require('opencode').prompt('test', {submit=true}) end'';
+        key = "<space>at";
+        mode = [ "n" "x" ];
+      }
+      {
+        action.__raw = /*lua*/''function() require('opencode').select() end'';
+        key = "<space>as";
+        mode = [ "n" "x" ];
+      }
+      {
+        action.__raw = /*lua*/''function() require('opencode').prompt('document', {submit=true}) end'';
+        key = "<space>ad";
+        mode = [ "n" "x" ];
+      }
+      {
+        action.__raw = /*lua*/''function() require('opencode').prompt('review', {submit=true}) end'';
+        key = "<space>ar";
+        mode = [ "n" "x" ];
+      }
+      {
+        action.__raw = /*lua*/''function() require('opencode').prompt('fix', {submit=true}) end'';
+        key = "<space>af";
+        mode = [ "n" "x" ];
+      }
+      {
+        action.__raw = /*lua*/''function() require('opencode').ask("@this ", {submit=true}) end'';
+        key = "<space>aa";
+        mode = [ "n" "x" ];
+      }
+      {
+        action.__raw = /*lua*/''function() require('opencode').explain("@this ") end'';
+        key = "<space>ae";
+        mode = [ "n" "x" ];
+      }
+      {
+        action.__raw = /*lua*/''function() require('opencode').command("session.half.page.up") end'';
+        key = "<C-S-u>";
+        mode = [ "n" "x" ];
+      }
+      {
+        action.__raw = /*lua*/''function() require('opencode').command("session.half.page.down") end'';
+        key = "<C-S-d>";
+        mode = [ "n" "x" ];
+      }
+      {
+        action.__raw = /*lua*/''function() require('opencode').command("prompt.clear") end'';
+        key = "<C-c>";
+        mode = [ "n" "x" ];
+      }
+      {
+        action.__raw = /*lua*/''function() require('opencode').operator("@this ") end'';
+        key = "go";
+        mode = [ "n" "x" ];
+      }
+      {
+        action.__raw = /*lua*/''function() return require('opencode').operator("@this ") .. "_" end'';
+        key = "goo";
+        mode = [ "n" ];
+      }
+      {
+        action = "<cmd>lua require('opencode').toggle()<CR>";
+        key = "<C-.>";
+        mode = [ "n" "t" ];
+      }
+      {
+        action = "<cmd>lua require('opencode').select()<CR>";
+        key = "<C-n>";
+        mode = [ "n" "x" ];
       }
     ];
   };

modules/home/programs/nixvim/plugins/airline.nix

@@ -1,7 +1,7 @@
 {
   programs.nixvim = {
     plugins.airline = {
-      enable = true;
+      enable = false;
       settings = {
         left_sep = "";
         right_sep = "";

modules/home/programs/nixvim/plugins/bufferline.nix

@@ -0,0 +1,12 @@
+{
+  programs.nixvim = {
+    plugins.bufferline = {
+      enable = true;
+      settings = {
+        options = {
+          separator_style = "slant";
+        };
+      };
+    };
+  };
+}

modules/home/programs/nixvim/plugins/copilot.nix

@@ -1,9 +1,17 @@
 {
-  programs.nixvim.plugins.copilot-lua = {
-    enable = true;
-    settings = {
-      suggestion = {
-        auto_trigger = false;
+  programs.nixvim = {
+    plugins = {
+      copilot-lua = {
+        enable = true;
+        settings = {
+          suggestion = {
+            auto_trigger = false;
+          };
+        };
+      };
+
+      opencode = {
+        enable = true;
       };
     };
   };

modules/home/programs/nixvim/plugins/default.nix

@@ -4,7 +4,12 @@
   imports = [
     ./otter.nix
     ./treesitter.nix
+    ./bufferline.nix
     ./alpha.nix
+    ./mini.nix
+    ./wtf.nix
+    ./snacks.nix
+    ./noice.nix
     ./haskell.nix
     ./vim-matchup.nix
     # ./coq.nix
@@ -14,7 +19,7 @@
     ./lsp.nix
     ./rustaceanvim.nix
     ./fidget.nix
-    # ./lualine.nix
+    ./lualine.nix
     ./airline.nix
     ./nvim-lightbulb.nix
     ./neocord.nix

modules/home/programs/nixvim/plugins/extra_plugins.nix

@@ -11,15 +11,6 @@
           hash = "sha256-Upx29rIPwW/e7Lkmf0PNOpIACnAXIzlkfa6V1p2nYHM=";
         };
       })
-      (pkgs.vimUtils.buildVimPlugin {
-        name = "vim-sneak";
-        src = pkgs.fetchFromGitHub {
-          owner = "justinmk";
-          repo = "vim-sneak";
-          rev = "c13d0497139b8796ff9c44ddb9bc0dc9770ad2dd";
-          hash = "sha256-ndWhnV0fgCcqCGwVyM07GfmUB3CitBZbOWvZtsB1tBk=";
-        };
-      })
       (pkgs.vimUtils.buildVimPlugin {
         name = "vim-slash";
         src = pkgs.fetchFromGitHub {

modules/home/programs/nixvim/plugins/fidget.nix

@@ -1,6 +1,6 @@
 {
   programs.nixvim.plugins.fidget = {
-    enable = true;
+    enable = false;
     settings = {
       notification = {
         overrideVimNotify = true;

modules/home/programs/nixvim/plugins/lsp.nix

@@ -84,7 +84,7 @@
             installRustc = false;
             settings = {
               check = {
-                allTargets = false;
+                allTargets = true;
                 command = "clippy";
               };
             };
@@ -99,9 +99,9 @@
               options = {
                 # uses Xenon config because it has every option exposed to it
                 nixos.expr = ''
-                  (builtins.getFlake "github:pagedMov/nixos-config").nixosConfigurations.xenon.options'';
+                  (builtins.getFlake "github:pagedMov/nixos-config").nixosConfigurations.phosphorous.options'';
                 home.expr = ''
-                  (builtins.getFlake "github:pagedMov/nixos-config").homeConfigurations.xenonHome.options'';
+                  (builtins.getFlake "github:pagedMov/nixos-config").homeConfigurations.phospohorousHome.options'';
               };
             };
           };

modules/home/programs/nixvim/plugins/lualine.nix

@@ -1,7 +1,7 @@
 {
   programs.nixvim = {
     plugins.lualine = {
-      enable = false;
+      enable = true;
       settings = {
         options = {
           icons_enabled = true;
@@ -15,7 +15,7 @@
             right = "";
           };
           always_divide_middle = true;
-          globalstatus = false;
+          globalstatus = true;
           refresh = {
             statusline = 1000;
             tabline = 1000;

modules/home/programs/nixvim/plugins/mini.nix

@@ -0,0 +1,8 @@
+{
+  programs.nixvim = {
+    plugins = {
+      mini-align = { enable = true; };
+      mini-clue = { enable = true; };
+    };
+  };
+}

modules/home/programs/nixvim/plugins/noice.nix

@@ -0,0 +1,33 @@
+{
+  programs.nixvim = {
+    plugins.noice = {
+      enable = true;
+      settings = {
+        views = {
+          popupmenu = {
+            relative = "cursor";
+            position = {
+              row = -2;
+              col = -2;
+            };
+            size = {
+              width = 60;
+              height = "auto";
+            };
+          };
+          cmdline_popup = {
+            relative = "cursor";
+            position = {
+              row = 0;
+              col = -2;
+            };
+            size = {
+              width = 60;
+              height = "auto";
+            };
+          };
+        };
+      };
+    };
+  };
+}

modules/home/programs/nixvim/plugins/plugins.nix

@@ -8,6 +8,8 @@
       helpview.enable = true;
       floaterm.enable = true;
       fugitive.enable = true;
+      hop.enable = true;
+      wilder.enable = true;
       indent-blankline.enable = true;
       lastplace.enable = true;
       markdown-preview.enable = true;

modules/home/programs/nixvim/plugins/rustaceanvim.nix

@@ -7,6 +7,7 @@
       server = {
         auto_attach = true;
         default_settings = {
+          cfgOverride.test = true;
           checkOnSave.command = "clippy";
         };
       };

modules/home/programs/nixvim/plugins/snacks.nix

@@ -0,0 +1,7 @@
+{
+  programs.nixvim = {
+    plugins.snacks = {
+      enable = true;
+    };
+  };
+}

modules/home/programs/nixvim/plugins/treesitter.nix

@@ -2,14 +2,11 @@
   programs.nixvim = {
     plugins.treesitter = {
       enable = true;
-      folding = {
-        enable = true;
-      };
-      indent = {
-        enable = true;
-      };
-      highlight = {
-        enable = true;
+    };
+    plugins.treesj = {
+      enable = true;
+      settings = {
+        use_default_keymaps = false;
       };
     };
   };

modules/home/programs/nixvim/plugins/wtf.nix

@@ -0,0 +1,10 @@
+{
+  programs.nixvim = {
+    plugins.wtf = {
+      enable = true;
+      options = {
+        context = true;
+      };
+    };
+  };
+}