diff --git a/hosts/marr/default.nix b/hosts/marr/default.nix
index 231422f..a2754ca 100644
--- a/hosts/marr/default.nix
+++ b/hosts/marr/default.nix
@@ -73,6 +73,7 @@
   };
 
   programs = {
+    uwsm.enable = true;
     dconf.enable = true;
     fish.enable = true;
     firefox.enable = true;
diff --git a/modules/programs/hyprland.nix b/modules/programs/hyprland.nix
index 1b0f938..887ea44 100644
--- a/modules/programs/hyprland.nix
+++ b/modules/programs/hyprland.nix
@@ -1 +1,10 @@
-{ lib, config, ... }: lib.mkIf config.programs.hyprland.enable { }
+{ lib, config, ... }:
+lib.mkIf config.programs.hyprland.enable {
+  programs.uwsm = {
+    waylandCompositors.hyprland = {
+      prettyName = "Hyprland";
+      comment = "Hyprland compositor managed by UWSM";
+      binPath = "/run/current-system/sw/bin/Hyprland";
+    };
+  };
+}
diff --git a/modules/programs/sway.nix b/modules/programs/sway.nix
index 89ee960..69064b8 100644
--- a/modules/programs/sway.nix
+++ b/modules/programs/sway.nix
@@ -1,7 +1,17 @@
 { config, lib, ... }:
 lib.mkIf config.programs.sway.enable {
-  programs.sway = {
-    wrapperFeatures.gtk = true;
-    extraPackages = [ ];
+
+  programs = {
+    uwsm = {
+      waylandCompositors.sway = {
+        prettyName = "Sway";
+        comment = "Sway compositor managed by UWSM";
+        binPath = "/run/current-system/sw/bin/sway";
+      };
+    };
+    sway = {
+      wrapperFeatures.gtk = true;
+      extraPackages = [ ];
+    };
   };
 }