flake.lock

@@ -334,11 +334,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717527182,
+        "lastModified": 1718530513,
-        "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
+        "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "845a5c4c073f74105022533907703441e0464bc3",
+        "rev": "a1fddf0967c33754271761d91a3d921772b30d0e",
         "type": "github"
       },
       "original": {
@@ -371,11 +371,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1718316862,
+        "lastModified": 1718902806,
-        "narHash": "sha256-/hsqsiw3p5qMpazedgFFZF2sQghbCJIoef7XCpegTXw=",
+        "narHash": "sha256-cAkgZoiP2eHB+V2cPJMcXACzdaWZIMgI5sg4vpH+DYo=",
-        "rev": "068576042b3b58f8180b24a36c07199a1a3fd380",
+        "rev": "e44dcd63c4d96807536cdcf2afb688a537cce9be",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/068576042b3b58f8180b24a36c07199a1a3fd380.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e44dcd63c4d96807536cdcf2afb688a537cce9be.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -396,11 +396,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717647344,
+        "lastModified": 1718778751,
-        "narHash": "sha256-m8XYt8NU2T4gvkien7H7LFGXHhSA5z4tHOeuXQ3DJi4=",
+        "narHash": "sha256-DdcMvX9r29uHMlz7P1Shgs5xZw9WkZ4ObMGYzwROAiw=",
-        "rev": "4e25f1ab68f2270f9cff59216056c21073db0164",
+        "rev": "909e593ae9f5fe338ab19b4ed9d52bb0ea09bad8",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/4e25f1ab68f2270f9cff59216056c21073db0164.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/909e593ae9f5fe338ab19b4ed9d52bb0ea09bad8.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -409,11 +409,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1718349360,
+        "lastModified": 1718894893,
-        "narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=",
+        "narHash": "sha256-hxQBUtDbFOCCW1CsFZTS9Q5Ov1ZKdJgbBZHSez1M6iA=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6",
+        "rev": "083823b7904e43a4fc1c7229781417e875359a42",
         "type": "github"
       },
       "original": {
@@ -424,11 +424,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1718208800,
+        "lastModified": 1718835956,
-        "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
+        "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
+        "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
         "type": "github"
       },
       "original": {
@@ -453,16 +453,16 @@
         ],
         "nix-darwin": [],
         "nixpkgs": [
-          "nixpkgs"
+          "unstable"
         ],
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1718376125,
+        "lastModified": 1718869672,
-        "narHash": "sha256-NIJZxmY2CWsqJK/9BQCRSHfcCY9K6thjq/1XtJobxmU=",
+        "narHash": "sha256-artyEBzWUsNXtYj7jBr816wRJj2Y3DYDHw6ECrQotX0=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "7a2a25af02be25987aa43cd681312f4b5ba12317",
+        "rev": "744dfea48bdd331e66b9e874822559fa6fae98af",
         "type": "github"
       },
       "original": {
@@ -544,11 +544,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718139168,
+        "lastModified": 1718522839,
-        "narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=",
+        "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1",
+        "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81",
         "type": "github"
       },
       "original": {
@@ -559,11 +559,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1718318537,
+        "lastModified": 1718714799,
-        "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
+        "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
+        "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -46,8 +46,7 @@
       url = "github:nix-community/nixvim";
       inputs = {
         # Disable until fixed upstream: https://github.com/nix-community/nixvim/issues/1699
-        # nixpkgs.follows = "unstable";
+        nixpkgs.follows = "unstable";
-        nixpkgs.follows = "nixpkgs";
         devshell.follows = "devshell";
         nix-darwin.follows = ""; # disable MacOS stuff
         home-manager.follows = "home-manager";

nvim/augroups.nix

@@ -1,16 +1,24 @@
 {
-  autoGroups = {
+  lib,
-    "highlightOnYank" = {};
+  config,
-    "lspConfig" = {};
+  helpers,
-    "restoreCursorPosition" = {};
+  ...
-  };
+}: let
-  autoCmd = [
+  inherit (helpers) mkRaw;
-    {
+  cfg = config.jhome.nvim;
-      group = "highlightOnYank";
+in
-      event = "TextYankPost";
+  lib.mkIf cfg.enable {
-      pattern = "*";
+    autoGroups = {
-      callback = {
+      "highlightOnYank" = {};
-        __raw = ''
+      "lspConfig" = {};
+      "restoreCursorPosition" = {};
+    };
+    autoCmd = [
+      {
+        group = "highlightOnYank";
+        event = "TextYankPost";
+        pattern = "*";
+        callback = mkRaw ''
           function()
             vim.highlight.on_yank {
               higroup = (
@@ -20,71 +28,67 @@
             }
           end
         '';
-      };
+      }
-    }
+      {
-    {
+        group = "restoreCursorPosition";
-      group = "restoreCursorPosition";
+        event = "BufReadPost";
-      event = "BufReadPost";
+        pattern = "*";
-      pattern = "*";
+        callback = mkRaw ''
-      callback = {
-        __raw = ''
           function()
             if vim.fn.line '\'"' > 0 and vim.fn.line '\'"' <= vim.fn.line '$' then
               vim.cmd [[execute "normal! g'\""]]
             end
           end
         '';
-      };
+      }
-    }
+      {
-    {
+        group = "lspConfig";
-      group = "lspConfig";
+        event = "LspAttach";
-      event = "LspAttach";
+        pattern = "*";
-      pattern = "*";
+        callback = let
-      callback = let
+          opts = "noremap = true, buffer = bufnr";
-        opts = "noremap = true, buffer = bufnr";
+        in
-      in {
+          mkRaw ''
-        __raw = ''
+            function(opts)
-          function(opts)
+              local bufnr = opts.buf
-            local bufnr = opts.buf
+              local client = vim.lsp.get_client_by_id(opts.data.client_id)
-            local client = vim.lsp.get_client_by_id(opts.data.client_id)
+              local capabilities = client.server_capabilities
-            local capabilities = client.server_capabilities
+              -- Set Omnifunc if supported
-            -- Set Omnifunc if supported
+              if capabilities.completionProvider then
-            if capabilities.completionProvider then
+                vim.bo[bufnr].omnifunc = "v:lua.vim.lsp.omnifunc"
-              vim.bo[bufnr].omnifunc = "v:lua.vim.lsp.omnifunc"
+              end
+              -- Enable inlay hints if supported
+              if capabilities.inlayHintProvider then
+                vim.lsp.inlay_hint.enable(true, { bufnr = bufnr })
+              end
+              -- Some Lsp servers do not advertise inlay hints properly so enable this keybinding regardless
+              vim.keymap.set('n', '<space>ht', function()
+                  vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({bufnr = 0}), { bufnr = 0 })
+                end,
+                { desc = '[H]ints [T]oggle', ${opts} }
+              )
+              -- Enable hover if supported
+              if capabilities.hoverProvider then
+                vim.keymap.set('n', 'K', vim.lsp.buf.hover, { desc = 'Hover Documentation', ${opts} })
+              end
+              -- Enable rename if supported
+              if capabilities.renameProvider then
+                vim.keymap.set('n', '<leader>r', vim.lsp.buf.rename, { desc = '[R]ename', ${opts} })
+              end
+              -- Enable code actions if supported
+              if capabilities.codeActionProvider then
+                vim.keymap.set({ 'n', 'v' }, '<leader>fa', vim.lsp.buf.code_action, { desc = '[F]ind Code [A]ctions', ${opts} })
+              end
+              -- Enable formatting if supported
+              if capabilities.documentFormattingProvider then
+                vim.keymap.set('n', '<leader>w', function() require("conform").format({ lsp_fallback = true }) end, { desc = 'Format Buffer', ${opts} })
+              end
+              -- Other keybinds
+              vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = '[G]o to [D]efinition', ${opts} })
+              vim.keymap.set('n', 'gt', vim.lsp.buf.type_definition, { desc = '[G]o to [T]ype Definition', ${opts} })
+              vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { desc = '[G]o to [I]mplementation', ${opts} })
             end
-            -- Enable inlay hints if supported
+          '';
-            if capabilities.inlayHintProvider then
+      }
-              vim.lsp.inlay_hint.enable(true, { bufnr = bufnr })
+    ];
-            end
+  }
-            -- Some Lsp servers do not advertise inlay hints properly so enable this keybinding regardless
-            vim.keymap.set('n', '<space>ht', function()
-                vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({bufnr = 0}), { bufnr = 0 })
-              end,
-              { desc = '[H]ints [T]oggle', ${opts} }
-            )
-            -- Enable hover if supported
-            if capabilities.hoverProvider then
-              vim.keymap.set('n', 'K', vim.lsp.buf.hover, { desc = 'Hover Documentation', ${opts} })
-            end
-            -- Enable rename if supported
-            if capabilities.renameProvider then
-              vim.keymap.set('n', '<leader>r', vim.lsp.buf.rename, { desc = '[R]ename', ${opts} })
-            end
-            -- Enable code actions if supported
-            if capabilities.codeActionProvider then
-              vim.keymap.set({ 'n', 'v' }, '<leader>fa', vim.lsp.buf.code_action, { desc = '[F]ind Code [A]ctions', ${opts} })
-            end
-            -- Enable formatting if supported
-            if capabilities.documentFormattingProvider then
-              vim.keymap.set('n', '<leader>w', function() require("conform").format({ lsp_fallback = true }) end, { desc = 'Format Buffer', ${opts} })
-            end
-            -- Other keybinds
-            vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = '[G]o to [D]efinition', ${opts} })
-            vim.keymap.set('n', 'gt', vim.lsp.buf.type_definition, { desc = '[G]o to [T]ype Definition', ${opts} })
-            vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { desc = '[G]o to [I]mplementation', ${opts} })
-          end
-        '';
-      };
-    }
-  ];
-}

