diff --git a/flake.lock b/flake.lock
index 147809c..c3f31fc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -249,6 +249,24 @@
         "type": "github"
       }
     },
+    "home-manager_3": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1776885253,
+        "narHash": "sha256-vslJ5ezhyD+HBMEqzsPLOBfalILmPrAABR68yxrhEuM=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "d79c987e654347083e903ab6d2a89ed3d0752177",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "hyprcursor": {
       "inputs": {
         "hyprlang": [
@@ -726,6 +744,22 @@
       }
     },
     "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1775423009,
+        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1775710090,
         "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
@@ -741,7 +775,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1774701658,
         "narHash": "sha256-CIS/4AMUSwUyC8X5g+5JsMRvIUL3YUfewe8K4VrbsSQ=",
@@ -760,15 +794,16 @@
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts_3",
-        "nixpkgs": "nixpkgs_5",
+        "home-manager": "home-manager_3",
+        "nixpkgs": "nixpkgs_6",
         "nixvim": "nixvim_2"
       },
       "locked": {
-        "lastModified": 1775908700,
-        "narHash": "sha256-LCKSjajVfYyjsw1k1oNZPrDblPHt36jyJZWS2+1XybU=",
+        "lastModified": 1776887413,
+        "narHash": "sha256-zIx29OCh30Bpi4lHwce/5Qz86n6OVqDFi3P5QLRXh7Y=",
         "ref": "refs/heads/master",
-        "rev": "a62d8ce7f86424a297adead378be5f5a441add3c",
-        "revCount": 39,
+        "rev": "7fb16160f7170a580d6791d0f26736ff68cceb3c",
+        "revCount": 40,
         "type": "git",
         "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai"
       },
@@ -780,7 +815,7 @@
     "nixvim_2": {
       "inputs": {
         "flake-parts": "flake-parts_4",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_7",
         "systems": "systems_2"
       },
       "locked": {
diff --git a/modules/users/nathan/home-manager/features/neovim.nix b/modules/users/nathan/home-manager/features/neovim.nix
deleted file mode 100644
index 4ea5f3b..0000000
--- a/modules/users/nathan/home-manager/features/neovim.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ inputs, ... }: {
-
-    flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
-
-        programs.neovim = {
-            defaultEditor = true;
-            package = lib.mkMerge [
-                (lib.mkIf (builtins.any (x: x == pkgs.pywal16) config.home.packages)
-                    inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.pywal
-                )
-
-                (lib.mkIf (!(builtins.any (x: x == pkgs.pywal16) config.home.packages)) 
-                    inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.default
-                )
-            ];
-        };
-    };
-}
diff --git a/modules/users/nathan/home-manager/features/nixvim.nix b/modules/users/nathan/home-manager/features/nixvim.nix
new file mode 100644
index 0000000..804a735
--- /dev/null
+++ b/modules/users/nathan/home-manager/features/nixvim.nix
@@ -0,0 +1,16 @@
+{ inputs, ... }: {
+
+    flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
+
+        imports = [
+            inputs.nixvim.homeModules.default
+        ];
+
+        config = {
+            programs.moirai = {
+                enable = true;
+                defaultEditor = true;
+            };
+        };
+    };
+}
diff --git a/modules/users/nathan/home-manager/features/pywal.nix b/modules/users/nathan/home-manager/features/pywal.nix
index 51b1f85..48045bd 100644
--- a/modules/users/nathan/home-manager/features/pywal.nix
+++ b/modules/users/nathan/home-manager/features/pywal.nix
@@ -4,6 +4,8 @@
 
         config = {
 
+            programs.moirai.pywal = true;
+
             home.packages = with pkgs; [
                 pywal16
                 imagemagick