moved Eve configurations into their own package

configurations/home-manager/eve/default.nix

@@ -1,10 +1,4 @@
-{
+{osConfig, ...}: let
-  pkgs,
-  lib,
-  config,
-  osConfig,
-  ...
-}: let
   userConfig = osConfig.host.users.eve;
 in {
   nixpkgs.config = {
@@ -57,42 +51,5 @@ in {
     sessionVariables = {
       # EDITOR = "emacs";
     };
-
-    packages = lib.lists.optionals userConfig.isDesktopUser (
-      with pkgs; [
-        firefox
-        bitwarden
-        discord
-        makemkv
-        signal-desktop-bin
-        ungoogled-chromium
-      ]
-    );
-  };
-
-  programs = {
-    # Let Home Manager install and manage itself.
-    home-manager.enable = true;
-
-    git = {
-      enable = true;
-      userName = "Eve";
-      userEmail = "evesnrobins@gmail.com";
-      extraConfig.init.defaultBranch = "main";
-    };
-
-    vscode = {
-      enable = true;
-      package = pkgs.vscodium;
-    };
-
-    openssh = {
-      hostKeys = [
-        {
-          type = "ed25519";
-          path = "${config.home.username}_${osConfig.networking.hostName}_ed25519";
-        }
-      ];
-    };
   };
 }

configurations/home-manager/eve/packages.nix

@@ -0,0 +1,52 @@
+{
+  lib,
+  pkgs,
+  config,
+  osConfig,
+  ...
+}: let
+  userConfig = osConfig.host.users.eve;
+in {
+  config = {
+    # Packages that can be installed without any extra configuration
+    # See https://search.nixos.org/packages for all options
+    home.packages = lib.lists.optionals userConfig.isDesktopUser (
+      with pkgs; [
+        firefox
+        bitwarden
+        discord
+        makemkv
+        signal-desktop-bin
+        ungoogled-chromium
+      ]
+    );
+
+    # Packages that need to be installed with some extra configuration
+    # See https://home-manager-options.extranix.com/ for all options
+    programs = {
+      # Let Home Manager install and manage itself.
+      home-manager.enable = true;
+
+      git = {
+        enable = true;
+        userName = "Eve";
+        userEmail = "evesnrobins@gmail.com";
+        extraConfig.init.defaultBranch = "main";
+      };
+
+      vscode = {
+        enable = true;
+        package = pkgs.vscodium;
+      };
+
+      openssh = {
+        hostKeys = [
+          {
+            type = "ed25519";
+            path = "${config.home.username}_${osConfig.networking.hostName}_ed25519";
+          }
+        ];
+      };
+    };
+  };
+}

configurations/nixos/emergent/configuration.nix

@@ -83,13 +83,14 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  # List packages installed in system profile.
+  # Packages that can be installed without any extra configuration
-  # You can use https://search.nixos.org/ to find more packages (and options).
+  # See https://search.nixos.org/packages for all options
-  # environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [
-  #   vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    wget
-  #   wget
+  ];
-  # ];
 
+  # Packages that need to be installed with some extra configuration
+  # See https://search.nixos.org/options for all options
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play