diff --git a/flake.nix b/flake.nix
index af5326e5..e66714f1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,8 +68,9 @@
       inherit modules;
       specialArgs = inputs;
     };
-    mkHome = modules: pkgs: hm.lib.homeManagerConfiguration {
-      inherit modules pkgs;
+    mkHome = modules: channel: arch: hm.lib.homeManagerConfiguration {
+      inherit modules;
+      pkgs = builtins.getAttr arch channel.legacyPackages;
       extraSpecialArgs = inputs;
     };
   in {
@@ -89,8 +90,8 @@
 
     # nh home switch /path -c arch
     homeConfigurations = {
-      x86 = mkHome [ ./modules/home ] stable.legacyPackages.x86_64-linux;
-      aarch = mkHome [ ./modules/home ] stable.legacyPackages.aarch64-linux;
+      x86 = mkHome [ ./modules/home ] stable "x86_64-linux";
+      aarch = mkHome [ ./modules/home ] stable "aarch64-linux";
     };
   };
 }
diff --git a/hosts/jupiter/jovian/default.nix b/hosts/jupiter/jovian/default.nix
index 3a79eb5c..a9d2391a 100644
--- a/hosts/jupiter/jovian/default.nix
+++ b/hosts/jupiter/jovian/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [ jovian.nixosModules.jovian ];
 
-  options.system.steamdeck.enable = lib.mkEnableOption "Enable Jovian NixOS environment";
+  options.system.steamdeck.enable = lib.mkEnableOption "Jovian NixOS environment";
 
   config = lib.mkIf config.system.steamdeck.enable {
     jovian = {
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 0f0e3450..e3d6ae91 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -11,11 +11,11 @@
   ];
 
   options.home = with lib; {
-    desktop.enable = mkEnableOption "Enable desktop programs and services.";
-    gaming.enable = mkEnableOption "Enable gaming apps and programs";
-    production.enable = mkEnableOption "Enable apps for visual productivity";
-    remote-desktop.enable = mkEnableOption "Enable apps for visual productivity";
-    school.enable = mkEnableOption "Enable apps for visual productivity";
+    desktop.enable = mkEnableOption "Desktop programs and services";
+    gaming.enable = mkEnableOption "Gaming apps and programs";
+    production.enable = mkEnableOption "Apps for visual productivity";
+    remote-desktop.enable = mkEnableOption "Apps for remote desktop";
+    school.enable = mkEnableOption "Apps for school and college";
   };
 
   config.home.stateVersion = "24.11";
diff --git a/modules/home/settings/aliases/default.nix b/modules/home/settings/aliases/default.nix
index fda371e3..1131106e 100644
--- a/modules/home/settings/aliases/default.nix
+++ b/modules/home/settings/aliases/default.nix
@@ -4,7 +4,7 @@
     # NixOS
     nhs = "nh os switch";
     nixclean = "nix store gc; nix store optimise";
-    nixpurge = "doas nix-collect-garbage --delete-old";
+    nixpurge = "sudo nix-collect-garbage --delete-old";
 
     # Shortcuts
     ff = "clear && fastfetch";
diff --git a/modules/home/settings/gtk/bookmarks/default.nix b/modules/home/settings/gtk/bookmarks/default.nix
index 31b6a27b..57d2d2c7 100644
--- a/modules/home/settings/gtk/bookmarks/default.nix
+++ b/modules/home/settings/gtk/bookmarks/default.nix
@@ -1,11 +1,11 @@
 { config, ... }:
 {
   gtk.gtk3.bookmarks = [
-    "file:///home/${config.home.username}/Keepers"
-    "file:///home/${config.home.username}/Downloads"
-    "file:///home/${config.home.username}/Documents"
-    "file:///home/${config.home.username}/Videos"
-    "file:///home/${config.home.username}/Pictures/Screenshots"
+    "file://${config.home.homeDirectory}/Keepers"
+    "file://${config.home.homeDirectory}/Downloads"
+    "file://${config.home.homeDirectory}/Documents"
+    "file://${config.home.homeDirectory}/Videos"
+    "file://${config.home.homeDirectory}/Pictures/Screenshots"
     "file:///etc/nixos"
   ];
 }
diff --git a/modules/system/default.nix b/modules/system/default.nix
index e502dcde..4d9fa244 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -10,7 +10,7 @@
   ];
 
   options.system = with lib; {
-    desktop.enable = mkEnableOption "Enable desktop apps and services";
-    server.enable = mkEnableOption "Enable server apps and services";
+    desktop.enable = mkEnableOption "Desktop apps and services";
+    server.enable = mkEnableOption "Server apps and services";
   };
 }
diff --git a/modules/system/devices/video/nvidia/default.nix b/modules/system/devices/video/nvidia/default.nix
index 27de2fae..f9d10a1c 100644
--- a/modules/system/devices/video/nvidia/default.nix
+++ b/modules/system/devices/video/nvidia/default.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }:
 {
-  options.system.nvidia.enable = lib.mkEnableOption "Enable Nvidia graphic drivers";
+  options.system.nvidia.enable = lib.mkEnableOption "Nvidia graphic drivers";
 
   config = lib.mkIf config.system.nvidia.enable {
     hardware.nvidia = {
diff --git a/modules/system/services/server/mailserver/default.nix b/modules/system/services/server/mailserver/default.nix
index 1aae03d8..b2edc8eb 100644
--- a/modules/system/services/server/mailserver/default.nix
+++ b/modules/system/services/server/mailserver/default.nix
@@ -7,5 +7,5 @@
     ./simplenix
   ];
 
-  options.services.mailserver.enable = lib.mkEnableOption "Enable Simple NixOS Mailserver";
+  options.services.mailserver.enable = lib.mkEnableOption "Simple NixOS Mailserver";
 }
diff --git a/modules/system/services/server/nginx/default.nix b/modules/system/services/server/nginx/default.nix
index 4665f896..2325e731 100644
--- a/modules/system/services/server/nginx/default.nix
+++ b/modules/system/services/server/nginx/default.nix
@@ -7,7 +7,7 @@
     ./user
   ];
 
-  options.services.webserver.enable = lib.mkEnableOption "Enable nginx webpages";
+  options.services.webserver.enable = lib.mkEnableOption "Nginx webpages";
 
   config = lib.mkIf config.services.nginx.enable {
     services.nginx = {
diff --git a/modules/system/services/server/transmission/default.nix b/modules/system/services/server/transmission/default.nix
index d0d2f9ed..d7ef920c 100644
--- a/modules/system/services/server/transmission/default.nix
+++ b/modules/system/services/server/transmission/default.nix
@@ -8,7 +8,7 @@
       openPeerPorts = true;
       settings = {
         anti-brute-force-enabled = true;
-	rpc-whitelist-enabled = false;
+        rpc-whitelist-enabled = false;
       };
     };
     environment.persistence."/persist".directories = [ "/var/lib/transmission" ];