Rearrange things

home-manager/common/image-specific.nix

@@ -1,4 +0,0 @@
-{ lib, ... }: {
-  # Requires secrets not available in images
-  programs.atuin.enable = lib.mkDefault false; 
-}

home-manager/image.nix

@@ -16,7 +16,6 @@
   ++ lib.optional (builtins.isString desktop) ./common/software/gui                    # GUI packages
   ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop}             # Machine-agnostic desktop configs
   ++ lib.optional (builtins.isString desktop) ./hosts/${hostname}/desktops/${desktop}  # Machine-specific desktop configs
-  ++ lib.optional (builtins.isString isImage) ./common/image-specific.nix              # Image specific items
   ;
 
   programs.atuin.enable = lib.mkDefault false; 

lib/default.nix

@@ -168,9 +168,17 @@
     system    ? "x86_64-linux",
     gpu       ? null, 
     theme     ? "default",
+    repo      ? "nixpkgs",
+    unfree    ? false,
     format
   }: inputs.nixos-generators.nixosGenerate {
-    specialArgs = { inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu system theme format; };
+    specialArgs = { 
+      inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu system theme format;
+      # Choose whether to pull from stable or unstable 
+      pkgs          = let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs;
+      pkgs-unstable = let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs-unstable;
+    };
+
     system = system;
     format = format;
 

nixos/base.nix

@@ -1,10 +1,5 @@
 { inputs, lib,hostname, username, desktop, ... }: {
   imports = [ 
-    # Services
-    ./common/services/tailscale.nix
-    ./common/services/promtail.nix
-    ./common/services/telegraf.nix
-
     # NixOS Modules
     ./common/modules/networking.nix      # Initial Networking configs
     ./common/modules/nixos.nix           # Common NixOS Configurations

nixos/common/modules/installer.nix

@@ -1,4 +1,4 @@
-{ config, desktop, lib, pkgs, username, ... }:
+{ pkgs, ... }:
 let
   install-system = pkgs.writeScriptBin "install-system" "${builtins.readFile ../../../docs/install.sh}";
 in

nixos/small.nix

@@ -7,6 +7,10 @@
     # Services
     ./common/services/openssh.nix
     ./common/services/fail2ban.nix
+    ./common/services/tailscale.nix
+    ./common/services/promtail.nix
+    ./common/services/telegraf.nix
+
 
     # Software
     ./common/software/cli/scripts.nix