nim

home/nvim/default.nix

@@ -18,20 +18,14 @@
     extraConfig = builtins.readFile ./config.vim;
 
     plugins = with pkgs.vimPlugins;
-    [
-      cmp-nvim-lsp
-      cmp-buffer
-      cmp-emoji
-      cmp-path
-      cmp-cmdline
-      cmp-nvim-ultisnips
-      nvim-cmp
 
-      {
-        plugin = nvim-lspconfig;
-        type = "lua";
-        config = builtins.readFile ./lsp.lua;
-      }
+    [
+      cmp-buffer
+      cmp-cmdline
+      cmp-emoji
+      cmp-nvim-lsp
+      cmp-nvim-ultisnips
+      cmp-path
 
       {
         plugin = fzf-vim;
@@ -71,10 +65,34 @@
           nnoremap ]of :Limelight!<return>
         '';
       }
+
+      nabla-nvim
+      neogit
+
+      {
+        plugin = nvim-cmp;
+        type = "lua";
+        config = builtins.readFile ./nvim-cmp.lua;
+      }
+
       {
         plugin = nvim-colorizer-lua;
         config = "lua require 'colorizer'.setup()";
       }
+
+      {
+        plugin = nvim-lspconfig;
+        type = "lua";
+        config = ''
+          vim.lsp.enable('astro')
+          vim.lsp.enable('marksman')
+          vim.lsp.enable('nil_ls')
+          vim.lsp.enable('r_language_server')
+          vim.lsp.enable('texlab')
+          vim.lsp.enable('ts_ls')
+        '';
+      }
+
       {
         plugin = papercolor-theme;
         config = ''
@@ -82,7 +100,9 @@
           colorscheme PaperColor
         '';
       }
+
       typescript-vim
+
       {
         plugin = ultisnips;
         type = "lua";
@@ -90,14 +110,18 @@
           vim.api.nvim_set_keymap('n', '<leader>se', ':UltiSnipsEdit!<return>', { noremap = true, silent = true })
         '';
       }
+
       vifm-vim
+
       {
         plugin = vim-astro;
         config = ''
           let g:astro_typescript = 'enable'
         '';
       }
+
       vim-commentary
+
       {
         plugin = vim-easy-align;
         config = ''
@@ -105,9 +129,11 @@
           nmap ga <Plug>(EasyAlign)
         '';
       }
+
       vim-fish
       vim-nix
       vim-repeat
+
       {
         plugin = vim-slime;
         config = ''
@@ -121,10 +147,12 @@
           nnoremap s: :SlimeSend1 
         '';
       }
+
       vim-snippets
       vim-speeddating
       vim-surround
       vim-unimpaired
+      vimwiki
     ];
   };