diff --git a/flake.lock b/flake.lock
index 2581855..7bcf9bc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -164,24 +164,6 @@
         "type": "github"
       }
     },
-    "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_3"
-      },
-      "locked": {
-        "lastModified": 1782949081,
-        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": "nixpkgs"
@@ -221,24 +203,6 @@
         "type": "github"
       }
     },
-    "home-manager_3": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1785168662,
-        "narHash": "sha256-kGJTc0oEUQuEwV66lSlMxYtOEtpk9N/HS43k+rFAvs8=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "cbb77679b3d992c8b62f884cd3a84af534a28621",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "hyprcursor": {
       "inputs": {
         "hyprlang": [
@@ -590,47 +554,9 @@
         "type": "github"
       }
     },
-    "import-tree_3": {
-      "locked": {
-        "lastModified": 1784254960,
-        "narHash": "sha256-iI88R3wHz8wTKQb5orvpc51L/Xr64AJyxid/0MKa/b8=",
-        "owner": "vic",
-        "repo": "import-tree",
-        "rev": "4ebb10ae17d5f1ad366e7aef5b92cb8eecf24f69",
-        "type": "github"
-      },
-      "original": {
-        "owner": "vic",
-        "repo": "import-tree",
-        "type": "github"
-      }
-    },
-    "neovim": {
-      "inputs": {
-        "flake-parts": "flake-parts_3",
-        "home-manager": "home-manager_3",
-        "import-tree": "import-tree_3",
-        "nixpkgs": "nixpkgs_5",
-        "plugins-pywal16-nvim": "plugins-pywal16-nvim",
-        "wrappers": "wrappers"
-      },
-      "locked": {
-        "lastModified": 1785646021,
-        "narHash": "sha256-RaLSwq+ZLnGq61G0pmkXVZG6LejtNOPa3P3tT3ETgUs=",
-        "ref": "refs/heads/master",
-        "rev": "6dd175ae046cebb4db573b21ca2e139d1c6788d6",
-        "revCount": 49,
-        "type": "git",
-        "url": "https://gitea.esotericbytes.com/nathan/Moirai"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://gitea.esotericbytes.com/nathan/Moirai"
-      }
-    },
     "nixos-hardware": {
       "inputs": {
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1785232496,
@@ -650,7 +576,7 @@
     "nixos-wsl": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1784642409,
@@ -713,21 +639,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib_3": {
-      "locked": {
-        "lastModified": 1782614948,
-        "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
     "nixpkgs-us": {
       "locked": {
         "lastModified": 1785090369,
@@ -744,22 +655,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_10": {
-      "locked": {
-        "lastModified": 1772047000,
-        "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1775710090,
@@ -793,54 +688,6 @@
       }
     },
     "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1783604885,
-        "narHash": "sha256-tzMgSkV7kljEkqIjlgV6F+n+xD+/a35Db8bs7a4BFAo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "767b0d3ec98a143ad9ed7dfc0d5553510ac27133",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1785090369,
-        "narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "624af665418d3c65d544145b4d34ad696439570e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1780336545,
-        "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_7": {
       "locked": {
         "lastModified": 1767892417,
         "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
@@ -853,7 +700,7 @@
         "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1783776592,
         "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=",
@@ -869,7 +716,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_9": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1785734586,
         "narHash": "sha256-ODZkEK9Gy50yg6h98u7KkitZ3oc/uuTFK00bh1CRdNA=",
@@ -885,9 +732,41 @@
         "type": "github"
       }
     },
+    "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1772047000,
+        "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_8": {
+      "locked": {
+        "lastModified": 1780336545,
+        "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "opi-zero2w": {
       "inputs": {
-        "nixpkgs": "nixpkgs_10"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
         "lastModified": 1777256028,
@@ -907,11 +786,11 @@
     "plugins-pywal16-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1785149595,
-        "narHash": "sha256-4lpXzQ13Px/FKoVZmXLbpOZ1SbZ2DPCvKiDUeMDQ0kY=",
+        "lastModified": 1785849622,
+        "narHash": "sha256-1NQiYh1F0pTn6ZdIo4LioB5EoMx/+cUc7bk7ShBOmJE=",
         "owner": "uZer",
         "repo": "pywal16.nvim",
-        "rev": "ae9256167b544785e2a21b838c7e1cfba443d154",
+        "rev": "3fc4b37b02fa01a042c873bf6f5e9c06343692d1",
         "type": "github"
       },
       "original": {
@@ -951,13 +830,14 @@
         "home-manager": "home-manager_2",
         "hyprland": "hyprland",
         "import-tree": "import-tree_2",
-        "neovim": "neovim",
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_9",
+        "nixpkgs": "nixpkgs_6",
         "nixpkgs-us": "nixpkgs-us",
         "opi-zero2w": "opi-zero2w",
-        "sops-nix": "sops-nix"
+        "plugins-pywal16-nvim": "plugins-pywal16-nvim",
+        "sops-nix": "sops-nix",
+        "wrappers": "wrappers"
       }
     },
     "sops-nix": {
@@ -997,7 +877,7 @@
     },
     "wrappers": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
         "lastModified": 1782135443,
diff --git a/flake.nix b/flake.nix
index 56cb6e0..6cf24f3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,14 +49,11 @@
 
         hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
 
-        neovim.url = "git+https://gitea.esotericbytes.com/nathan/Moirai";
-        #neovim.url = "git+file:///home/nathan/Projects/Moirai";
-
         aurora.url = "git+https://gitea.esotericbytes.com/nathan/Aurora";
         #aurora.url = "git+file:///home/nathan/Projects/Aurora";
     };
 
     outputs = { ... } @ inputs: 
     inputs.flake-parts.lib.mkFlake { inherit inputs; }
-    (inputs.import-tree [ ./os ]);
+    (inputs.import-tree [ ./os ./home ./packages ]);
 }
diff --git a/home/nathan/features/neovim.nix b/home/nathan/features/neovim.nix
index aa51679..76b42a5 100644
--- a/home/nathan/features/neovim.nix
+++ b/home/nathan/features/neovim.nix
@@ -1,18 +1,12 @@
-{ inputs, ... }: {
+{ self, ... }: {
 
     flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
 
-        imports = [
-            #inputs.neovim.homeModules.default
-        ];
-
         config = {
-            /*programs.moirai = {
-                enable = true;
-                defaultEditor = true;
-            };*/
 
-            home.packages = [ inputs.neovim.packages.${pkgs.stdenv.hostPlatform.system}.default ];
+            home.packages = [ self.packages.${pkgs.stdenv.hostPlatform.system}.neovim ];
+
+            environment.variables = { EDITOR = "nvim"; VISUAL = "nvim"; };
         };
     };
 }