fix: update flake inputs to fix nodePackages deprecation

config/dashboard.nix

@@ -2,180 +2,182 @@
   plugins = {
     alpha = {
       enable = true;
-      layout = [
+      settings = {
-        {
+        layout = [
-          type = "padding";
+          {
-          val = 2;
+            type = "padding";
-        }
+            val = 2;
-        {
+          }
-          type = "text";
+          {
-          val = [
+            type = "text";
-            "███╗   ██╗██╗██╗  ██╗ ██████╗ ██╗   ██╗██╗███╗   ███╗"
+            val = [
-            "████╗  ██║██║╚██╗██╔╝██╔═══██╗██║   ██║██║████╗ ████║"
+              "███╗   ██╗██╗██╗  ██╗ ██████╗ ██╗   ██╗██╗███╗   ███╗"
-            "██╔██╗ ██║██║ ╚███╔╝ ██║   ██║██║   ██║██║██╔████╔██║"
+              "████╗  ██║██║╚██╗██╔╝██╔═══██╗██║   ██║██║████╗ ████║"
-            "██║╚██╗██║██║ ██╔██╗ ██║   ██║╚██╗ ██╔╝██║██║╚██╔╝██║"
+              "██╔██╗ ██║██║ ╚███╔╝ ██║   ██║██║   ██║██║██╔████╔██║"
-            "██║ ╚████║██║██╔╝ ██╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║"
+              "██║╚██╗██║██║ ██╔██╗ ██║   ██║╚██╗ ██╔╝██║██║╚██╔╝██║"
-            "╚═╝  ╚═══╝╚═╝╚═╝  ╚═╝ ╚═════╝   ╚═══╝  ╚═╝╚═╝     ╚═╝"
+              "██║ ╚████║██║██╔╝ ██╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║"
-          ];
+              "╚═╝  ╚═══╝╚═╝╚═╝  ╚═╝ ╚═════╝   ╚═══╝  ╚═╝╚═╝     ╚═╝"
-          opts = {
+            ];
-            position = "center";
+            opts = {
-            hl = "Type";
+              position = "center";
-          };
+              hl = "Type";
-        }
+            };
-        {
+          }
-          type = "text";
+          {
-          val = [" "];
+            type = "text";
-        }
+            val = [" "];
-        {
+          }
-          type = "padding";
+          {
-          val = 1;
+            type = "padding";
-        }
+            val = 1;
-        {
+          }
-          type = "text";
+          {
-          val = [
+            type = "text";
-            "╔════════════════════════════╗"
+            val = [
-            "║ ...better than most IDEs!  ║"
+              "╔════════════════════════════╗"
-            "╚════════════════════════════╝"
+              "║ ...better than most IDEs!  ║"
-          ];
+              "╚════════════════════════════╝"
-          opts = {
+            ];
-            position = "center";
+            opts = {
-          };
+              position = "center";
-        }
+            };
-        {
+          }
-          type = "padding";
+          {
-          val = 4;
+            type = "padding";
-        }
+            val = 4;
-        {
+          }
-          type = "group";
+          {
-          val = [
+            type = "group";
-            {
+            val = [
-              type = "button";
+              {
-              val = "      New File    ";
+                type = "button";
-              on_press.__raw = "function() vim.cmd[[ene]] end";
+                val = "      New File    ";
-              opts = {
+                on_press.__raw = "function() vim.cmd[[ene]] end";
-                shortcut = "n";
+                opts = {
-                keymap = [
+                  shortcut = "n";
-                  "n"
+                  keymap = [
-                  "n"
+                    "n"
-                  "<cmd>ene<CR>"
+                    "n"
-                  {
+                    "<cmd>ene<CR>"
-                    noremap = true;
+                    {
-                    silent = true;
+                      noremap = true;
-                    nowait = true;
+                      silent = true;
-                  }
+                      nowait = true;
-                ];
+                    }
-                position = "center";
+                  ];
-                width = 50;
+                  position = "center";
-                align_shortcut = "right";
+                  width = 50;
-                hl_shortcut = "Keyword";
+                  align_shortcut = "right";
-              };
+                  hl_shortcut = "Keyword";
-            }
+                };
-            {
+              }
-              type = "padding";
+              {
-              val = 1;
+                type = "padding";
-            }
+                val = 1;
-            {
+              }
-              type = "button";
+              {
-              val = "      Find File    ";
+                type = "button";
-              opts = {
+                val = "      Find File    ";
-                shortcut = "f";
+                opts = {
-                keymap = [
+                  shortcut = "f";
-                  "n"
+                  keymap = [
-                  "f"
+                    "n"
-                  "<cmd>lua require('fzf-lua').files({ cwd = vim.loop.cwd() })<CR>"
+                    "f"
-                  {
+                    "<cmd>lua require('fzf-lua').files({ cwd = vim.loop.cwd() })<CR>"
-                    noremap = true;
+                    {
-                    silent = true;
+                      noremap = true;
-                    nowait = true;
+                      silent = true;
-                  }
+                      nowait = true;
-                ];
+                    }
-                position = "center";
+                  ];
-                width = 50;
+                  position = "center";
-                align_shortcut = "right";
+                  width = 50;
-                hl_shortcut = "Keyword";
+                  align_shortcut = "right";
-              };
+                  hl_shortcut = "Keyword";
-            }
+                };
-            {
+              }
-              type = "padding";
+              {
-              val = 1;
+                type = "padding";
-            }
+                val = 1;
-            {
+              }
-              type = "button";
+              {
-              val = "      Recent Files    ";
+                type = "button";
-              on_press.__raw = "function() require('telescope.builtin').oldfiles() end";
+                val = "      Recent Files    ";
-              opts = {
+                on_press.__raw = "function() require('telescope.builtin').oldfiles() end";
-                shortcut = "r";
+                opts = {
-                keymap = [
+                  shortcut = "r";
-                  "n"
+                  keymap = [
-                  "r"
+                    "n"
-                  "<cmd>lua require('fzf-lua').oldfiles({ cwd = vim.loop.cwd() })<CR>"
+                    "r"
-                  {
+                    "<cmd>lua require('fzf-lua').oldfiles({ cwd = vim.loop.cwd() })<CR>"
-                    noremap = true;
+                    {
-                    silent = true;
+                      noremap = true;
-                    nowait = true;
+                      silent = true;
-                  }
+                      nowait = true;
-                ];
+                    }
-                position = "center";
+                  ];
-                width = 50;
+                  position = "center";
-                align_shortcut = "right";
+                  width = 50;
-                hl_shortcut = "Keyword";
+                  align_shortcut = "right";
-              };
+                  hl_shortcut = "Keyword";
-            }
+                };
-            {
+              }
-              type = "padding";
+              {
-              val = 1;
+                type = "padding";
-            }
+                val = 1;
-            {
+              }
-              type = "button";
+              {
-              val = "      Find Text    ";
+                type = "button";
-              on_press.__raw = "function() require('telescope.builtin').live_grep() end";
+                val = "      Find Text    ";
-              opts = {
+                on_press.__raw = "function() require('telescope.builtin').live_grep() end";
-                shortcut = "g";
+                opts = {
-                keymap = [
+                  shortcut = "g";
-                  "n"
+                  keymap = [
-                  "g"
+                    "n"
-                  "<cmd>lua require('fzf-lua').live_grep()<CR>"
+                    "g"
-                  {
+                    "<cmd>lua require('fzf-lua').live_grep()<CR>"
-                    noremap = true;
+                    {
-                    silent = true;
+                      noremap = true;
-                    nowait = true;
+                      silent = true;
-                  }
+                      nowait = true;
-                ];
+                    }
-                position = "center";
+                  ];
-                width = 50;
+                  position = "center";
-                align_shortcut = "right";
+                  width = 50;
-                hl_shortcut = "Keyword";
+                  align_shortcut = "right";
-              };
+                  hl_shortcut = "Keyword";
-            }
+                };
-            {
+              }
-              type = "padding";
+              {
-              val = 1;
+                type = "padding";
-            }
+                val = 1;
-            {
+              }
-              type = "button";
+              {
-              val = "      Quit Neovim    ";
+                type = "button";
-              on_press.__raw = "function() vim.cmd[[qa]] end";
+                val = "      Quit Neovim    ";
-              opts = {
+                on_press.__raw = "function() vim.cmd[[qa]] end";
-                shortcut = "q";
+                opts = {
-                keymap = [
+                  shortcut = "q";
-                  "n"
+                  keymap = [
-                  "q"
+                    "n"
-                  "<cmd>qa<CR>"
+                    "q"
-                  {
+                    "<cmd>qa<CR>"
-                    noremap = true;
+                    {
-                    silent = true;
+                      noremap = true;
-                    nowait = true;
+                      silent = true;
-                  }
+                      nowait = true;
-                ];
+                    }
-                position = "center";
+                  ];
-                width = 50;
+                  position = "center";
-                align_shortcut = "right";
+                  width = 50;
-                hl_shortcut = "Keyword";
+                  align_shortcut = "right";
-              };
+                  hl_shortcut = "Keyword";
-            }
+                };
-          ];
+              }
-        }
+            ];
-      ];
+          }
+        ];
+      };
     };
   };
 }

