replace markdown-preview with peek.nvim + bump deps

.gitignore

@@ -0,0 +1,2 @@
+# Nix build symlink
+result

config/completion/copilot.nix

@@ -6,47 +6,48 @@
   config = lib.mkIf config.copilot.enable {
     plugins.copilot-lua = {
       enable = true;
-      panel = {
-        enabled = false;
-        autoRefresh = true;
-        keymap = {
-          jumpPrev = "[[";
-          jumpNext = "]]";
-          accept = "<CR>";
-          refresh = "gr";
-          open = "<M-CR>";
+      settings = {
+        panel = {
+          enabled = false;
+          auto_refresh = true;
+          keymap = {
+            jump_prev = "[[";
+            jump_next = "]]";
+            accept = "<CR>";
+            refresh = "gr";
+            open = "<M-CR>";
+          };
+          layout = {
+            position = "bottom"; # | top | left | right
+            ratio = 0.4;
+          };
         };
-        layout = {
-          position = "bottom"; # | top | left | right
-          ratio = 0.4;
+        suggestion = {
+          enabled = false;
+          auto_trigger = true;
+          debounce = 75;
+          keymap = {
+            accept = "<M-l>";
+            accept_word = false;
+            accept_line = false;
+            next = "<M-]>";
+            prev = "<M-[>";
+            dismiss = "<C-]>";
+          };
         };
-      };
-      suggestion = {
-        enabled = false;
-        autoTrigger = true;
-        debounce = 75;
-        keymap = {
-          accept = "<M-l>";
-          acceptWord = false;
-          acceptLine = false;
-          next = "<M-]>";
-          prev = "<M-[>";
-          dismiss = "<C-]>";
+        filetypes = {
+          yaml = false;
+          markdown = false;
+          help = false;
+          gitcommit = false;
+          gitrebase = false;
+          hgcommit = false;
+          svn = false;
+          cvs = false;
+          "." = false;
         };
       };
-      filetypes = {
-        yaml = false;
-        markdown = false;
-        help = false;
-        gitcommit = false;
-        gitrebase = false;
-        hgcommit = false;
-        svn = false;
-        cvs = false;
-        "." = false;
-      };
-      copilotNodeCommand = "node"; # Node.js version must be > 18.x
-      serverOptsOverrides = { };
+      # copilot_node_command and server_opts_overrides use NixVim defaults ("node" and {})
     };
   };
 }

config/completion/default.nix

@@ -6,7 +6,7 @@
 {
   imports = [
     ./cmp.nix
-    ./codeium.nix
+    ./windsurf.nix
     ./copilot.nix
     ./lspkind.nix
   ];
@@ -16,7 +16,7 @@
   };
   config = lib.mkIf config.completion.enable {
     cmp.enable = lib.mkDefault true;
-    codeium.enable = lib.mkDefault false;
+    windsurf.enable = lib.mkDefault false;
     copilot.enable = lib.mkDefault false;
     lspkind.enable = lib.mkDefault true;
   };

config/completion/windsurf.nix

@@ -0,0 +1,11 @@
+{ lib, config, ... }:
+{
+  options = {
+    windsurf.enable = lib.mkEnableOption "Enable windsurf module";
+  };
+  config = lib.mkIf config.windsurf.enable {
+    plugins.windsurf-vim = {
+      enable = true;
+    };
+  };
+}

config/default.nix

@@ -1,5 +1,17 @@
-{ lib, config, ... }:
 {
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+{
+  extraPackages = with pkgs; [
+    fd
+    nixfmt
+    stylua
+    prettierd
+  ];
+
   # Import all your configuration modules here
   imports = [
     ./bufferlines

config/languages/jdtls.nix

@@ -1,8 +1,4 @@
-{ lib, config, ... }:
-let
-  javaTestPath = "/nix/store/j3nvmhvj2pmnykw5pbm51dn0bz4cv6j3-vscode-extension-vscjava-vscode-java-test-0.38.2023032402/share/vscode/extensions/vscjava.vscode-java-test/server/com.microsoft.java.test.plugin-0.38.2.jar
- ";
-in
+{ lib, config, pkgs, ... }:
 {
   options = {
     jdtls.enable = lib.mkEnableOption "Enable jdtls module";
@@ -12,77 +8,17 @@ in
       enable = true;
       settings = {
         cmd = [
-          "/nix/store/l7wd7xjnz95yxv225kix5gbq8k3vm7fl-jdt-language-server-1.48.0/bin/jdtls --data ~/.cache/jdtls/workspace"
+          "${pkgs.jdt-language-server}/bin/jdtls"
+          "--data"
+          "~/.cache/jdtls/workspace"
         ];
-        # configuration = "/path/to/configuration";
         settings = {
           java = {
             signatureHelp = true;
             completion = true;
           };
         };
-        initOptions = {
-          bundles = [
-            "/nix/store/b9ib40q36wxjl4xs5lng263lflz1fsi7-vscode-extension-vscjava-vscode-java-debug-0.49.2023032407/share/vscode/extensions/vscjava.vscode-java-debug/server/com.microsoft.java.debug.plugin-0.44.0.jar"
-            "${javaTestPath}"
-          ];
-        };
       };
     };
   };
 }
-#
-# extraConfigLua = ''
-#   local jdtls = require("jdtls")
-#   local cmp_nvim_lsp = require("cmp_nvim_lsp")
-#
-#   local root_dir = require("jdtls.setup").find_root({ "packageInfo" }, "Config")
-#   local home = os.getenv("HOME")
-#   local eclipse_workspace = home .. "/.local/share/eclipse/" .. vim.fn.fnamemodify(root_dir, ":p:h:t")
-#
-#   local ws_folders_jdtls = {}
-#   if root_dir then
-#    local file = io.open(root_dir .. "/.bemol/ws_root_folders")
-#    if file then
-#     for line in file:lines() do
-#      table.insert(ws_folders_jdtls, "file://" .. line)
-#     end
-#     file:close()
-#    end
-#   end
-#
-#   -- for completions
-#   local client_capabilities = vim.lsp.protocol.make_client_capabilities()
-#   local capabilities = cmp_nvim_lsp.default_capabilities(client_capabilities)
-#
-#   local config = {
-#    capabilities = capabilities,
-#    cmd = {
-#     "${pkgs.jdt-language-server}/bin/jdt-language-server",
-#     "--jvm-arg=-javaagent:" .. home .. "/Developer/lombok.jar",
-#     "-data",
-#     eclipse_workspace,
-#     "--add-modules=ALL-SYSTEM",
-#    },
-#    root_dir = root_dir,
-#    init_options = {
-#     workspaceFolders = ws_folders_jdtls,
-#    },
-#    settings = {
-#      java = {
-#        signatureHelp = { enabled = true},
-#        completion = { enabled = true },
-#      },
-#    },
-#    on_attach = function(client, bufnr)
-#       local opts = { silent = true, buffer = bufnr }
-#       vim.keymap.set('n', "<leader>lo", jdtls.organize_imports, { desc = 'Organize imports', buffer = bufnr })
-#       vim.keymap.set('n', "<leader>df", jdtls.test_class, opts)
-#       vim.keymap.set('n', "<leader>dn", jdtls.test_nearest_method, opts)
-#       vim.keymap.set('n', '<leader>rv', jdtls.extract_variable_all, { desc = 'Extract variable', buffer = bufnr })
-#       vim.keymap.set('n', '<leader>rc', jdtls.extract_constant, { desc = 'Extract constant', buffer = bufnr })
-#     end
-#   }
-#
-#   jdtls.start_or_attach(config)
-# '';

config/languages/treesitter-nvim.nix

@@ -61,49 +61,51 @@
 
     plugins.treesitter-textobjects = {
       enable = true;
-      select = {
-        enable = true;
-        lookahead = true;
-        keymaps = {
-          "aa" = "@parameter.outer";
-          "ia" = "@parameter.inner";
-          "af" = "@function.outer";
-          "if" = "@function.inner";
-          "ac" = "@class.outer";
-          "ic" = "@class.inner";
-          "ii" = "@conditional.inner";
-          "ai" = "@conditional.outer";
-          "il" = "@loop.inner";
-          "al" = "@loop.outer";
-          "at" = "@comment.outer";
-        };
-      };
-      move = {
-        enable = true;
-        gotoNextStart = {
-          "]m" = "@function.outer";
-          "]]" = "@class.outer";
-        };
-        gotoNextEnd = {
-          "]M" = "@function.outer";
-          "][" = "@class.outer";
-        };
-        gotoPreviousStart = {
-          "[m" = "@function.outer";
-          "[[" = "@class.outer";
-        };
-        gotoPreviousEnd = {
-          "[M" = "@function.outer";
-          "[]" = "@class.outer";
+      settings = {
+        select = {
+          enable = true;
+          lookahead = true;
+          keymaps = {
+            "aa" = "@parameter.outer";
+            "ia" = "@parameter.inner";
+            "af" = "@function.outer";
+            "if" = "@function.inner";
+            "ac" = "@class.outer";
+            "ic" = "@class.inner";
+            "ii" = "@conditional.inner";
+            "ai" = "@conditional.outer";
+            "il" = "@loop.inner";
+            "al" = "@loop.outer";
+            "at" = "@comment.outer";
+          };
         };
-      };
-      swap = {
-        enable = true;
-        swapNext = {
-          "<leader>a" = "@parameters.inner";
+        move = {
+          enable = true;
+          goto_next_start = {
+            "]m" = "@function.outer";
+            "]]" = "@class.outer";
+          };
+          goto_next_end = {
+            "]M" = "@function.outer";
+            "][" = "@class.outer";
+          };
+          goto_previous_start = {
+            "[m" = "@function.outer";
+            "[[" = "@class.outer";
+          };
+          goto_previous_end = {
+            "[M" = "@function.outer";
+            "[]" = "@class.outer";
+          };
         };
-        swapPrevious = {
-          "<leader>A" = "@parameter.outer";
+        swap = {
+          enable = true;
+          swap_next = {
+            "<leader>a" = "@parameters.inner";
+          };
+          swap_previous = {
+            "<leader>A" = "@parameter.outer";
+          };
         };
       };
     };

config/lsp/lsp-nvim.nix

@@ -5,9 +5,6 @@
   };
   config = lib.mkIf config.lsp-nvim.enable {
     plugins = {
-      lsp-format = {
-        enable = false; # Enable it if you want lsp-format integration for none-ls
-      };
       lsp = {
         enable = true;
         capabilities = "offsetEncoding = 'utf-16'";
@@ -192,17 +189,15 @@
             border = _border
           }
 
-          vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
-            vim.lsp.handlers.hover, {
-              border = _border
-            }
-          )
+          vim.lsp.handlers["textDocument/hover"] = function(err, result, ctx, config)
+            config = vim.tbl_deep_extend("force", config or {}, { border = _border })
+            return vim.lsp.handlers.hover(err, result, ctx, config)
+          end
 
-          vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
-            vim.lsp.handlers.signature_help, {
-              border = _border
-            }
-          )
+          vim.lsp.handlers["textDocument/signatureHelp"] = function(err, result, ctx, config)
+            config = vim.tbl_deep_extend("force", config or {}, { border = _border })
+            return vim.lsp.handlers.signature_help(err, result, ctx, config)
+          end
 
           vim.diagnostic.config({
       			float = { border = "rounded" },