diff --git a/default.nix b/default.nix
index cbea429..3b3c351 100644
--- a/default.nix
+++ b/default.nix
@@ -10,6 +10,7 @@ in
       inputs.home-manager.nixosModules.home-manager
       inputs.stylix.nixosModules.stylix
       (mkAliasOptionModule ["hm"] ["home-manager" "users" config.user.name])
+      (mkAliasOptionModule ["home"] ["hm" "home"])
     ]
     ++ (mapModulesRec' (toString ./modules) import);
 
diff --git a/hosts/chris-pc/hardware.nix b/hosts/chris-pc/hardware.nix
index df2fc27..cb6117a 100644
--- a/hosts/chris-pc/hardware.nix
+++ b/hosts/chris-pc/hardware.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, modulesPath, ... }:
 let
   inherit (lib.modules) mkDefault;
-  inherir (lib.attrsets) attrValues;
 in
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
@@ -29,10 +28,10 @@ in
     extraModulePackages = [ ];
   };
 
-  networking.useDHCP = lib.mkDefault true;
+  networking.useDHCP = mkDefault true;
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  nixpkgs.hostPlatform = mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;
 
   services = {
     power-profiles-deamon-enable = false;
diff --git a/hosts/chris-server/hardware.nix b/hosts/chris-server/hardware.nix
index e8b6a41..67ec70a 100644
--- a/hosts/chris-server/hardware.nix
+++ b/hosts/chris-server/hardware.nix
@@ -1,4 +1,7 @@
 { config, lib, pkgs, modulesPath, ... }:
+let
+  inherit (lib.modules) mkDefault;
+in
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
@@ -23,10 +26,10 @@
     extraModulePackages = [ ];
   };
 
-  networking.useDHCP = lib.mkDefault true;
+  networking.useDHCP = mkDefault true;
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  nixpkgs.hostPlatform = mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;
 
   services = {
     power-profiles-deamon-enable = false;
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
new file mode 100644
index 0000000..057f2ab
--- /dev/null
+++ b/modules/desktop/default.nix
@@ -0,0 +1,17 @@
+{ config, options, lib, pkgs, ... }:
+let
+  inherit (builtins) isAttrs;
+  inherit (lib.attrsets) attrValues;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.my) anyAttrs countAttrs value;
+
+  cfg = config.modules.desktop;
+in
+{
+  options.modules.desktop = let
+    inherit (lib.types) either str;
+    inherit (lib.my) mkOpt;
+  in {
+    type = mkOpt (either str null) null;
+  };
+}
diff --git a/modules/options.nix b/modules/options.nix
index 1080077..0f4d552 100644
--- a/modules/options.nix
+++ b/modules/options.nix
@@ -17,12 +17,9 @@ in
 
     kaas = {
       dir = mkOpt path (findFirst pathExists (toString ../.) [
-        "${config.user.home}/Workspace/public/kaas"
-        "/etc/kaas"
+        "${config.user.home}/Github/.files"
       ]);
-      homeDir = mkOpt path "${config.kaas.dir}/hosts/${config.networking.hostName}";
-      binDir = mkOpt path "${config.kaas.dir}/bin";
-      configDir = mkOpt path "${config.kaas.dir}/config";
+      hostDir = mkOpt path "${config.kaas.dir}/hosts/${config.networking.hostName}";
       modulesDir = mkOpt path "${config.kaas.dir}/modules";
       themesDir = mkOpt path "${config.kaas.modulesDir}/themes";
     };
diff --git a/modules/shell/toolset/git.nix b/modules/shell/toolset/git.nix
index 673c579..b78103b 100644
--- a/modules/shell/toolset/git.nix
+++ b/modules/shell/toolset/git.nix
@@ -21,7 +21,7 @@ in
     # Prevent x11 askPass prompt on git push:
     programs.ssh.askPassword = "";
 
-    home.sessionVariables.GITHUB_TOKEN = "$(cat /run/agenix/tokenGH)";
+    environment.sessionVariables.GITHUB_TOKEN = "$(cat /run/agenix/tokenGH)";
 
     hm.programs = {
       zsh.initExtra = ''
diff --git a/modules/system/audio.nix b/modules/system/audio.nix
index 8b5d438..5e2ce27 100644
--- a/modules/system/audio.nix
+++ b/modules/system/audio.nix
@@ -31,36 +31,5 @@ in
         support32Bit = true;
       };
     };
-
-    home.configFile = mkIf config.modules.hardware.bluetooth.enable {
-      wireplumber-bluetooth = {
-        target = "wireplumber/bluetooth.lua.d/51-bluez-config.lua";
-        text = ''
-          bluez_monitor.properties = {
-              ["bluez5.enable-sbc-xq"] = true,
-              ["bluez5.enable-msbc"] = true,
-              ["bluez5.enable-hw-volume"] = true,
-              ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
-          }
-        '';
-      };
-
-      wireplumber-disable-suspension = {
-        target = "wireplumber/main.lua.d/51-disable-suspension.lua";
-        text = ''
-          table.insert(alsa_monitor.rules, {
-              matches = {
-                  { -- Matches all sources.
-                      { "node.name", "matches", "alsa_input.*" },
-                  },
-                  { -- Matches all sinks.
-                      { "node.name", "matches", "alsa_output.*" },
-                  },
-              },
-              apply_properties = { ["session.suspend-timeout-seconds"] = 0 },
-          })
-        '';
-      };
-    };
   };
 }
diff --git a/modules/system/security.nix b/modules/system/security.nix
index b8ba907..f012b5f 100644
--- a/modules/system/security.nix
+++ b/modules/system/security.nix
@@ -24,8 +24,8 @@
       configurationLimit = 50;
     };
 
-    kernalModules = [ "tcp_bbr" ];
-    kernal.sysctl = {
+    kernelModules = [ "tcp_bbr" ];
+    kernel.sysctl = {
       ## TCP hardening
       # Prevent bogus ICMP errors from filling up logs.
       "net.ipv4.icmp_ignore_bogus_error_responses" = 1;