uwsm tweaks and removing protonmail bridge

modules/default.nix

@@ -47,7 +47,6 @@
         ./home/services/hyprpaper
         ./home/services/mako
         ./home/services/nix-index
-        ./home/services/protonmail-bridge
         ./home/services/syncthing
         ./home/services/udiskie
         ./home/services/xdg

modules/home/services/protonmail-bridge/default.nix

@@ -1,31 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkIf mkEnableOption optionalString;
-  cfg = config.home.services.protonmail-bridge;
-in {
-  options = {
-    home.services.protonmail-bridge.enable = mkEnableOption "Enables protonmail-bridge";
-  };
-  config = mkIf cfg.enable {
-    home.packages = [pkgs.protonmail-bridge];
-    systemd.user.services.protonmail-bridge = {
-      Unit = {
-        Description = "Protonmail Bridge";
-        After = ["network.target"];
-      };
-
-      Service = {
-        Restart = "always";
-        ExecStart = "${pkgs.protonmail-bridge}/bin/protonmail-bridge --no-window --noninteractive";
-      };
-
-      Install = {
-        WantedBy = ["default.target"];
-      };
-    };
-  };
-}

modules/nixos/programs/hyprland/default.nix

@@ -5,7 +5,7 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkIf mkEnableOption mkDefault;
+  inherit (lib) mkIf mkEnableOption mkOption mkDefault;
   cfg = config.nixos.programs.hyprland;
 in {
   imports = [
@@ -18,7 +18,14 @@ in {
   ];
 
   options = {
-    nixos.programs.hyprland.enable = mkEnableOption "Enable Hyprland";
+    nixos.programs.hyprland = {
+      enable = mkEnableOption "Enable Hyprland";
+      withUWSM = mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Use UWSM to handle hyprland session";
+      };
+    };
   };
 
   config = mkIf cfg.enable {
@@ -30,11 +37,24 @@ in {
       startup.enable = mkDefault true;
     };
 
-    programs.hyprland = {
-      enable = true;
-      package = pkgs.hyprland;
-      withUWSM = true;
+    programs = {
+      hyprland = {
+        enable = true;
+        package = pkgs.hyprland;
+        withUWSM = cfg.withUWSM;
+      };
+      uwsm = mkIf cfg.withUWSM {
+        enable = true;
+        waylandCompositors = {
+          hyprland = {
+            prettyName = "Hyprland";
+            comment = "Hyprland compositor managed by UWSM";
+            binPath = "/run/current-system/sw/bin/Hyprland";
+          };
+        };
+      };
     };
+
     environment.variables.NIXOS_OZONE_WL = "1";
   };
 }