Merge branch 'main' into add-multicursors-nvim

one more - replacement

Update modules/plugins/utility/multicursors/multicursors.nix

Co-authored-by: raf <raf@notashelf.dev>

remove redundancies

missing an extra -

docs/release-notes/rl-0.8.md

@@ -1,5 +1,10 @@
 # Release 0.8 {#sec-release-0.8}
 
+## Breaking changes
+
+- `git-conflict` keybinds are now prefixed with `<leader>` to avoid conflicting
+  with builtins
+
 [NotAShelf](https://github.com/notashelf):
 
 [typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim
@@ -176,3 +181,4 @@
 [Libadoxon](https://github.com/Libadoxon)
 
 - Add [git-conflict](https://github.com/akinsho/git-conflict.nvim) plugin for resolving git conflicts
+- Add formatters for go: [gofmt](https://go.dev/blog/gofmt), [golines](https://github.com/segmentio/golines) and [gofumpt](https://github.com/mvdan/gofumpt)

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/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/multicursors/config.nix

@@ -9,7 +9,7 @@ in {
   config = mkIf cfg.enable {
     vim = {
       startPlugins = ["hydra-nvim"];
-      lazy.plugins."multicursors.nvim" = {
+      lazy.plugins."multicursors-nvim" = {
         package = "multicursors-nvim";
         setupModule = "multicursors";
         inherit (cfg) setupOpts;

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