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

flake.lock

@@ -5,12 +5,12 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1744818303,
+        "lastModified": 1746378999,
-        "narHash": "sha256-9KSzECGoi5WJfw6LW5aCx/BQWocC9zh2ulQK/AigW8E=",
+        "narHash": "sha256-EwX7RUS3+jAM8W6CT5RbUzBSakv1OYxhzeTFUptggUI=",
-        "rev": "a8d868fab40b51eba89d2a6c857f9dd9c6e05518",
+        "rev": "85d76721132cc6631bbaa8c950d4d0f3aa4003fd",
-        "revCount": 136,
+        "revCount": 137,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/edolstra/blender-bin/1.0.14/01963f48-25e8-7e82-bc88-446c6fb49e67/source.tar.gz?rev=a8d868fab40b51eba89d2a6c857f9dd9c6e05518&revCount=136"
+        "url": "https://api.flakehub.com/f/pinned/edolstra/blender-bin/1.0.15/01969c4d-b680-7b45-a6b4-65a828e5f108/source.tar.gz?rev=85d76721132cc6631bbaa8c950d4d0f3aa4003fd&revCount=137"
       },
       "original": {
         "type": "tarball",
@@ -61,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745812220,
+        "lastModified": 1746411114,
-        "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=",
+        "narHash": "sha256-mLlkVX1kKbAa/Ns5u26wDYw4YW4ziMFM21fhtRmfirU=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78",
+        "rev": "b5d1320ebc2f34dbea4655f95167f55e2130cdb3",
         "type": "github"
       },
       "original": {
@@ -229,11 +229,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745557122,
+        "lastModified": 1746171682,
-        "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
+        "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
+        "rev": "50eee705bbdbac942074a8c120e8194185633675",
         "type": "github"
       },
       "original": {
@@ -266,11 +266,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745487384,
+        "lastModified": 1746158343,
-        "narHash": "sha256-WvQ4XXi0vMtEpPqhfo8ztxjeaeHkbW5tfR4O5+w8r5U=",
+        "narHash": "sha256-i/1os9oEq0m/Da4FTdSqKUdI4+wzrvoDTuk1/dHSVDc=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "0168e4a65c9d43c22ac38ff27f5fa31c7d535148",
+        "rev": "8b45a8efb2829adf2996b51965ada1e4620631ac",
         "type": "github"
       },
       "original": {
@@ -316,11 +316,11 @@
         "nixpkgs-24_11": "nixpkgs-24_11"
       },
       "locked": {
-        "lastModified": 1734884447,
+        "lastModified": 1746469806,
-        "narHash": "sha256-HA9fAmGNGf0cOYrhgoa+B6BxNVqGAYXfLyx8zIS0ZBY=",
+        "narHash": "sha256-kL3cc25sc0x+6gBZYjuE4566RT1E3XLQs4V8sl7D+VE=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "63209b1def2c9fc891ad271f474a3464a5833294",
+        "rev": "14857a0309d7bbdf7c51bbfa309d0d13448ae77e",
         "type": "gitlab"
       },
       "original": {
@@ -337,11 +337,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1745978367,
+        "lastModified": 1746324578,
-        "narHash": "sha256-sBBdYbDTM8cZknj+3wwb05xOx/Di2cCtu/XQqz4U6u4=",
+        "narHash": "sha256-VUSIQ2W1Q3YgGvX3M4jPwIi3iIApdPHabhdrVjVgnwE=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "e5d5c68e28c3d2f03110f316be380bf90d5a54b7",
+        "rev": "9e7fd83ba3b25b6f03561a5b7f8ea74b70296816",
         "type": "github"
       },
       "original": {
@@ -443,11 +443,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1745985483,
+        "lastModified": 1746568792,
-        "narHash": "sha256-XyNOPt8aXO9PIsCYlWE+3ESQh6az5/x5R28Bg8tOFf8=",
+        "narHash": "sha256-e3QkOhtYJUlMLGCVUmQWULtVDokSJqud0VmPZoRj4s0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "0f15df49e568d98995e0e8f9cf048ce36722409f",
+        "rev": "29d16321b0f48ad0d24c3eaf5656adfaaf99d19e",
         "type": "github"
       },
       "original": {
@@ -525,11 +525,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1745868005,
+        "lastModified": 1746422338,
-        "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=",
+        "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "330d0a4167924b43f31cc9406df363f71b768a02",
+        "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa",
         "type": "github"
       },
       "original": {
@@ -591,11 +591,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1745930157,
+        "lastModified": 1746461020,
-        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
+        "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
+        "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
         "type": "github"
       },
       "original": {

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
+        -- Set up nvim-cmp
-      local cmp = require'cmp'
+        local cmp = require'cmp'
 
-      cmp.setup({
+        cmp.setup({
-        snippet = {
+          snippet = {
-          -- Specify a snippet engine
+            -- Specify a snippet engine
-          expand = function(args)
+            expand = function(args)
-            vim.fn["vsnip#anonymous"](args.body)
+              vim.fn["vsnip#anonymous"](args.body)
-          end,
+            end,
-        },
+          },
-        mapping = cmp.mapping.preset.insert({
+          mapping = cmp.mapping.preset.insert({
-          ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+            ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-          ['<C-f>'] = cmp.mapping.scroll_docs(4),
+            ['<C-f>'] = cmp.mapping.scroll_docs(4),
-          ['<C-Space>'] = cmp.mapping.complete(),
+            ['<C-Space>'] = cmp.mapping.complete(),
-          ['<C-e>'] = cmp.mapping.abort(),
+            ['<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.
+            ['<CR>'] = cmp.mapping.confirm({ select = true }),
-        }),
+          }),
-        sources = cmp.config.sources({
+          sources = cmp.config.sources(
-          { name = 'nvim_lsp' },
+            {
-          { name = 'vsnip' }
+              { name = 'nvim_lsp' },
-        }, {
+              { name = 'vsnip' }
-          { name = 'buffer' },
+            },
+            {
+              { name = 'buffer' }
+            }
+          )
         })
-      })
 
-      -- Use buffer source for '/' and '?'
+        -- Use buffer source for '/' and '?'
-      cmp.setup.cmdline({ '/', '?' }, {
+        cmp.setup.cmdline({ '/', '?' }, {
-        mapping = cmp.mapping.preset.cmdline(),
+          mapping = cmp.mapping.preset.cmdline(),
-        sources = {
+          sources = {
-          { name = 'buffer' }
+            { name = 'buffer' }
-        }
+          }
-      })
+        })
-
+
-      -- Use cmdline & path source for ':'
+        -- Use cmdline & path source for ':'
-      cmp.setup.cmdline(':', {
+        cmp.setup.cmdline(':', {
-        mapping = cmp.mapping.preset.cmdline(),
+          mapping = cmp.mapping.preset.cmdline(),
-        sources = cmp.config.sources({
+          sources = cmp.config.sources(
-          { name = 'path' }
+            {
-        }, {
+              { name = 'path' }
-          { name = 'cmdline' }
+            },
+            {
+              { 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 Normal guibg=none
-      hi Visual guibg=#${config.look.colors.mid} ctermbg=238
+      hi Visual guibg=#${config.look.colors.mid}
-      hi Pmenu guibg=#${config.look.colors.mid} ctermbg=238
+      hi Pmenu guibg=#${config.look.colors.mid}
-      hi EndOfBuffer guibg=none ctermbg=235
+      hi EndOfBuffer guibg=none
-      hi LineNr guibg=none ctermbg=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
   ];
 }

modules/system/devices/boot/grub/default.nix

@@ -1,6 +1,7 @@
-{ ... }:
+{ lib, ... }:
 {
   boot.loader.grub = {
+    enable = lib.mkDefault false;
     efiSupport = true;
     efiInstallAsRemovable = true;
   };