config/iac/language.nix

@@ -6,12 +6,13 @@
         formatters_by_ft = {
           terraform = ["tofu_fmt"];
           tf = ["tofu_fmt"];
-          sh = ["beautysh"];
+          sh = ["shfmt"];
+          bash = ["shfmt"];
         };
       };
     };
     lsp.servers = {
-      ansiblels.enable = true;
+      ansiblels.enable = false; # they stopped updating it...
       dockerls.enable = true;
       helm_ls.enable = true;
       nginx_language_server.enable = true;

config/plugins.nix

@@ -30,7 +30,6 @@ in {
   ];
 
   extraConfigLua = ''
-    require("telescope").load_extension('harpoon')
 
     require("notify").setup({
       background_colour = "#000000",

config/sets.nix

@@ -33,17 +33,14 @@
         watch_gitdir = {follow_files = true;};
       };
     };
-
     harpoon = {
-      enable = true;
+      enable = false;
       settings = {
-        saveOnToggle = true;
+        save_on_toggle = true;
-        saveOnChange = true;
+        save_on_change = true;
-        enterOnSendcmd = false;
+        enter_on_sendcmd = false;
-        markBranch = true;
       };
     };
-
     hop.enable = true;
     illuminate.enable = true;
     image.enable = true;
@@ -145,14 +142,25 @@
     };
     render-markdown.enable = true;
     todo-comments.enable = true;
