diff --git a/modules/home/programs/misc/default.nix b/modules/home/programs/misc/default.nix
index bab93757..b55e6448 100644
--- a/modules/home/programs/misc/default.nix
+++ b/modules/home/programs/misc/default.nix
@@ -7,6 +7,7 @@
     ./general
     ./headless
     ./production
+    ./rdesktop
     ./school
   ];
 }
diff --git a/modules/home/programs/misc/rdesktop/default.nix b/modules/home/programs/misc/rdesktop/default.nix
new file mode 100644
index 00000000..5d38ec94
--- /dev/null
+++ b/modules/home/programs/misc/rdesktop/default.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+{
+  home = lib.mkIf config.home.desktop.enable {
+    packages = with pkgs; [
+      freerdp
+      remmina
+    ];
+
+    persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories =
+      with lib; with config.home; with config.xdg; [
+        "data/${removePrefix "${homeDirectory}/" configHome}/remmina"
+      ];
+  };
+}
diff --git a/modules/home/programs/misc/school/default.nix b/modules/home/programs/misc/school/default.nix
index d43655ec..7d1608ed 100644
--- a/modules/home/programs/misc/school/default.nix
+++ b/modules/home/programs/misc/school/default.nix
@@ -2,10 +2,8 @@
 {
   home = lib.mkIf config.home.school.enable {
     packages = with pkgs; [
-      freerdp
       globalprotect-openconnect
       gpauth
-      remmina
     ];
 
     shellAliases.seneca = "ssh jhampton1@matrix.senecapolytechnic.ca";
@@ -14,8 +12,6 @@
       with lib; with config.home; with config.xdg; [
         "school/${removePrefix "${homeDirectory}/" cacheHome}/gpclient"
         "school/${removePrefix "${homeDirectory}/" configHome}/com.yuezk.qt"
-        "school/${removePrefix "${homeDirectory}/" configHome}/remmina"
-        "school/.vmware"
       ];
   };
 }
diff --git a/modules/home/programs/terminal/zsh/default.nix b/modules/home/programs/terminal/zsh/default.nix
index db1ee096..2b2721e0 100644
--- a/modules/home/programs/terminal/zsh/default.nix
+++ b/modules/home/programs/terminal/zsh/default.nix
@@ -12,6 +12,7 @@
       plugins = [
         "git"
         "history"
+        "tmux"
       ];
     };
     history = {
diff --git a/modules/system/users/jules/default.nix b/modules/system/users/jules/default.nix
index aab3bfd2..0c819f1e 100644
--- a/modules/system/users/jules/default.nix
+++ b/modules/system/users/jules/default.nix
@@ -5,7 +5,6 @@ in {
   config = lib.mkIf (builtins.elem "extra-users" config.system.nixos.tags) {
     users.users.${user} = {
       isNormalUser = true;
-      createHome = true;
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHwxJcAWuHkKy/Ar37aIoqg34CDcZu7/bh978nYkOgzj estradiol"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEOszCNP+6rkIS75GyFVhn9o6QpUuGdx/J4rjzROrpSl xeta"
diff --git a/modules/system/users/luna/default.nix b/modules/system/users/luna/default.nix
index 234d98a6..63c3a03e 100644
--- a/modules/system/users/luna/default.nix
+++ b/modules/system/users/luna/default.nix
@@ -5,7 +5,6 @@ in {
   config = lib.mkIf (builtins.elem "extra-users" config.system.nixos.tags) {
     users.users.${user} = {
       isNormalUser = true;
-      createHome = true;
       openssh.authorizedKeys.keys = [
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDJ3hzXkv5MVuGZy4HqfEZD0Ck7ZKiLeVmUTFzGSwZkumCpwX/zirD/tY4SNutPczhhYNn1jwkwnnyCwgkaQ7QWBs72G0opmjXDcSqxXJskSKYgjnUHoPV8uAcMwp5C5GNlwo3DFKXc1c7Sipy1s6y9ZnoKfVmjsr0AhamnC/bHEWg8vx0zuamCzvQ5vLWfpULRKwj286f0s2xaAvYaAJwGD0QMHC0ylFYZuq7Og4HVdlnUt+40BxCi+GAQqsFd4vM+RFjZKKD7ioP5DcIDfvfvxX4UpdKtCxVjeyyF+UJpFnQKytO9HvH4H+CRSAuJ+Vguiq/F3lGhvF0yIQ9M2MD3+tl3RZAj4D6n2ew30mn+QGh2fZgC7Utuzo02pMVUzkpm+mM4x8VyESpC1AuBdh0TAKBwS3ubMpegiCWCfIbNC0CQ/zgIq/5xwhXL8zhmfQrIiULBCd1xqThye0tt7knoPZlVCzOuVYoqxYnwYYGcXhzlArrmgRquyMYHdpFd+DTzJfcQIGdT4a+s0Mc2jRa0KT3A4ZrjziP0OPMQ+cpTd1tmQdEKXN6YhB87Hp9meCefFdzGvVembose82d3BOl45+rWM2ZcH93fNguWwYX0ez8+GiGW4P+gDQcfWfQCNa1daDjgoBwjmbG5rYoS6tfLxSSvYB1YOOK9U3AlPxEuTw== ${user}@ThinkPad-T480-Arch"
       ];
diff --git a/modules/system/users/main/default.nix b/modules/system/users/main/default.nix
index f63d4014..37ee2e7a 100644
--- a/modules/system/users/main/default.nix
+++ b/modules/system/users/main/default.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 {
   users.users."${config.vars.mainUser}" = {
+    description = "Aubun Donald";
     isNormalUser = true;
-    createHome = true;
     linger = true;
     hashedPassword = config.secrets.accPass.main;
     openssh.authorizedKeys.keyFiles = [