restructure

modules/users/nathan/home-manager/default.nix

@@ -71,13 +71,6 @@
                     };
                 };
             };
-
-            home.packages = lib.mkIf (!(builtins.any (x: x == pkgs.pywal16) config.home.packages)) [
-                inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.default
-            ];
-
-            home.sessionVariables.EDITOR = "nvim";
-
         };
     };
 }

modules/users/nathan/home-manager/features/neovim.nix

@@ -0,0 +1,18 @@
+{ 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
+                )
+            ];
+        };
+    };
+}

modules/users/nathan/home-manager/features/pywal.nix

@@ -1,16 +1,13 @@
-{ inputs, ... }: {
+{ ... }: {
 
     flake.homeModules.nathan-pywal = { config, lib, pkgs, ... }: {
 
         config = {
 
             home.packages = with pkgs; [
-                inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.pywal
                 pywal16
                 imagemagick
             ];
-
-
         };
     };
 }