-
     treesitter = {
       enable = true;
-
+      folding.enable = false; # Fixes the folding deprecation warning
-      folding = false;
+      settings = {
-      settings.indent.enable = true;
+        indent.enable = true;
+        auto_install = false; # Disable runtime installation
+        # ensure_installed = [
+        #   "git_config"
+        #   "git_rebase"
+        #   "gitattributes"
+        #   "gitcommit"
+        #   "gitignore"
+        #   "bash"
+        #   "python"
+        #   "lua"
+        #   "nix"
+        # ];
+      };
     };
-
     vim-surround.enable = true;
     web-devicons.enable = true;
   };

flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1751413152,
+        "lastModified": 1738453229,
-        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
+        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
+        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
         "type": "github"
       },
       "original": {
@@ -26,11 +26,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749398372,
+        "lastModified": 1778716662,
-        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
         "type": "github"
       },
       "original": {
@@ -39,59 +39,13 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "ixx": {
-      "inputs": {
-        "flake-utils": [
-          "nixvim",
-          "nuschtosSearch",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixvim",
-          "nuschtosSearch",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1748294338,
-        "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
-        "owner": "NuschtOS",
-        "repo": "ixx",
-        "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "ref": "v0.0.8",
-        "repo": "ixx",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1751271578,
+        "lastModified": 1778869304,
-        "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
+        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
+        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
         "type": "github"
       },
       "original": {
@@ -103,36 +57,17 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1751159883,
+        "lastModified": 1738452942,
-        "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
+        "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
-        "owner": "nix-community",
+        "type": "tarball",
-        "repo": "nixpkgs.lib",
+        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
-        "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
-        "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "type": "tarball",
-        "repo": "nixpkgs.lib",
+        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
-        "type": "github"
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1750811787,
-        "narHash": "sha256-rD/978c35JXz6JLAzciTIOCMenPumF6zrQOj4rVZeHE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "992f916556fcfaa94451ebc7fc6e396134bbf5b1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1744536153,
         "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@@ -151,44 +86,22 @@
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_2",
-        "nuschtosSearch": "nuschtosSearch",
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1751492444,
-        "narHash": "sha256-26NgRXwhNM2x4hrok0C3CqSf2v0vi9byONNON5PzbHQ=",
-        "owner": "nix-community",
-        "repo": "nixvim",
-        "rev": "239d331bb48673dfd00d7187654892471cd60d44",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixvim",
-        "type": "github"
-      }
-    },
-    "nuschtosSearch": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "ixx": "ixx",
         "nixpkgs": [
-          "nixvim",
           "nixpkgs"
-        ]
+        ],
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1749730855,
+        "lastModified": 1779023681,
-        "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=",
+        "narHash": "sha256-K7RLGyiK3J6wHr/JDxXdlGF0+0DEsdBf1w9mXjSyL8I=",
-        "owner": "NuschtOS",
+        "owner": "nix-community",
-        "repo": "search",
+        "repo": "nixvim",
-        "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742",
+        "rev": "0d05726bfb060f6559f6d64c1d427f3663dba178",
         "type": "github"
       },
       "original": {
-        "owner": "NuschtOS",
+        "owner": "nix-community",
-        "repo": "search",
+        "repo": "nixvim",
         "type": "github"
       }
     },
