Merge branch 'NotAShelf:main' into feature-language-tex

modules/plugins/git/git-conflict/git-conflict.nix

@@ -12,10 +12,10 @@ in {
     setupOpts = mkPluginSetupOption "git-conflict" {};
 
     mappings = {
-      ours = mkMappingOption "Choose Ours [Git-Conflict]" "co";
-      theirs = mkMappingOption "Choose Theirs [Git-Conflict]" "ct";
-      both = mkMappingOption "Choose Both [Git-Conflict]" "cb";
-      none = mkMappingOption "Choose None [Git-Conflict]" "c0";
+      ours = mkMappingOption "Choose Ours [Git-Conflict]" "<leader>co";
+      theirs = mkMappingOption "Choose Theirs [Git-Conflict]" "<leader>ct";
+      both = mkMappingOption "Choose Both [Git-Conflict]" "<leader>cb";
+      none = mkMappingOption "Choose None [Git-Conflict]" "<leader>c0";
       prevConflict = mkMappingOption "Go to the previous Conflict [Git-Conflict]" "]x";
       nextConflict = mkMappingOption "Go to the next Conflict [Git-Conflict]" "[x";
     };

modules/plugins/hydra/config.nix

@@ -0,0 +1,22 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  cfg = config.vim.hydra;
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      startPlugins = [];
+      lazy.plugins.hydra = {
+        package = "hydra.nvim";
+        setupModule = "hydra";
+        inherit (cfg) setupOpts;
+
+        event = ["DeferredUIEnter"];
+        cmd = ["MCstart" "MCvisual" "MCclear" "MCpattern" "MCvisualPattern" "MCunderCursor"];
+      };
+    };
+  };
+}

modules/plugins/hydra/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./hydra.nix
+    ./config.nix
+  ];
+}

modules/plugins/hydra/hydra.nix

@@ -0,0 +1,7 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
+in {
+  options.vim.utility.hydra = {
+    enable = mkEnableOption "utility for creating custom submodes and menus [nvimtools/hydra.nvim]";
+  };
+}

modules/plugins/languages/go.nix

@@ -34,6 +34,43 @@
     };
   };
 
