update neovim and syncthing

Signed-off-by: gwg313 <gwg313@pm.me>

home-manager/modules/hyprland/default.nix

@@ -140,7 +140,7 @@ in
       };
 
       gestures = {
-        workspace_swipe = true;
+        workspace = true;
       };
 
       misc = {

home-manager/modules/nvf/default.nix

@@ -18,8 +18,10 @@
   programs.nvf = {
     enable = true;
     settings.vim = {
-      startPlugins = [
-        pkgs.vimPlugins.vim-kitty-navigator
+      startPlugins = with pkgs; [
+        # pkgs.vimPlugins.vim-kitty-navigator
+        vimPlugins.grug-far-nvim
+        vimPlugins.image-nvim
       ];
     };
   };

home-manager/modules/nvf/languages.nix

@@ -1,9 +1,38 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
 {
   programs.nvf.settings.vim = {
     diagnostics = {
       enable = true;
-      nvim-lint.enable = true;
-      config.virtual_text = true;
+      config = {
+        signs = {
+          text = {
+            "vim.diagnostic.severity.Error" = " ";
+            "vim.diagnostic.severity.Warn" = " ";
+            "vim.diagnostic.severity.Hint" = " ";
+            "vim.diagnostic.severity.Info" = " ";
+          };
+        };
+        underline = true;
+        update_in_insert = true;
+        virtual_text = {
+          format =
+            lib.generators.mkLuaInline
+              # lua
+              ''
+                function(diagnostic)
+                  return string.format("%s", diagnostic.message)
+                  --return string.format("%s (%s)", diagnostic.message, diagnostic.source)
+                end
+              '';
+        };
+      };
+      nvim-lint = {
+        enable = true;
+      };
     };
     syntaxHighlighting = true;
     treesitter = {
@@ -18,11 +47,38 @@
     lsp = {
       enable = true;
       trouble.enable = true;
+      lspSignature.enable = true;
+      lspconfig.enable = true;
       formatOnSave = true;
       inlayHints.enable = true;
-      lightbulb.enable = true;
       null-ls.enable = true;
-      otter-nvim.enable = true;
+      servers.nixd.settings.nil.nix.autoArchive = true;
+      otter-nvim = {
+        enable = true;
+        setupOpts = {
+          buffers.set_filetype = true;
+          lsp = {
+            diagnostic_update_event = [
+              "BufWritePost"
+              "InsertLeave"
+            ];
+          };
+        };
+      };
+      lspkind.enable = true;
+      lspsaga = {
+        enable = true;
+        setupOpts = {
+          ui = {
+            code_action = "";
+          };
+          lightbulb = {
+            sign = false;
+            virtual_text = true;
+          };
+          breadcrumbs.enable = false;
+        };
+      };
     };
     languages = {
       enableDAP = true;
@@ -35,12 +91,22 @@
       java.enable = true;
       clang.enable = true;
       go.enable = true;
-      markdown.enable = true;
+      markdown = {
+        enable = true;
+        format.type = "prettierd";
+        extensions = {
+          markview-nvim = {
+            enable = true;
+          };
+        };
+        extraDiagnostics.enable = true;
+      };
       ts.enable = true;
       ts.extensions.ts-error-translator.enable = true;
       css.enable = true;
       svelte.enable = true;
       haskell.enable = true;
+      haskell.lsp.enable = true;
       html.enable = true;
       bash.enable = true;
       nix.enable = true;
@@ -53,5 +119,10 @@
         treesitter.enable = true;
       };
     };
+    formatter = {
+      conform-nvim = {
+        enable = true;
+      };
+    };
   };
 }

home-manager/modules/nvf/snacks.nix

@@ -4,7 +4,10 @@
     setupOpts = {
       image = {
         enabled = true;
-        setupOpts.doc.inline = false;
+        doc = {
+          inline = false;
+          float = true;
+        };
       };
       quickfile.enabled = true;
       statuscolumn.enabled = true;

home-manager/modules/nvf/utils.nix

@@ -1,6 +1,11 @@
-{ lib, ... }:
+{
+  lib,
+  pkgs,
+  ...
+}:
 {
   programs.nvf.settings.vim = {
+    undoFile.enable = true;
     theme = lib.mkForce {
       enable = true;
       name = "catppuccin";
@@ -20,14 +25,27 @@
     };
     tabline.nvimBufferline.enable = true;
     notes.todo-comments.enable = true;
-    assistant.copilot = {
-      enable = true;
-      cmp.enable = true;
-    };
+    # assistant.copilot = {
+    #   enable = true;
+    #   cmp.enable = true;
+    # };
     statusline.lualine.enable = true;
-    autocomplete.blink-cmp = {
-      enable = true;
-      friendly-snippets.enable = true;
+    # autocomplete.blink-cmp = {
+    #   enable = true;
+    #   friendly-snippets.enable = true;
+    # };
+    autocomplete = {
+      nvim-cmp = {
+        enable = true;
+        sources = {
+          buffer = "[Buffer]";
+          nvim-cmp = null;
+          path = "[Path]";
+        };
+        sourcePlugins = [
+          pkgs.vimPlugins.cmp-cmdline
+        ];
+      };
     };
     snippets.luasnip.enable = true;
     ui = {
@@ -35,7 +53,10 @@
       colorizer.enable = true;
     };
     visuals = {
-      cinnamon-nvim.enable = true;
+      rainbow-delimiters.enable = true;
+      nvim-scrollbar = {
+        enable = false;
+      };
     };
     git = {
       enable = true;