From eff13f8fc67e488131824259b024ee0d70061893 Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Fri, 22 Mar 2024 20:32:53 +0900
Subject: [PATCH] test

---
 flake.nix                                   |  6 +++---
 lib/default.nix                             |  2 +-
 nixos/containers/rdesktop/default.nix       |  2 ++
 nixos/containers/rdesktop/mounts.nix        |  1 +
 nixos/hosts/framework-server/containers.nix | 12 ++++++++++--
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6ce79018..9e1f0853 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,10 +66,10 @@
       quitman-rpi4     = libx.mkHost { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; };
     };
     homeConfigurations = {
-      "albert@osaka-linode-01"  = libx.mkHome { hostname = "osaka-linode-01"; };
-      "albert@milan-linode-01"  = libx.mkHome { hostname = "milan-linode-01"; };
+      "albert@osaka-linode-01"  = libx.mkHome { hostname = "osaka-linode-01";  };
+      "albert@milan-linode-01"  = libx.mkHome { hostname = "milan-linode-01";  };
       "albert@framework-server" = libx.mkHome { hostname = "framework-server"; };
-      "albert@nuc-server"       = libx.mkHome { hostname = "nuc-server"; };
+      "albert@nuc-server"       = libx.mkHome { hostname = "nuc-server";       };
       "albert@nixos-desktop"    = libx.mkHome { hostname = "nixos-desktop";   desktop = "hyprland"; theme = "tokyo-night";    };
       "albert@nixos-framework"  = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "green"; };
       "albert@backups-rpi4"     = libx.mkHome { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; };
diff --git a/lib/default.nix b/lib/default.nix
index ed3c64fd..e88a5d16 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -46,7 +46,7 @@
       { inherit system; config.allowUnfree = unfree; hostPlatform = system; }
   }: { 
     bindMounts = import ../nixos/containers/${hostname}/mounts.nix;
-    autoStart = true;
+    autoStart  = true;
     privateNetwork = false;
     specialArgs = { inherit pkgs pkgs-unstable hostname username desktop theme system repo unfree stateVersion tskey; };
     config = { lib, config, pkgs, pkgs-unstable, hostname, username, desktop, theme, system, repo, stateVersion, tskey, ... }: {
diff --git a/nixos/containers/rdesktop/default.nix b/nixos/containers/rdesktop/default.nix
index e6251c18..9b921889 100644
--- a/nixos/containers/rdesktop/default.nix
+++ b/nixos/containers/rdesktop/default.nix
@@ -3,6 +3,8 @@
     ../../common/desktops/${desktop}
     ../../common/software/packages.nix
   ];
+    
+  system.stateVersion = "24.05";
 
   networking.firewall.allowedTCPPorts = [ 3389 ];
 
diff --git a/nixos/containers/rdesktop/mounts.nix b/nixos/containers/rdesktop/mounts.nix
index 929b3e8a..f6040fa0 100644
--- a/nixos/containers/rdesktop/mounts.nix
+++ b/nixos/containers/rdesktop/mounts.nix
@@ -1,6 +1,7 @@
 {
   "/etc/nixos/git" = {
     hostPath = "/etc/nixos/git";
+    mountPoint = "/etc/nixos/git";
     isReadOnly = false;
   };
 }
diff --git a/nixos/hosts/framework-server/containers.nix b/nixos/hosts/framework-server/containers.nix
index cb837877..afdfae32 100644
--- a/nixos/hosts/framework-server/containers.nix
+++ b/nixos/hosts/framework-server/containers.nix
@@ -1,11 +1,19 @@
 { self, inputs, outputs, stateVersion, hmStateVersion, pkgs, pkgs-unstable, ... }:
 let 
-  libx = import ../../../lib {inherit self inputs outputs stateVersion hmStateVersion pkgs-unstable pkgs; };
+  libx = import ../../../lib { 
+    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 { hostname = "rdesktop"; desktop = "xfce"; unfree = true; };
+    rdesktop = libx.mkContainer { 
+      hostname = "rdesktop"; 
+      desktop = "plasma6"; 
+      unfree = true; 
+      repo = "nixpkgs-unstable";
+    };
   };
 }