Update containers, add Jared as a user

nixos/containers/jared-rdesktop/default.nix

@@ -1,23 +0,0 @@
-{ pkgs, desktop, username, ... }: {
-  imports = [
-    ../../users/${username}
-    ../../common/desktops/${desktop}
-    ../../common/packages
-    ../../common/modules/fonts.nix
-    ../../common/software/cli/scripts.nix
-  ];
-
-  hardware.pulseaudio.extraModules = [ pkgs.pulseaudio-module-xrdp ];
-
-  services.xrdp = {
-    enable = true;
-    openFirewall = true;
-    audio = {
-      enable = true;
-      package = pkgs.pulseaudio-module-xrdp;
-    };
-  };
-  environment.systemPackages = with pkgs; [
-    signal-desktop
-  ];
-}

nixos/containers/jared-rdesktop/mounts.nix

@@ -1,20 +0,0 @@
-{
-  "/etc/nixos/git" = {
-    hostPath = "/etc/nixos/git";
-    mountPoint = "/etc/nixos/git";
-    isReadOnly = false;
-  };
-  "/shared" = {
-    hostPath = "/Storage/Data/Docker/sysctl.io/guacamole/guacd/shared";
-    mountPoint = "/shared";
-    isReadOnly = false;
-  };
-  "/home/albert/.ssh/id_ed25519" = {
-    mountPoint = "/home/albert/.ssh/id_ed25519";
-    isReadOnly = true;
-  };
-  "/home/albert/.ssh/id_ed25519.pub"  = {
-    mountPoint = "/home/albert/.ssh/id_ed25519.pub";
-    isReadOnly = true;
-  };
-}

nixos/containers/rdesktop/default.nix

@@ -8,6 +8,7 @@
     ../../common/software/cli/scripts.nix
     ../../common/services/tailscale-autoconnect.nix
     ../../common/services/syncthing.nix
+    ../../users/jared/default.nix
   ];
 
   hardware.pulseaudio.extraModules = [ pkgs.pulseaudio-module-xrdp ];

nixos/hosts/nuc-server/containers.nix

@@ -4,7 +4,7 @@ let
 in {
 
   containers = {
-    rdesktop = libx.mkContainer { hostname = "jared-rdesktop"; ip = "2"; unfree = true; desktop = "gnome"; };
+    rdesktop = libx.mkContainer { hostname = "rdesktop"; ip = "2"; unfree = true; desktop = "gnome"; };
   };
 
   # Networking config

nixos/users/jared/default.nix

@@ -0,0 +1,28 @@
+{ config, desktop, lib,  pkgs, ... }: 
+let
+  ifExists = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
+in {
+  # Define a user account.
+  imports = [  ]  ++ lib.optional (builtins.isString desktop) ./desktop.nix;
+
+  users = {
+    mutableUsers = false;
+    users.jared = {
+      isNormalUser = true;
+      description = "Jared Coppeland";
+      # video is required for the "light" command to work
+      extraGroups = [ "networkmanager" ] 
+        ++ ifExists [ "keys"      ]
+        ++ ifExists [ "audio"     ]
+        ++ ifExists [ "video"     ]; 
+      shell = pkgs.fish;
+      # mkpasswd -m sha-512
+      hashedPassword = "$6$5CTica.d8BNST2Yg$V85MzLwAAPdoubpwWD8yR2ntxsxgxGhBwYRsXLQ/Vo8krlN1skoTyjfNVjt94EO/0muF3R2UkLlA6YWi1blbD1";
+    };
+    groups.jared = {
+      gid = 1001;
+      name = "jared";
+      members = [ "jared" ];
+    };
+  };
+}

nixos/users/jared/desktop.nix

@@ -0,0 +1,11 @@
+{ pkgs, ... }: {
+  # Steam, Vintage Story areu nfree.
+  environment.systemPackages = [
+    pkgs.signal-desktop
+
+  ];
+  
+  imports = [
+    ../../common/software/gui/firefox.nix
+  ];
+}