diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix
index 40d98bd..4cd5c2d 100644
--- a/hosts/hermit/configuration.nix
+++ b/hosts/hermit/configuration.nix
@@ -25,6 +25,7 @@
   };
 
   modules = {
+    desktops.hyprland.enable = true;
     system = {
       impermanence.enable = false;
       services = {
@@ -58,28 +59,12 @@
       };
       sound.enable = true;
     };
-    usrEnv = {
-      desktops.hyprland.enable = false;
+    services = {
+      locate.enable = true;
 
-      programs = {
-        launchers = {
-          fuzzel.enable = true;
-        };
-
-        media = {
-          beets.enable = true;
-          mpv.enable = true;
-          ncmpcpp.enable = true;
-        };
+      media.mpd = {
+        enable = true;
       };
-      services = {
-        locate.enable = true;
-
-        media.mpd = {
-          enable = true;
-        };
-      };
-
     };
     other = {
       system.username = "cr";
diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix
index 9c9635b..6906c02 100644
--- a/hosts/temperance/configuration.nix
+++ b/hosts/temperance/configuration.nix
@@ -70,25 +70,13 @@ in {
       sound.enable = true;
       hardware.nvidia.enable = true;
     };
-    usrEnv = {
-      desktops.hyprland.enable = true;
+    desktops.hyprland.enable = true;
 
-      programs = {
-        media = {
-          beets.enable = true;
-          mpv.enable = true;
-          ncmpcpp.enable = true;
-        };
-      };
-      services = {
-        locate.enable = true;
-        kmscon.enable = false;
-        greetd.enable = true;
-
-        media.mpd = {
-          enable = true;
-          musicDirectory = "/home/${config.modules.other.system.username}/cloud/media/Music";
-        };
+    services = {
+      locate.enable = true;
+      media.mpd = {
+        enable = true;
+        musicDirectory = "/home/${config.modules.other.system.username}/cloud/media/Music";
       };
     };
     other = {
diff --git a/hosts/tower/configuration.nix b/hosts/tower/configuration.nix
index 1be71fa..aa39d5e 100644
--- a/hosts/tower/configuration.nix
+++ b/hosts/tower/configuration.nix
@@ -25,6 +25,9 @@
     mainUser.gitSigningKey = "";
   };
   modules = {
+      services = {
+        locate.enable = true;
+      };
     system = {
       services.forgejo.enable = true;
       programs = {
@@ -34,13 +37,6 @@
         eza.enable = true;
       };
     };
-    usrEnv = {
-      desktops.hyprland.enable = false;
-
-      services = {
-        locate.enable = true;
-      };
-    };
     other = {
       system = {
         username = "cr";