diff --git a/hosts/cube/default.nix b/hosts/cube/default.nix
index 74b4d1b..ea6e62c 100644
--- a/hosts/cube/default.nix
+++ b/hosts/cube/default.nix
@@ -2,7 +2,7 @@
 {
   sconfig = {
     gnome = true;
-    profile = "desktop";
+    desktop.enable = true;
     horizon.enable = true;
   };
 
diff --git a/hosts/hp/default.nix b/hosts/hp/default.nix
index 81fd8af..b49597e 100644
--- a/hosts/hp/default.nix
+++ b/hosts/hp/default.nix
@@ -2,7 +2,7 @@
 {
   sconfig = {
     gnome = true;
-    profile = "desktop";
+    desktop.enable = true;
     horizon.enable = true;
     wg-home.enable = true;
   };
diff --git a/hosts/lenny/default.nix b/hosts/lenny/default.nix
index 9218ce6..fcb59ec 100644
--- a/hosts/lenny/default.nix
+++ b/hosts/lenny/default.nix
@@ -20,7 +20,7 @@
 
   sconfig = {
     gnome = true;
-    profile = "desktop";
+    desktop.enable = true;
     horizon.enable = true;
     wg-home.enable = true;
   };
diff --git a/hosts/levi/default.nix b/hosts/levi/default.nix
index 9894395..c2a399b 100644
--- a/hosts/levi/default.nix
+++ b/hosts/levi/default.nix
@@ -17,7 +17,7 @@ in
 
   sconfig = {
     gnome = true;
-    profile = "desktop";
+    desktop.enable = true;
     horizon.enable = true;
     wg-home = { enable = true; path = "${persist}/wireguard_home.conf"; };
   };
diff --git a/hosts/testbox/default.nix b/hosts/testbox/default.nix
index 643a726..f520bf5 100644
--- a/hosts/testbox/default.nix
+++ b/hosts/testbox/default.nix
@@ -1,7 +1,7 @@
 { config, lib, modulesPath, pkgs, ... }:
 {
   sconfig.gnome = true;
-  sconfig.profile = "desktop";
+  sconfig.desktop.enable = true;
   services.getty.autologinUser = "root";
   system.stateVersion = "99.99";
 
diff --git a/modules/profiles/desktop.nix b/modules/desktop/default.nix
similarity index 96%
rename from modules/profiles/desktop.nix
rename to modules/desktop/default.nix
index a533ff5..89d6095 100644
--- a/modules/profiles/desktop.nix
+++ b/modules/desktop/default.nix
@@ -1,7 +1,11 @@
 { config, pkgs, lib, ... }:
 with lib;
 {
-  config = mkIf (config.sconfig.profile == "desktop") {
+  options.sconfig.desktop = {
+    enable = lib.mkEnableOption "Enable Desktop Environment";
+  };
+
+  config = mkIf (config.sconfig.desktop.enable) {
     programs.steam.enable = true;
     services.pcscd.enable = true;
     virtualisation.podman.enable = true;
diff --git a/modules/profiles/vscode-settings.json b/modules/desktop/vscode-settings.json
similarity index 100%
rename from modules/profiles/vscode-settings.json
rename to modules/desktop/vscode-settings.json
diff --git a/modules/profiles/default.nix b/modules/profiles/default.nix
deleted file mode 100644
index 3561114..0000000
--- a/modules/profiles/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ lib, ... }:
-with lib;
-{
-  options.sconfig.profile = mkOption {
-    type = types.enum [ "desktop" ];
-  };
-  imports = [ ./desktop.nix ];
-}
diff --git a/modules/sean.nix b/modules/sean.nix
index cea91e4..01bb5c3 100644
--- a/modules/sean.nix
+++ b/modules/sean.nix
@@ -8,9 +8,6 @@ let
   ];
 in
 {
-  users.users.root.openssh.authorizedKeys.keys =
-    lib.optionals (config.sconfig.profile == "server") keys;
-
   users.users.sean = {
     uid = 2000;
     isNormalUser = true;