3 files changed, 28 insertions, 7 deletions
diff --git a/modules/desktop/wms/cosmic.nix b/modules/desktop/wms/cosmic.nix
new file mode 100644
index 0000000..d2929f1
--- /dev/null
+++ b/modules/desktop/wms/cosmic.nix
@@ -0,0 +1,20 @@
+{ config, lib, ... }:
+let
+  cfg = config.addons.desktop.cosmic;
+in
+{
+  options.addons.desktop.cosmic = {
+    enable = lib.mkEnableOption "Enable Cosmic WM";
+    enableScheduler = lib.mkEnableOption "Enable the special scheduler from system76";
+  };
+
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      (import ../../../utils/makeWm.nix "Cosmic WM" "wayland")
+      {
+        services.desktopManager.cosmic.enable = true;
+        services.system76-scheduler.enable = cfg.enableScheduler;
+      }
+    ]
+  );
+}
diff --git a/modules/desktop/wms/default.nix b/modules/desktop/wms/default.nix
index 9f7a18d..ea6b61e 100644
--- a/modules/desktop/wms/default.nix
+++ b/modules/desktop/wms/default.nix
@@ -3,5 +3,6 @@
   imports = [
     ./hyprland.nix
     ./xfce.nix
+    ./cosmic.nix
   ];
 }
diff --git a/modules/desktop/wms/hyprland.nix b/modules/desktop/wms/hyprland.nix
index d339f98..5beda89 100644
--- a/modules/desktop/wms/hyprland.nix
+++ b/modules/desktop/wms/hyprland.nix
@@ -20,13 +20,13 @@ in
         programs.hyprland.withUWSM = true;
         programs.uwsm = {
           enable = true;
-          waylandCompositors = {
-            hyprland = {
-              prettyName = "Hyprland";
-              comment = "Hyprland compositor managed by UWSM";
-              binPath = "/run/current-system/sw/bin/Hyprland";
-            };
-          };
+          # waylandCompositors = {
+          #   hyprland = {
+          #     prettyName = "Hyprland";
+          #     comment = "Hyprland compositor managed by UWSM";
+          #     # binPath = "/run/current-system/sw/bin/Hyprland";
+          #   };
+          # };
         };
 
         environment.systemPackages = with pkgs; [