flake.nix

@@ -65,7 +65,6 @@
           alejandra
           bash-language-server
           biome
-          codespell
           curl
           docker-compose-language-service
           dockerfile-language-server-nodejs
@@ -346,9 +345,7 @@
           general = true;
           test = false;
         };
-        extra = {
-          vue-ls-path = "${pkgs.lib.getExe pkgs.vue-language-server}";
-        };
+        extra = {};
       };
     };
 

init.lua

@@ -1,15 +1,17 @@
-require('nixCatsUtils').setup({
+-- NOTE: this just gives nixCats global command a default value
+-- so that it doesnt throw an error if you didnt install via nix.
+-- usage of both this setup and the nixCats command is optional,
+-- but it is very useful for passing info from nix to lua so you will likely use it at least once.
+require('nixCatsUtils').setup {
   non_nix_value = true,
-})
+}
 
+-- NOTE: You might want to move the lazy-lock.json file
 local function getlockfilepath()
-  if
-    require('nixCatsUtils').isNixCats
-    and type(nixCats.settings.unwrappedCfgPath) == 'string'
-  then
+  if require('nixCatsUtils').isNixCats and type(nixCats.settings.unwrappedCfgPath) == 'string' then
     return nixCats.settings.unwrappedCfgPath .. '/lazy-lock.json'
   else
-    return vim.fn.stdpath('config') .. '/lazy-lock.json'
+    return vim.fn.stdpath 'config' .. '/lazy-lock.json'
   end
 end
 local lazyOptions = {
@@ -19,9 +21,10 @@ local lazyOptions = {
   },
 }
 
-require('nixCatsUtils.lazyCat').setup(
-  nixCats.pawsible({ 'allPlugins', 'start', 'lazy.nvim' }),
-  {
+-- NOTE: this the lazy wrapper. Use it like require('lazy').setup() but with an
+-- extra argument, the path to lazy.nvim as downloaded by nix, or nil, before
+-- the normal arguments.
+require('nixCatsUtils.lazyCat').setup(nixCats.pawsible { 'allPlugins', 'start', 'lazy.nvim' }, {
   { 'LazyVim/LazyVim', import = 'lazyvim.plugins' },
 
   {
@@ -29,10 +32,9 @@ require('nixCatsUtils.lazyCat').setup(
     ft = 'lua',
     opts = {
       library = {
-          {
-            path = (nixCats.nixCatsPath or '') .. '/lua',
-            words = { 'nixCats' },
-          },
+        -- Adds type hints for nixCats global, but LazyDev is just nice in
+        -- general.
+        { path = (nixCats.nixCatsPath or '') .. '/lua', words = { 'nixCats' } },
       },
     },
   },
@@ -87,39 +89,25 @@ require('nixCatsUtils.lazyCat').setup(
 
   -- These need to be after extras to prevent extras from overwriting them.
 
-    -- Disable mason.nvim while using Nix.
-    {
-      'williamboman/mason-lspconfig.nvim',
-      enabled = require('nixCatsUtils').lazyAdd(true, false),
-    },
-    {
-      'williamboman/mason.nvim',
-      enabled = require('nixCatsUtils').lazyAdd(true, false),
-    },
+  -- Disable mason.nvim while using nix.
+  -- Precompiled binaries do not agree with nixos, and we can just make nix
+  -- install this stuff for us.
+  { 'williamboman/mason-lspconfig.nvim', enabled = require('nixCatsUtils').lazyAdd(true, false) },
+  { 'williamboman/mason.nvim', enabled = require('nixCatsUtils').lazyAdd(true, false) },
 
   {
     'nvim-treesitter/nvim-treesitter',
-      build = require('nixCatsUtils').lazyAdd(':TSUpdate'),
+    build = require('nixCatsUtils').lazyAdd ':TSUpdate',
     opts_extend = require('nixCatsUtils').lazyAdd(nil, false),
     opts = {
-        -- Disable parser installation while using Nix.
-        ensure_installed = require('nixCatsUtils').lazyAdd({
-          'bash',
-          'c',
-          'diff',
-          'html',
-          'lua',
-          'luadoc',
-          'markdown',
-          'vim',
-          'vimdoc',
-        }, false),
+      -- Nix already ensured they were installed, and we would need to change
+      -- the parser_install_dir if we wanted to use it instead.
+      -- So we just disable install and do it via nix.
+      ensure_installed = require('nixCatsUtils').lazyAdd({ 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' }, false),
       auto_install = require('nixCatsUtils').lazyAdd(true, false),
     },
   },
 
   -- import/override with your plugins
   { import = 'plugins' },
-  },
-  lazyOptions
-)
+}, lazyOptions)

lua/plugins/nvim-lint.lua

@@ -3,7 +3,6 @@ return {
     'mfussenegger/nvim-lint',
     opts = {
       linters_by_ft = {
-        ['*'] = { 'codespell' },
         bash = { 'shellcheck' },
         css = { 'stylelint' },
         scss = { 'stylelint' },

lua/plugins/nvim-lspconfig.lua

@@ -44,19 +44,6 @@ return {
         somesass_ls = {},
         statix = {},
         stylelint_lsp = {},
-
-        -- Fix for nix installation of vue-language-server.
-        vtsls = {
-          settings = {
-            vtsls = {
-              tsserver = {
-                globalPlugins = {
-                  location = nixCats.extra('vue-ls-path'),
-                },
-              },
-            },
-          },
-        },
       },
     },
   },