@@ -202,14 +115,14 @@
     },
     "rust-overlay": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1751683029,
+        "lastModified": 1766544144,
-        "narHash": "sha256-dYO5X5jK8bpQOeRAo8R5aUt6M/+Ji1cZgstZI7SQ2IA=",
+        "narHash": "sha256-5ppfEyZqX6FMluZHty7Dvw4xN10vLq1yQosp7dGG/28=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "9e5e62a33a929a67a5427fb7324a6f583dced0b2",
+        "rev": "5359a4fdc3fa9baa2edcf49758d404dfeeca7743",
         "type": "github"
       },
       "original": {
@@ -232,21 +145,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -2,7 +2,10 @@
   description = "A nixvim configuration";
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixvim.url = "github:nix-community/nixvim";
+    nixvim = {
+      url = "github:nix-community/nixvim";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     flake-parts.url = "github:hercules-ci/flake-parts";
     rust-overlay.url = "github:oxalica/rust-overlay";
   };
@@ -30,11 +33,42 @@
         overlays = [(import rust-overlay)];
         nixvimLib = nixvim.lib.${system};
         nixvim' = nixvim.legacyPackages.${system};
+        pkgs = import inputs.nixpkgs {
+          inherit system overlays;
+          config.allowUnfree = true;
+        };
+        deps = with pkgs; [
+          sops
+          lazygit
+          nerd-fonts.jetbrains-mono
+          rust-bin.stable.latest.default # From rust-overlay
+          ansible-lint
+          beautysh
+          shellcheck
+          shfmt
+        ];
+
+        fullNixvimModule = {
+          inherit pkgs;
+          module = {pkgs, ...}: {
+            imports = [
+              ./config
+              ./config/rust
+              ./config/csharp
+              ./config/golang
+              ./config/python
+              ./config/javascript
+              ./config/iac
+            ];
+            extraPackages = deps;
+          };
+          extraSpecialArgs = specialArgs; # Keep specialArgs for self-reference
+        };
         baseNixvimModule = {
           inherit pkgs;
           module = {pkgs, ...}: {
             imports = [./config];
-            extraPackages = with pkgs; [sops lazygit nerd-fonts.jetbrains-mono];
+            extraPackages = deps;
           };
           extraSpecialArgs = specialArgs;
         };
@@ -107,10 +141,8 @@
           };
           extraSpecialArgs = {};
         };
-        pkgs = import inputs.nixpkgs {
+
-          inherit system overlays;
+        fullNvim = nixvim'.makeNixvimWithModule fullNixvimModule;
-          config.allowUnfree = true;
-        };
         baseNvim = nixvim'.makeNixvimWithModule baseNixvimModule;
         rustNvim = nixvim'.makeNixvimWithModule rustNixvimModule;
         csharpNvim = nixvim'.makeNixvimWithModule csharpNixvimModule;
@@ -120,23 +152,16 @@
         iacNvim = nixvim'.makeNixvimWithModule iacNixvimModule;
       in {
         checks = {
-          # Run `nix flake check .` to verify that your config is not broken
           default = nixvimLib.check.mkTestDerivationFromNixvimModule baseNixvimModule;
         };
         packages = {
-          # Lets you run `nix run .` to start nixvim
           default = baseNvim;
-          # Lets you run `nix run .#rust` to start nixvim with Rust configuration
+          full = fullNvim;
           rust = rustNvim;
-          # Lets you run `nix run .#csharp` to start nixvim with C# configuration
           csharp = csharpNvim;
-          # Lets you run `nix run .#golang` to start nixvim with Go configuration
           golang = goNvim;
-          # Lets you run `nix run .#python` to start nixvim with Python configuration
           python = pythonNvim;
-          # Lets you run `nix run .#javascript` to start nixvim with JS/TS configuration
+          javascript = javascriptNvim; # This should be javascriptNvim not javascriptNixvimModule
-          javascript = javascriptNvim;
-          # Lets you run `nix run .#javascript` to start nixvim with IaC configuration
           iac = iacNvim;
         };
       };

test.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+  function hello() {
+echo "Hello World
+  }
+
+hello