diff --git a/flake.nix b/flake.nix
index 9b6f461..a33f1db 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,7 +47,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { role = "devel"; };
           home-manager.users.${userName} = import ./home;
         }
       ];
@@ -70,7 +70,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { role = "devel"; };
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -94,7 +94,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { role = "server"; };
           home-manager.users.${userName}.imports = [
             ./home
           ];
diff --git a/home/browser.nix b/home/browser.nix
index 211ea3c..2a6bb74 100644
--- a/home/browser.nix
+++ b/home/browser.nix
@@ -1,7 +1,7 @@
 {
+  role,
   pkgs,
   lib,
-  role,
   ...
 }: {
   programs.firefox = {
diff --git a/home/default.nix b/home/default.nix
index 57a46b7..f23c548 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -4,6 +4,7 @@
   userName,
   userEmail,
   ghostty,
+  role,
   ...
 }: let
   # Have a file sturcture that holds all the configuration files that can't be configured by Nix
@@ -13,7 +14,7 @@
   };
 in {
   # Import sub modules
-  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
+  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty role;}) [
     ./atuin.nix
     ./shell.nix
     ./packages
diff --git a/home/sway.nix b/home/sway.nix
index 7646596..08225d4 100644
--- a/home/sway.nix
+++ b/home/sway.nix
@@ -1,8 +1,10 @@
 {
   lib,
   pkgs,
+  role,
   ...
 }: let
+  isDevel = pkgs.stdenv.isLinux && role == "devel";
   dirs = {
     defaults = ../defaults;
   };
@@ -16,7 +18,7 @@
   };
 in {
   wayland.windowManager.sway = {
-    enable = pkgs.stdenv.isLinux;
+    enable = isDevel;
     extraOptions = []; # Extra arguments to pass into sway. If sway goes haywire, we might need something in here
     xwayland = true;
     systemd.enable = true;
@@ -29,11 +31,11 @@ in {
   xdg.configFile."sway/config".source = lib.mkForce (dirs.defaults + /sway/config);
   xdg.configFile."waybar/config".source = lib.mkForce (dirs.defaults + /waybar/config);
   xdg.configFile."waybar/style.css".source = lib.mkForce (dirs.defaults + /waybar/style.css);
-  programs.rofi.enable = pkgs.stdenv.isLinux;
-  services.mako.enable = pkgs.stdenv.isLinux;
+  programs.rofi.enable = isDevel;
+  services.mako.enable = isDevel;
 
   programs.waybar = {
-    enable = pkgs.stdenv.isLinux;
+    enable = isDevel;
     systemd.enable = true;
 
     package = pkgs.waybar.overrideAttrs (old: {
diff --git a/modules/machine/valefor/configuration.nix b/modules/machine/valefor/configuration.nix
index 6774233..620231e 100644
--- a/modules/machine/valefor/configuration.nix
+++ b/modules/machine/valefor/configuration.nix
@@ -104,9 +104,9 @@
   # Add username to groups "wheel" and "video" - more may be added here later
   users.users.${userName} = { 
     extraGroups = ["wheel" "podman" "network"]; 
-    openssh.authorizedKeys.keys = ''
-      ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com
-    '';
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
+    ];
   };
 
   # Add Home Assistant service
@@ -127,9 +127,5 @@
 
   security.sudo.wheelNeedsPassword = false;
 
-  users.users."wyatt".openssh.authorizedKeys.keys = ''
-    ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com
-  '';
-
   system.stateVersion = "24.11";
 }