nvim/mappings.nix

@@ -1,148 +1,158 @@
-let
+{
-  mkRaw = data: {__raw = data;};
+  lib,
-in [
+  config,
-  # Quickfix
+  helpers,
-  {
+  ...
-    mode = "n";
+}: let
-    key = "<leader>qo";
+  inherit (helpers) mkRaw;
-    action = "<cmd>Copen<CR>";
+
-    options.desc = "Quickfix Open";
+  cfg = config.jhome.nvim;
+in
+  lib.mkIf cfg.enable {
+    keymaps = [
+      # Quickfix
+      {
+        mode = "n";
+        key = "<leader>qo";
+        action = "<cmd>Copen<CR>";
+        options.desc = "Quickfix Open";
+      }
+      {
+        mode = "n";
+        key = "<leader>qq";
+        action = "<cmd>cclose<CR>";
+        options.desc = "Quickfix Quit";
+      }
+      {
+        mode = "n";
+        key = "<leader>qj";
+        action = "<cmd>cnext<CR>";
+        options.desc = "Quickfix next [J]";
+      }
+      {
+        mode = "n";
+        key = "<leader>qk";
+        action = "<cmd>cprev<CR>";
+        options.desc = "Quickfix previous [K]";
+      }
+      # Open or create file
+      {
+        mode = "n";
+        key = "<leader>gf";
+        action = "<cmd>e <cfile><CR>";
+        options.desc = "Go to File";
+      }
+      # Keep Selection when indenting
+      {
+        mode = "x";
+        key = ">";
+        action = ">gv";
+        options.desc = "Indent Selection";
+      }
+      {
+        mode = "x";
+        key = "<";
+        action = "<gv";
+        options.desc = "Deindent Selection";
+      }
+      # Diagnostics
+      {
+        mode = "n";
+        key = "<leader>dj";
+        action = mkRaw "vim.diagnostic.goto_next";
+        options.desc = "Diagnostics next [J]";
+      }
+      {
+        mode = "n";
+        key = "<leader>dk";
+        action = mkRaw "vim.diagnostic.goto_prev";
+        options.desc = "Diagnostics previous [K]";
+      }
+      {
+        mode = "n";
+        key = "<leader>xx";
+        action = mkRaw "require('trouble').toggle";
+        options.desc = "Toggle trouble";
+      }
+      {
+        mode = "n";
+        key = "<leader>xw";
+        action = mkRaw "function() require('trouble').toggle('workspace_diagnostics') end";
+        options.desc = "Toggle Workspace trouble";
+      }
+      {
+        mode = "n";
+        key = "<leader>xd";
+        action = mkRaw "function() require('trouble').toggle('document_diagnostics') end";
+        options.desc = "Toggle Document trouble";
+      }
+      {
+        mode = "n";
+        key = "<leader>xq";
+        action = mkRaw "function() require('trouble').toggle('quickfix') end";
+        options.desc = "Toggle Quickfix trouble";
+      }
+      {
+        mode = "n";
+        key = "<leader>xl";
+        action = mkRaw "function() require('trouble').toggle('loclist') end";
+        options.desc = "Toggle Loclist trouble";
+      }
+      {
+        mode = "n";
+        key = "gR";
+        action = mkRaw "function() require('trouble').toggle('lsp_references') end";
+        options.desc = "Toggle lsp References trouble";
+      }
+      # Telescope
+      {
+        mode = "n";
+        key = "<leader>ff";
+        action = mkRaw "require('telescope.builtin').find_files";
+        options.desc = "Find Files";
+      }
+      {
+        mode = "n";
+        key = "<leader>fg";
+        action = mkRaw "require('telescope.builtin').live_grep";
+        options.desc = "Find Grep";
+      }
+      {
+        mode = "n";
+        key = "<leader>fh";
+        action = mkRaw "require('telescope.builtin').help_tags";
+        options.desc = "Find Help";
+      }
+      {
+        mode = "n";
+        key = "<leader>fb";
+        action = mkRaw "require('telescope.builtin').buffers";
+        options.desc = "Find Buffer";
+      }
+      {
+        mode = "n";
+        key = "<leader>fd";
+        action = mkRaw "require('telescope.builtin').diagnostics";
+        options.desc = "Find Diagnostics";
+      }
+      {
+        mode = "n";
+        key = "<leader>fq";
+        action = mkRaw "require('telescope.builtin').quickfix";
+        options.desc = "Find Quickfix";
+      }
+      {
+        mode = "n";
+        key = "<leader>w";
+        action = mkRaw "require('conform').format";
+        options.desc = "Format buffer";
+      }
+      # Nvim Silicon
+      {
+        mode = "v";
+        key = "<leader>sc";
+        action = mkRaw "require('nvim-silicon').clip";
+        options.desc = "Snap Code (to clipboard)";
+      }
+    ];
   }
-  {
-    mode = "n";
-    key = "<leader>qq";
-    action = "<cmd>cclose<CR>";
-    options.desc = "Quickfix Quit";
-  }
-  {
-    mode = "n";
-    key = "<leader>qj";
-    action = "<cmd>cnext<CR>";
-    options.desc = "Quickfix next [J]";
-  }
-  {
-    mode = "n";
-    key = "<leader>qk";
-    action = "<cmd>cprev<CR>";
-    options.desc = "Quickfix previous [K]";
-  }
-  # Open or create file
-  {
-    mode = "n";
-    key = "<leader>gf";
-    action = "<cmd>e <cfile><CR>";
-    options.desc = "Go to File";
-  }
-  # Keep Selection when indenting
-  {
-    mode = "x";
-    key = ">";
-    action = ">gv";
-    options.desc = "Indent Selection";
-  }
-  {
-    mode = "x";
-    key = "<";
-    action = "<gv";
-    options.desc = "Deindent Selection";
-  }
-  # Diagnostics
-  {
-    mode = "n";
-    key = "<leader>dj";
-    action = mkRaw "vim.diagnostic.goto_next";
-    options.desc = "Diagnostics next [J]";
-  }
-  {
-    mode = "n";
-    key = "<leader>dk";
-    action = mkRaw "vim.diagnostic.goto_prev";
-    options.desc = "Diagnostics previous [K]";
-  }
-  {
-    mode = "n";
-    key = "<leader>xx";
-    action = mkRaw "require('trouble').toggle";
-    options.desc = "Toggle trouble";
-  }
-  {
-    mode = "n";
-    key = "<leader>xw";
-    action = mkRaw "function() require('trouble').toggle('workspace_diagnostics') end";
-    options.desc = "Toggle Workspace trouble";
-  }
-  {
-    mode = "n";
-    key = "<leader>xd";
-    action = mkRaw "function() require('trouble').toggle('document_diagnostics') end";
-    options.desc = "Toggle Document trouble";
-  }
-  {
-    mode = "n";
-    key = "<leader>xq";
-    action = mkRaw "function() require('trouble').toggle('quickfix') end";
-    options.desc = "Toggle Quickfix trouble";
-  }
-  {
-    mode = "n";
-    key = "<leader>xl";
-    action = mkRaw "function() require('trouble').toggle('loclist') end";
-    options.desc = "Toggle Loclist trouble";
-  }
-  {
-    mode = "n";
-    key = "gR";
-    action = mkRaw "function() require('trouble').toggle('lsp_references') end";
-    options.desc = "Toggle lsp References trouble";
-  }
-  # Telescope
-  {
-    mode = "n";
-    key = "<leader>ff";
-    action = mkRaw "require('telescope.builtin').find_files";
-    options.desc = "Find Files";
-  }
-  {
-    mode = "n";
-    key = "<leader>fg";
-    action = mkRaw "require('telescope.builtin').live_grep";
-    options.desc = "Find Grep";
-  }
-  {
-    mode = "n";
-    key = "<leader>fh";
-    action = mkRaw "require('telescope.builtin').help_tags";
-    options.desc = "Find Help";
-  }
-  {
-    mode = "n";
-    key = "<leader>fb";
-    action = mkRaw "require('telescope.builtin').buffers";
-    options.desc = "Find Buffer";
-  }
-  {
-    mode = "n";
-    key = "<leader>fd";
-    action = mkRaw "require('telescope.builtin').diagnostics";
-    options.desc = "Find Diagnostics";
-  }
-  {
-    mode = "n";
-    key = "<leader>fq";
-    action = mkRaw "require('telescope.builtin').quickfix";
-    options.desc = "Find Quickfix";
-  }
-  {
-    mode = "n";
-    key = "<leader>w";
-    action = mkRaw "require('conform').format";
-    options.desc = "Format buffer";
-  }
-  # Nvim Silicon
-  {
-    mode = "v";
-    key = "<leader>sc";
-    action = mkRaw "require('nvim-silicon').clip";
-    options.desc = "Snap Code (to clipboard)";
-  }
-]

nvim/nixvim.nix

@@ -11,7 +11,7 @@
   canSetAsDefault = hmAvailable || nixosAvailable;
   notStandalone = hmAvailable || nixosAvailable || darwinAvailable;
 in {
-  imports = [./options.nix];
+  imports = [./options.nix ./plugins.nix ./mappings.nix ./augroups.nix];
 
   config = lib.mkMerge [
     (lib.optionalAttrs canSetAsDefault {defaultEditor = lib.mkDefault true;})
@@ -28,7 +28,7 @@ in {
           terminal_colors = true;
         };
       };
-
+      clipboard.providers.wl-copy.enable = true;
       opts = {
         number = true;
         relativenumber = true;
@@ -50,9 +50,6 @@ in {
         # Enable local configuration :h 'exrc'
         exrc = true; # safe since nvim 0.9
       };
-      plugins = import ./plugins.nix {inherit lib;};
-      keymaps = import ./mappings.nix;
-      inherit (import ./augroups.nix) autoGroups autoCmd;
       extraPlugins = let
         plugins = pkgs.unstable.vimPlugins;
         extraPlugins = import ./extraPlugins {pkgs = pkgs.unstable;};

nvim/plugins.nix

@@ -1,228 +1,247 @@
-{lib}: {
+{
-  bacon = {
+  lib,
-    enable = true;
+  pkgs,
-    settings.quickfix.enabled = true;
+  helpers,
-  };
+  config,
-  cmp = {
+  ...
-    enable = true;
+}: let
-    cmdline = {
+  inherit (helpers) mkRaw;
-      "/" = {
+  cfg = config.jhome.nvim;
-        mapping.__raw = "cmp.mapping.preset.cmdline()";
+in
-        sources = [
+  lib.mkIf cfg.enable {
-          {name = "rg";}
+    plugins = {
-          {name = "buffer";}
+      bacon = {
-        ];
-      };
-      ":" = {
-        mapping.__raw = "cmp.mapping.preset.cmdline()";
-        sources = [
-          {name = "path";}
-          {name = "cmdline";}
-        ];
-      };
-    };
-    settings = {
-      # Snippets
-      snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
-      # Completion Sources
-      sources = [
-        {
-          name = "buffer";
-          groupIndex = 3;
-        }
-        {
-          name = "calc";
-          groupIndex = 2;
-        }
-        {
-          name = "conventionalcommits";
-          groupIndex = 1;
-        }
-        {
-          name = "crates";
-          groupIndex = 1;
-        }
-        {
-          name = "luasnip";
-          groupIndex = 1;
-        }
-        {
-          name = "nvim_lsp";
-          groupIndex = 1;
-        }
-        {
-          name = "nvim_lsp_document_symbol";
-          groupIndex = 1;
-        }
-        {
-          name = "nvim_lsp_signature_help";
-          groupIndex = 1;
-        }
-        {
-          name = "path";
-          groupIndex = 2;
-        }
-        {
-          name = "spell";
-          groupIndex = 2;
-        }
-        {
-          name = "treesitter";
-          groupIndex = 2;
-        }
-        {
-          name = "zsh";
-          groupIndex = 1;
-        }
-      ];
-      mapping.__raw = ''
-        cmp.mapping.preset.insert({
-          ["<C-n>"] = function(fallback)
-            if cmp.visible() then
-              cmp.select_next_item()
-            elseif require("luasnip").expand_or_jumpable() then
-              require("luasnip").expand_or_jump()
-            elseif has_words_before() then
-              cmp.complete()
-            else
-              fallback()
-            end
-          end,
-          ["<C-p>"] = function(fallback)
-            if cmp.visible() then
-              cmp.select_prev_item()
-            elseif require("luasnip").jumpable(-1) then
-              require("luasnip").jump(-1)
-            else
-              fallback()
-            end
-          end,
-          ["<C-u>"] = cmp.mapping(function(fallback)
-            if require("luasnip").choice_active() then
-              require("luasnip").next_choice()
-            else
-              fallback()
-            end
-          end),
-          ["<C-b>"] = cmp.mapping.scroll_docs(-4),
-          ["<C-f>"] = cmp.mapping.scroll_docs(4),
-          ["<C-Space>"] = cmp.mapping.complete { },
-          ["<C-e>"] = cmp.mapping.close(),
-          ["<CR>"] = cmp.mapping.confirm { select = true },
-        })
-      '';
-    };
-  };
-  # FIXME: doesn't include formatters
-  conform-nvim = {
-    enable = true;
-    formattersByFt = {
-      "_" = ["trim_whitespace"];
-      c = ["clang_format"];
-      cpp = ["clang_format"];
-      lua = ["stylua"];
-      nix = ["alejandra"];
-      rust = ["rustfmt"];
-      sh = ["shfmt"];
-      toml = ["taplo"];
-      yaml = ["yamlfmt"];
-      zig = ["zigfmt"];
-    };
-  };
-  gitsigns.enable = true;
-  lsp = {
-    enable = true;
-    servers = {
-      bashls.enable = true;
-      # clangd.enable = true; # Adds ~2GiB
-      html.enable = true;
-      jsonls.enable = true;
-      nil-ls = {
         enable = true;
-        settings.nix.flake = {
+        settings.quickfix.enabled = true;
-          autoArchive = true;
+      };
-          autoEvalInputs = true;
+      cmp = {
+        enable = true;
+        cmdline = {
+          "/" = {
+            mapping = mkRaw "cmp.mapping.preset.cmdline()";
+            sources = [
+              {name = "rg";}
+              {name = "buffer";}
+            ];
+          };
+          ":" = {
+            mapping = mkRaw "cmp.mapping.preset.cmdline()";
+            sources = [
+              {name = "path";}
+              {name = "cmdline";}
+            ];
+          };
+        };
+        settings = {
+          # Snippets
+          snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
+          # Completion Sources
+          sources = [
+            {
+              name = "buffer";
+              groupIndex = 3;
+            }
+            {
+              name = "calc";
+              groupIndex = 2;
+            }
+            {
+              name = "conventionalcommits";
+              groupIndex = 1;
+            }
+            {
+              name = "crates";
+              groupIndex = 1;
+            }
+            {
+              name = "luasnip";
+              groupIndex = 1;
+            }
+            {
+              name = "nvim_lsp";
+              groupIndex = 1;
+            }
+            {
+              name = "nvim_lsp_document_symbol";
+              groupIndex = 1;
+            }
+            {
+              name = "nvim_lsp_signature_help";
+              groupIndex = 1;
+            }
+            {
+              name = "path";
+              groupIndex = 2;
+            }
+            {
+              name = "spell";
+              groupIndex = 2;
+            }
+            {
+              name = "treesitter";
+              groupIndex = 2;
+            }
+            {
+              name = "zsh";
+              groupIndex = 1;
+            }
+          ];
+          mapping = mkRaw ''
+            cmp.mapping.preset.insert({
+              ["<C-n>"] = function(fallback)
+                if cmp.visible() then
+                  cmp.select_next_item()
+                elseif require("luasnip").expand_or_jumpable() then
+                  require("luasnip").expand_or_jump()
+                elseif has_words_before() then
+                  cmp.complete()
+                else
+                  fallback()
+                end
+              end,
+              ["<C-p>"] = function(fallback)
+                if cmp.visible() then
+                  cmp.select_prev_item()
+                elseif require("luasnip").jumpable(-1) then
+                  require("luasnip").jump(-1)
+                else
+                  fallback()
+                end
+              end,
+              ["<C-u>"] = cmp.mapping(function(fallback)
+                if require("luasnip").choice_active() then
+                  require("luasnip").next_choice()
+                else
+                  fallback()
+                end
+              end),
+              ["<C-b>"] = cmp.mapping.scroll_docs(-4),
+              ["<C-f>"] = cmp.mapping.scroll_docs(4),
+              ["<C-Space>"] = cmp.mapping.complete { },
+              ["<C-e>"] = cmp.mapping.close(),
+              ["<CR>"] = cmp.mapping.confirm { select = true },
+            })
+          '';
         };
       };
-      ruff-lsp.enable = true;
+      # FIXME: doesn't include formatters
-      taplo.enable = true;
+      conform-nvim = {
-      # texlab.enable = true; # Not writing TeX rn
+        enable = true;
-      typos-lsp.enable = true;
+        formattersByFt = {
-      typst-lsp.enable = true;
+          "_" = ["trim_whitespace"];
+          c = ["clang_format"];
+          cpp = ["clang_format"];
+          lua = ["stylua"];
+          nix = ["alejandra"];
+          rust = ["rustfmt"];
+          sh = ["shfmt"];
+          toml = ["taplo"];
+          yaml = ["yamlfmt"];
+          zig = ["zigfmt"];
+        };
+      };
+      gitsigns.enable = true;
+      lint = {
+        enable = true;
+        lintersByFt = {
+          rust = ["typos"];
+          latex = ["chktex" "typos"];
+          markdown = ["typos"];
+          nix = ["statix"];
+          sh = ["dash"];
+          zsh = ["zsh"];
+        };
+      };
+      lsp = {
+        enable = true;
+        servers = {
+          bashls.enable = true;
+          bashls.package = pkgs.unstable.bash-language-server;
+          # clangd.enable = true; # Adds ~2GiB
+          html.enable = true;
+          jsonls.enable = true;
+          marksman.enable = true;
+          nixd.enable = true;
+          nil-ls = {
+            enable = true;
+            settings.nix.flake = {
+              autoArchive = true;
+              autoEvalInputs = true;
+            };
+          };
+          ruff-lsp.enable = true;
+          taplo.enable = true;
+          # texlab.enable = true; # Not writing TeX rn
+          typos-lsp.enable = true;
+          typst-lsp.enable = true;
+        };
+      };
+      lspkind = {
+        enable = true;
+        mode = "symbol";
+        extraOptions.maxwidth = 50;
+      };
+      lualine = {
+        enable = true;
+        theme = lib.mkForce "gruvbox";
+      };
+      luasnip = {
+        enable = true;
+        extraConfig = {
+          update_events = "TextChanged,TextChangedI";
+        };
+      };
+      noice = {
+        enable = true;
+        lsp.override = {
+          "vim.lsp.util.convert_input_to_markdown_lines" = true;
+          "vim.lsp.util.stylize_markdown" = true;
+          "cmp.entry.get_documentation" = true;
+        };
+        presets = {
+          # use a classic bottom cmdline for search
+          bottom_search = true;
+          # position the cmdline and popupmenu together
+          command_palette = false;
+          # long messages will be sent to a split
+          long_message_to_split = true;
+          # enables an input dialog for inc-rename.nvim
+          inc_rename = false;
+          # add a border to hover docs and signature help
+          lsp_doc_border = true;
+        };
+      };
+      notify = {
+        enable = true;
+        backgroundColour = "#000000";
+      };
+      nvim-colorizer = {
+        enable = true;
+        userDefaultOptions = {
+          names = false; # disable named colors (i.e. red)
+          mode = "virtualtext";
+        };
+      };
+      rustaceanvim = {
+        enable = true;
+        # Install through rustup
+        rustAnalyzerPackage = null;
+      };
+      telescope = {
+        enable = true;
+        extensions = {
+          ui-select.enable = true;
+          fzy-native.enable = true;
+        };
+      };
+      treesitter = {
+        enable = true;
+        indent = true;
+        incrementalSelection.enable = true;
+      };
+      trouble = {
+        enable = true;
+        settings.auto_close = true;
+      };
     };
-  };
+  }
-  lspkind = {
-    enable = true;
-    mode = "symbol";
-    extraOptions.maxwidth = 50;
-  };
-  lualine = {
-    enable = true;
-    theme = lib.mkForce "gruvbox";
-  };
-  luasnip = {
-    enable = true;
-    extraConfig = {
-      update_events = "TextChanged,TextChangedI";
-    };
-  };
-  noice = {
-    enable = true;
-    lsp.override = {
-      "vim.lsp.util.convert_input_to_markdown_lines" = true;
-      "vim.lsp.util.stylize_markdown" = true;
-      "cmp.entry.get_documentation" = true;
-    };
-    presets = {
-      # use a classic bottom cmdline for search
-      bottom_search = true;
-      # position the cmdline and popupmenu together
-      command_palette = false;
-      # long messages will be sent to a split
-      long_message_to_split = true;
-      # enables an input dialog for inc-rename.nvim
-      inc_rename = false;
-      # add a border to hover docs and signature help
-      lsp_doc_border = true;
-    };
-  };
-  notify = {
-    enable = true;
-    backgroundColour = "#000000";
-  };
-  nvim-colorizer = {
-    enable = true;
-    userDefaultOptions = {
-      names = false; # disable named colors (i.e. red)
-      mode = "virtualtext";
-    };
-  };
-  rustaceanvim.enable = true;
-  telescope = {
-    enable = true;
-    extensions = {
-      ui-select.enable = true;
-      fzy-native.enable = true;
-    };
-  };
-  treesitter = {
-    enable = true;
-    indent = true;
-    incrementalSelection.enable = true;
-  };
-  trouble = {
-    enable = true;
-    settings.auto_close = true;
-  };
-  lint = {
-    enable = true;
-    lintersByFt = {
-      rust = ["typos"];
-      latex = ["chktex" "typos"];
-      markdown = ["typos"];
-      nix = ["statix"];
-      sh = ["dash"];
-      zsh = ["zsh"];
-    };
-  };
-}