test

lib/default.nix

@@ -33,24 +33,24 @@
   mkContainer = { 
     hostname, 
     username  ? "albert",
-    desktop   ? null, 
     system    ? "x86_64-linux", 
     theme     ? "stylix",
-    type      ? "default",
     repo      ? "nixpkgs",
-    unfree    ? false,
+    unfree    ? false
-    tskey     ? null,
-    pkgs      ? import inputs.${repo} 
-      { inherit system; config.allowUnfree = unfree; hostPlatform = system; },
-    pkgs-unstable ? import inputs.nixpkgs-unstable  
-      { inherit system; config.allowUnfree = unfree; hostPlatform = system; }
   }: { 
     bindMounts = import ../nixos/containers/${hostname}/mounts.nix;
     autoStart  = true;
     privateNetwork = false;
-    specialArgs = { inherit pkgs pkgs-unstable hostname username desktop theme system repo unfree stateVersion tskey; };
+    specialArgs = { inherit inputs unfree repo hostname username theme system; };
-    config = { lib, config, pkgs, pkgs-unstable, hostname, username, desktop, theme, system, repo, stateVersion, tskey, ... }: {
+    config = { inputs, unfree, repo, hostname, username, theme, system, ... }: {
-      system.stateVersion = stateVersion;
+      # Choose whether to pull from stable or unstable 
+      # pkgs-unstable will always be inherited from the host system
+      nixpkgs.pkgs = import inputs.${repo} {
+        inherit system; 
+        config.allowUnfree = unfree; 
+        hostPlatform = system;
+      };
+
       imports = [ 
         ../nixos/containers
       ];

nixos/containers/default.nix

@@ -5,6 +5,5 @@
     ../common/modules/nixos.nix
     ../common/modules/networking.nix
   ];
-
   networking.hostName = "${hostname}";
 }

nixos/containers/rdesktop/default.nix

@@ -1,15 +1,9 @@
-{ desktop, ... }: {
+{ ... }: {
   imports = [
-    ../../common/desktops/${desktop}
     ../../common/software/packages.nix
+    ../../common/desktops/plasma6
   ];
-    
-  system.stateVersion = "24.05";
 
   networking.firewall.allowedTCPPorts = [ 3389 ];
-
+  services.xrdp.enable = true;
-  services.xrdp = {
-    enable = true;
-    openFirewall = true;
-  };
 }

nixos/hosts/framework-server/containers.nix

@@ -1,19 +1,11 @@
 { self, inputs, outputs, stateVersion, hmStateVersion, pkgs, pkgs-unstable, ... }:
 let 
-  libx = import ../../../lib { 
+  libx = import ../../../lib { inherit self inputs outputs stateVersion hmStateVersion; };
-    inherit self inputs outputs hmStateVersion pkgs-unstable pkgs; 
-    stateVersion = "24.05";
-  };
 in {
   # TODO: Set up Tailscale key
 
   # Set up the bridge network:
   containers = {
-    rdesktop = libx.mkContainer { 
+    rdesktop = libx.mkContainer { hostname = "rdesktop"; unfree = true; repo = "nixpkgs-unstable"; };
-      hostname = "rdesktop"; 
-      desktop = "plasma6"; 
-      unfree = true; 
-      repo = "nixpkgs-unstable";
-    };
   };
 }