diff --git a/_old/nixvim/default.nix b/_old/nixvim/default.nix
deleted file mode 100644
index 747db9e..0000000
--- a/_old/nixvim/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  imports = [
-    ./plugins
-
-    ./autocmd.nix
-    ./basic.nix
-    ./keymaps.nix
-    ./lsp.nix
-  ];
-}
diff --git a/flake.lock b/flake.lock
index 9f3ed13..d0a3dbe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -33,7 +33,28 @@
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
-          "nixpkgs-lib"
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778716662,
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixvim",
+          "nixpkgs"
         ]
       },
       "locked": {
@@ -98,6 +119,42 @@
         "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1782175435,
+        "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixvim": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": "nixpkgs_2",
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1782254890,
+        "narHash": "sha256-kjsEECqhpPnJWqhooXp6tWh2qGQftCPAo2G1GvZtKdw=",
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "rev": "dbf9550dba8448b03e11d58e5695d6c44a464554",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "den": "den",
@@ -106,9 +163,23 @@
         "home-manager": "home-manager",
         "import-tree": "import-tree",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-lib": [
-          "nixpkgs"
-        ]
+        "nixvim": "nixvim"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1774449309,
+        "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "ref": "future-26.11",
+        "repo": "default",
+        "type": "github"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index e6b5b43..ddce988 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,23 +1,21 @@
 # DO-NOT-EDIT. This file was auto-generated using github:vic/flake-file.
 # Use `nix run .#write-flake` to regenerate it.
 {
-
   outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);
 
   inputs = {
     den.url = "github:denful/den";
     flake-file.url = "github:vic/flake-file";
     flake-parts = {
-      inputs.nixpkgs-lib.follows = "nixpkgs-lib";
       url = "github:hercules-ci/flake-parts";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
     };
     home-manager = {
-      inputs.nixpkgs.follows = "nixpkgs";
       url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     import-tree.url = "github:vic/import-tree";
     nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
-    nixpkgs-lib.follows = "nixpkgs";
+    nixvim.url = "github:nix-community/nixvim";
   };
-
 }
diff --git a/modules/igneous.nix b/modules/igneous.nix
index 030964e..c71c553 100644
--- a/modules/igneous.nix
+++ b/modules/igneous.nix
@@ -7,6 +7,7 @@
       den.batteries.primary-user
 
       bat
+      nixvim
       shell
       shell.bash
       shell.zsh
diff --git a/_old/nixvim/autocmd.nix b/modules/nixvim/_autocmd.nix
similarity index 100%
rename from _old/nixvim/autocmd.nix
rename to modules/nixvim/_autocmd.nix
diff --git a/_old/nixvim/basic.nix b/modules/nixvim/_basic.nix
similarity index 100%
rename from _old/nixvim/basic.nix
rename to modules/nixvim/_basic.nix
diff --git a/_old/nixvim/keymaps.nix b/modules/nixvim/_keymaps.nix
similarity index 100%
rename from _old/nixvim/keymaps.nix
rename to modules/nixvim/_keymaps.nix
diff --git a/_old/nixvim/lsp.nix b/modules/nixvim/_lsp.nix
similarity index 100%
rename from _old/nixvim/lsp.nix
rename to modules/nixvim/_lsp.nix
diff --git a/_old/nixvim/plugins/default.nix b/modules/nixvim/_plugins/default.nix
similarity index 100%
rename from _old/nixvim/plugins/default.nix
rename to modules/nixvim/_plugins/default.nix
diff --git a/_old/nixvim/plugins/gitsigns.nix b/modules/nixvim/_plugins/gitsigns.nix
similarity index 100%
rename from _old/nixvim/plugins/gitsigns.nix
rename to modules/nixvim/_plugins/gitsigns.nix
diff --git a/_old/nixvim/plugins/mini.nix b/modules/nixvim/_plugins/mini.nix
similarity index 100%
rename from _old/nixvim/plugins/mini.nix
rename to modules/nixvim/_plugins/mini.nix
diff --git a/_old/nixvim/plugins/telescope.nix b/modules/nixvim/_plugins/telescope.nix
similarity index 100%
rename from _old/nixvim/plugins/telescope.nix
rename to modules/nixvim/_plugins/telescope.nix
diff --git a/_old/nixvim/plugins/treesitter.nix b/modules/nixvim/_plugins/treesitter.nix
similarity index 100%
rename from _old/nixvim/plugins/treesitter.nix
rename to modules/nixvim/_plugins/treesitter.nix
diff --git a/_old/nixvim/plugins/trouble.nix b/modules/nixvim/_plugins/trouble.nix
similarity index 100%
rename from _old/nixvim/plugins/trouble.nix
rename to modules/nixvim/_plugins/trouble.nix
diff --git a/_old/nixvim/plugins/which-key.nix b/modules/nixvim/_plugins/which-key.nix
similarity index 100%
rename from _old/nixvim/plugins/which-key.nix
rename to modules/nixvim/_plugins/which-key.nix
diff --git a/modules/nixvim/nixvim.nix b/modules/nixvim/nixvim.nix
new file mode 100644
index 0000000..eaafb8a
--- /dev/null
+++ b/modules/nixvim/nixvim.nix
@@ -0,0 +1,28 @@
+{ inputs, ... }: {
+  flake-file.inputs.nixvim = {
+    url = "github:nix-community/nixvim";
+  };
+
+  den.aspects.nixvim = {
+    homeManager = {
+      imports = [ inputs.nixvim.homeModules.nixvim ];
+
+      programs.nixvim = {
+        enable = true;
+
+        imports = [
+          ./_plugins
+
+          ./_autocmd.nix
+          ./_basic.nix
+          ./_keymaps.nix
+          ./_lsp.nix
+        ];
+      };
+
+      home.shellAliases = {
+        vim = "nvim";
+      };
+    };
+  };
+}