diff --git a/provision/nixos/hosts/kestrel/configuration.nix b/provision/nixos/hosts/kestrel/configuration.nix
index 8b3431b1..bdb5a687 100644
--- a/provision/nixos/hosts/kestrel/configuration.nix
+++ b/provision/nixos/hosts/kestrel/configuration.nix
@@ -137,7 +137,7 @@
       engineering.enable = true;
     };
     gaming = {
-        steam.enable = true;
+      steam.enable = true;
     };
   };
   
diff --git a/provision/nixos/hosts/kestrel/home-configuration.nix b/provision/nixos/hosts/kestrel/home-configuration.nix
index e445ee73..32c083ef 100644
--- a/provision/nixos/hosts/kestrel/home-configuration.nix
+++ b/provision/nixos/hosts/kestrel/home-configuration.nix
@@ -4,21 +4,6 @@
   home.homeDirectory = "/home/${user}";
   programs.home-manager.enable = true;
 
-  # Enable user services
-  services = {
-    gvfs.enable = true; # USB automount
-    blueman.enable = true;
-    printing.enable = true;
-    printing.drivers = [ pkgs.hplip ];
-    #avahi.enable = true;
-    #avahi.nssmdns = true;
-    syncthing = {
-      enable = true;
-      user = "tstarr";
-      dataDir = "/home/tstarr/sync";
-      configDir = "/home/tstarr/.config/syncthing";
-    };
-  };
 
   home.packages = with pkgs; [
     firefox
diff --git a/provision/nixos/modules/default.nix b/provision/nixos/modules/default.nix
index c58029f5..a72bbf60 100644
--- a/provision/nixos/modules/default.nix
+++ b/provision/nixos/modules/default.nix
@@ -1,5 +1,4 @@
 { ... }:
-
 {
   imports = [ ./gaming ./devel ./services ./editors ];
 }
diff --git a/provision/nixos/modules/gaming/default.nix b/provision/nixos/modules/gaming/default.nix
index bbc73b38..11482080 100644
--- a/provision/nixos/modules/gaming/default.nix
+++ b/provision/nixos/modules/gaming/default.nix
@@ -1,5 +1,4 @@
 { ... }:
-
 {
   imports = [ ./steam.nix ];
 }
diff --git a/provision/nixos/modules/gaming/steam.nix b/provision/nixos/modules/gaming/steam.nix
index b70a346c..ab3233c7 100644
--- a/provision/nixos/modules/gaming/steam.nix
+++ b/provision/nixos/modules/gaming/steam.nix
@@ -1,15 +1,10 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, user, ... }:
 
-with lib;
-
-let
-  cfg = config.programs.steam;
+let cfg = config.modules.editors.steam;
 in {
-  options.programs.steam.enable = mkEnableOption "steam";
-
-  config = mkIf cfg.enable {
-    hardware.opengl = { # this fixes the "glXChooseVisual failed" bug, context:
-    https://github.com/NixOS/nixpkgs/issues/47932
+  options.modules.editors.steam.enable = lib.mkEnableOption "steam";
+  config = lib.mkIf cfg.enable {
+    hardware.opengl = { # this fixes the "glXChooseVisual failed" bug, context: https://github.com/NixOS/nixpkgs/issues/47932
       enable = true;
       driSupport32Bit = true;
     };
@@ -22,5 +17,4 @@ in {
     environment.systemPackages = [ pkgs.steam ];
   };
 
-  meta.maintainers = with maintainers; [ mkg20001 ];
 }