Update flake, fixup nvim formatting and default to grub being off

modules/home/programs/terminal/neovim/default.nix

@@ -31,68 +31,70 @@
       # Discord RPC
       vimsence
 
-      # Nerdtree
-      nerdtree
-      vim-nerdtree-syntax-highlight
-
       # Misc languages
       kdl-vim
       vim-nix
     ];
     extraConfig = ''
       lua <<EOF
-      -- Set up nvim-cmp
-      local cmp = require'cmp'
+        -- Set up nvim-cmp
+        local cmp = require'cmp'
 
-      cmp.setup({
-        snippet = {
-          -- Specify a snippet engine
-          expand = function(args)
-            vim.fn["vsnip#anonymous"](args.body)
-          end,
-        },
-        mapping = cmp.mapping.preset.insert({
-          ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-          ['<C-f>'] = cmp.mapping.scroll_docs(4),
-          ['<C-Space>'] = cmp.mapping.complete(),
-          ['<C-e>'] = cmp.mapping.abort(),
-          ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-        }),
-        sources = cmp.config.sources({
-          { name = 'nvim_lsp' },
-          { name = 'vsnip' }
-        }, {
-          { name = 'buffer' },
+        cmp.setup({
+          snippet = {
+            -- Specify a snippet engine
+            expand = function(args)
+              vim.fn["vsnip#anonymous"](args.body)
+            end,
+          },
+          mapping = cmp.mapping.preset.insert({
+            ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+            ['<C-f>'] = cmp.mapping.scroll_docs(4),
+            ['<C-Space>'] = cmp.mapping.complete(),
+            ['<C-e>'] = cmp.mapping.abort(),
+            ['<CR>'] = cmp.mapping.confirm({ select = true }),
+          }),
+          sources = cmp.config.sources(
+            {
+              { name = 'nvim_lsp' },
+              { name = 'vsnip' }
+            },
+            {
+              { name = 'buffer' }
+            }
+          )
         })
-      })
 
-      -- Use buffer source for '/' and '?'
-      cmp.setup.cmdline({ '/', '?' }, {
-        mapping = cmp.mapping.preset.cmdline(),
-        sources = {
-          { name = 'buffer' }
-        }
-      })
-
-      -- Use cmdline & path source for ':'
-      cmp.setup.cmdline(':', {
-        mapping = cmp.mapping.preset.cmdline(),
-        sources = cmp.config.sources({
-          { name = 'path' }
-        }, {
-          { name = 'cmdline' }
+        -- Use buffer source for '/' and '?'
+        cmp.setup.cmdline({ '/', '?' }, {
+          mapping = cmp.mapping.preset.cmdline(),
+          sources = {
+            { name = 'buffer' }
+          }
+        })
+
+        -- Use cmdline & path source for ':'
+        cmp.setup.cmdline(':', {
+          mapping = cmp.mapping.preset.cmdline(),
+          sources = cmp.config.sources(
+            {
+              { name = 'path' }
+            },
+            {
+              { name = 'cmdline' }
+            }
+          )
         })
-      })
       EOF
 
       colorscheme monokai_pro
       let g:airline_theme='onedark'
       let g:airline#extensions#tabline#enabled = 1
-      hi Normal guibg=none ctermbg=235
-      hi Visual guibg=#${config.look.colors.mid} ctermbg=238
-      hi Pmenu guibg=#${config.look.colors.mid} ctermbg=238
-      hi EndOfBuffer guibg=none ctermbg=235
-      hi LineNr guibg=none ctermbg=none
+      hi Normal guibg=none
+      hi Visual guibg=#${config.look.colors.mid}
+      hi Pmenu guibg=#${config.look.colors.mid}
+      hi EndOfBuffer guibg=none
+      hi LineNr guibg=none
       lua require'colorizer'.setup()
 
       set nu rnu
@@ -107,7 +109,6 @@
       nmap <C-x> :bnext<CR>
       nmap <C-z> :bprev<CR>
       nmap <C-w> :bd<CR>
-      nmap <C-a> :NERDTreeToggleVCS<CR>
     '';
   };
 

modules/home/wms/programs/default.nix

@@ -17,5 +17,6 @@
     rot8
     shotman
     wdisplays
+    wl-clipboard-rs
   ];
 }