+  defaultFormat = "gofmt";
+  formats = {
+    gofmt = {
+      package = pkgs.go;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.gofmt.with({
+            command = "${cfg.format.package}/bin/gofmt",
+          })
+        )
+      '';
+    };
+    gofumpt = {
+      package = pkgs.gofumpt;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.gofumpt.with({
+            command = "${cfg.format.package}/bin/gofumpt",
+          })
+        )
+      '';
+    };
+    golines = {
+      package = pkgs.golines;
+      nullConfig = ''
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.golines.with({
+            command = "${cfg.format.package}/bin/golines",
+          })
+        )
+      '';
+    };
+  };
+
   defaultDebugger = "delve";
   debuggers = {
     delve = {
@@ -67,6 +104,22 @@ in {
       };
     };
 
+    format = {
+      enable = mkEnableOption "Go formatting" // {default = config.vim.languages.enableFormat;};
+
+      type = mkOption {
+        description = "Go formatter to use";
+        type = enum (attrNames formats);
+        default = defaultFormat;
+      };
+
+      package = mkOption {
+        description = "Go formatter package";
+        type = package;
+        default = formats.${cfg.format.type}.package;
+      };
+    };
+
     dap = {
       enable = mkOption {
         description = "Enable Go Debug Adapter via nvim-dap-go plugin";
@@ -99,6 +152,11 @@ in {
       vim.lsp.lspconfig.sources.go-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 
+    (mkIf cfg.format.enable {
+      vim.lsp.null-ls.enable = true;
+      vim.lsp.null-ls.sources.go-format = formats.${cfg.format.type}.nullConfig;
+    })
+
     (mkIf cfg.dap.enable {
       vim = {
         startPlugins = ["nvim-dap-go"];

modules/plugins/utility/default.nix

@@ -8,6 +8,7 @@
     ./icon-picker
     ./images
     ./motion
+    ./multicursors
     ./new-file-template
     ./outline
     ./preview

modules/plugins/utility/multicursors/config.nix

@@ -0,0 +1,36 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  cfg = config.vim.utility.multicursors;
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      startPlugins = ["hydra-nvim"];
+      lazy.plugins."multicursors-nvim" = {
+        package = "multicursors-nvim";
+        setupModule = "multicursors";
+        inherit (cfg) setupOpts;
+
+        event = ["DeferredUIEnter"];
+        cmd = ["MCstart" "MCvisual" "MCclear" "MCpattern" "MCvisualPattern" "MCunderCursor"];
+        keys = [
+          {
+            mode = ["v" "n"];
+            key = "<leader>mcs";
+            action = ":MCstart<cr>";
+            desc = "Create a selection for selected text or word under the cursor [multicursors.nvim]";
+          }
+          {
+            mode = ["v" "n"];
+            key = "<leader>mcp";
+            action = ":MCpattern<cr>";
+            desc = "Create a selection for pattern entered [multicursors.nvim]";
+          }
+        ];
+      };
+    };
+  };
+}

modules/plugins/utility/multicursors/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./multicursors.nix
+    ./config.nix
+  ];
+}

modules/plugins/utility/multicursors/multicursors.nix

@@ -0,0 +1,138 @@
+{lib, ...}: let
+  inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.types) attrsOf nullOr bool int str submodule;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+
+  hintConfig = {
+    options = {
+      float_opts = mkOption {
+        description = "The options for the floating hint window";
+        type = submodule {
+          options = {
+            border = mkOption {
+              type = str;
+              default = "none";
+              description = "The border style for the hint window";
+            };
+          };
+        };
+      };
+
+      position = mkOption {
+        type = str;
+        default = "bottom";
+        description = "The position of the hint window";
+      };
+    };
+  };
+
+  generateHints = {
+    options = {
+      normal = mkOption {
+        type = bool;
+        default = true;
+        description = "Generate hints for the normal mode";
+      };
+
+      insert = mkOption {
+        type = bool;
+        default = true;
+        description = "Generate hints for the insert mode";
+      };
+
+      extend = mkOption {
+        type = bool;
+        default = true;
+        description = "Generate hints for the extend mode";
+      };
+
+      config = mkOption {
+        description = "The configuration for generating hints for multicursors.nvim";
+        type = submodule {
+          options = {
+            column_count = mkOption {
+              type = nullOr int;
+              default = null;
+              description = "The number of columns to use for the hint window";
+            };
+
+            max_hint_length = mkOption {
+              type = int;
+              default = 25;
+              description = "The maximum length of the hint";
+            };
+          };
+        };
+
+        default = {
+          column_count = null;
+          max_hint_length = 25;
+        };
+      };
+    };
+  };
+in {
+  options.vim.utility.multicursors = {
+    enable = mkEnableOption "vscode like multiple cursors [multicursor.nvim]";
+
+    setupOpts = mkPluginSetupOption "multicursors" {
+      DEBUG_MODE = mkOption {
+        type = bool;
+        default = false;
+        description = "Enable debug mode.";
+      };
+
+      create_commands = mkOption {
+        type = bool;
+        default = true;
+        description = "Create Multicursor user commands";
+      };
+
+      updatetime = mkOption {
+        type = int;
+        default = 50;
+        description = "The time in milliseconds to wait before updating the cursor in insert mode";
+      };
+
+      nowait = mkOption {
+        type = bool;
+        default = true;
+        description = "Don't wait for the cursor to move before updating the cursor";
+      };
+
+      mode_keys = mkOption {
+        type = attrsOf str;
+        default = {
+          insert = "i";
+          append = "a";
+          change = "c";
+          extend = "e";
+        };
+        description = "The keys to use for each mode";
+      };
+
+      hint_config = mkOption {
+        type = submodule hintConfig;
+        default = {
+          float_opts.border = "none";
+          position = "bottom";
+        };
+        description = "The configuration for the hint window";
+      };
+
+      generate_hints = mkOption {
+        type = submodule generateHints;
+        default = {
+          normal = true;
+          insert = true;
+          extend = true;
+          config = {
+            column_count = null;
+            max_hint_length = 25;
+          };
+        };
+        description = "The configuration for generating hints";
+      };
+    };
+  };
+}

modules/wrapper/build/config.nix

@@ -45,7 +45,7 @@
   pluginBuilders = {
     nvim-treesitter = buildTreesitterPlug config.vim.treesitter.grammars;
     flutter-tools-patched = buildPlug {
-      pname = "flutter-tools";
+      pname = "flutter-tools-nvim";
       patches = [./patches/flutter-tools.patch];
 
       # Disable failing require check hook checks