feat: update system

modules/home-manager/programs/nixvim/default.nix

@@ -68,55 +68,18 @@
       rust.enable = true;
       shell.enable = true;
     };
+    remaps = {
+      half-page-scroll.enable = true;
+      no-accidental-macro.enable = true;
+      paste-keep-buffer.enable = true;
+    };
   };
 
-  keymaps = [
-    {
-      key = "<leader>u";
-      mode = "n";
-      action = "<cmd>:UndotreeToggle<CR>";
-    }
-    # Find/Navigate
-    {
-      key = "J";
-      mode = "v";
-      action = ":m '>+1<CR>gv=gv";
-    }
-    {
-      key = "K";
-      mode = "v";
-      action = ":m '<-2<CR>gv=gv";
-    }
-
-    {
-      key = "<C-d>";
-      mode = "n";
-      action = "<C-d>zz";
-    }
-    {
-      key = "<C-u>";
-      mode = "n";
-      action = "<C-u>zz";
-    }
-    {
-      key = "<leader>p";
-      mode = "x";
-      action = ''"_dP'';
-    }
-    {
-      key = "<leader>p";
-      mode = "n";
-      action = ''"_dP'';
-    }
-    {
-      key = "<leader>p";
-      mode = "v";
-      action = ''"_dP'';
-    }
-  ];
-
   plugins = {
     leap.enable = true;
+    surround.enable = true;
+    which-key.enable = true;
+    schemastore.enable = true;
 
     lsp.servers = {
       html.enable = true;
@@ -128,10 +91,6 @@
       jsonls.enable = true;
       taplo.enable = true;
     };
-    which-key = {
-      enable = true;
-      registrations."<leader>p" = "Paste Keep Buffer";
-    };
 
     copilot-lua = {
       enable = true;

modules/home-manager/programs/nixvim/presets/base/syntax.nix

@@ -30,7 +30,10 @@ in
       illuminate.enable = lib.mkDefault true;
       nvim-autopairs.enable = lib.mkDefault true;
       nvim-colorizer.enable = lib.mkDefault true;
-      ts-autotag.enable = lib.mkDefault true;
+      ts-autotag = {
+        enable = lib.mkDefault true;
+        settings.opts.enable_close_on_slash = lib.mkDefault true;
+      };
     };
   };
 }

modules/home-manager/programs/nixvim/presets/default.nix

@@ -30,6 +30,10 @@
           ./languages/python.nix
           ./languages/rust.nix
           ./languages/shell.nix
+
+          ./remaps/half-page-scroll.nix
+          ./remaps/no-accidental-macro.nix
+          ./remaps/paste-keep-buffer.nix
         ];
       }
     );

modules/home-manager/programs/nixvim/presets/remaps/half-page-scroll.nix

@@ -0,0 +1,22 @@
+{ lib, config, ... }:
+let
+  cfg = config.presets.remaps.half-page-scroll;
+in
+{
+  options.presets.remaps.half-page-scroll = {
+    enable = lib.mkEnableOption "half page scroll";
+  };
+
+  config = lib.mkIf cfg.enable {
+    keymaps = [
+      {
+        key = "<C-d>";
+        action = "<C-d>zz";
+      }
+      {
+        key = "<C-u>";
+        action = "<C-u>zz";
+      }
+    ];
+  };
+}

modules/home-manager/programs/nixvim/presets/remaps/no-accidental-macro.nix

@@ -0,0 +1,19 @@
+{ lib, config, ... }:
+let
+  cfg = config.presets.remaps.no-accidental-macro;
+in
+{
+  options.presets.remaps.no-accidental-macro = {
+    enable = lib.mkEnableOption "no accidental macro";
+  };
+
+  config = lib.mkIf cfg.enable {
+    keymaps = [
+      {
+        key = "Q";
+        mode = "n";
+        action = "<nop>";
+      }
+    ];
+  };
+}

modules/home-manager/programs/nixvim/presets/remaps/paste-keep-buffer.nix

@@ -0,0 +1,27 @@
+{ lib, config, ... }:
+let
+  cfg = config.presets.remaps.paste-keep-buffer;
+in
+{
+  options.presets.remaps.paste-keep-buffer = {
+    enable = lib.mkEnableOption "paste in visual keeps the buffer";
+  };
+
+  config = lib.mkIf cfg.enable {
+    keymaps = [
+      {
+        key = "p";
+        mode = "v";
+        action = ''"_dP'';
+      }
+      {
+        key = "<leader>p";
+        action = ''"_dP'';
+      }
+    ];
+    plugins.which-key = {
+      enable = true;
+      registrations."<leader>p" = "Paste Keep Buffer";
+    };
+  };
+}

modules/home-manager/programs/nixvim/presets/undotree.nix

@@ -13,6 +13,13 @@ in
         "os.getenv('HOME') .. '/.config/nvim/undodir'";
       undofile = true;
     };
+    keymaps = [
+      {
+        key = "<leader>u";
+        mode = "n";
+        action = "<cmd>:UndotreeToggle<CR>";
+      }
+    ];
     plugins = {
       undotree.enable = true;
       which-key.registrations."<leader>u" = "Undotree";