clean home manager

hosts/common/niri.nix

@@ -2,5 +2,8 @@
 {
   programs.niri.enable = true;
   programs.niri.package = pkgs.niri;
-  systemd.user.services.niri.enableDefaultPath = false;
+  systemd.user.services.niri = {
+    enableDefaultPath = false;
+    overrideStrategy = "asDropin";
+  };
 }

hosts/common/services/greetd.nix

@@ -4,7 +4,6 @@
     enable = true;
     settings = {
       default_session = {
-        # for niri
         command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --remember-user-session --cmd ${config.programs.niri.package}/bin/niri";
       };
     };

hosts/common/services/mullvad.nix

@@ -1,7 +1,10 @@
 { pkgs, ... }:
 {
-  services.mullvad-vpn.gui = {
+  services.mullvad-vpn = {
     enable = true;
-    package = pkgs.mullvad-vpn;
+    gui = {
+      enable = true;
+      package = pkgs.mullvad-vpn;
+    };
   };
 }

hosts/common/services/protonmail.nix

@@ -5,8 +5,12 @@
     enable = true;
   };
 
-  systemd.user.services.protonmail-bridge.serviceConfig = {
-    ExecStartPre = "${pkgs.bash}/bin/bash -c 'until ${pkgs.systemd}/bin/busctl --user list | grep -q org.freedesktop.secrets; do sleep 1; done'";
-    RestartSec = "10s";
+  systemd.user.services.protonmail-bridge = {
+    after = [ "gnome-keyring.service" ];
+    wants = [ "gnome-keyring.service" ];
+    serviceConfig = {
+      ExecStartPre = "${pkgs.bash}/bin/bash -c 'until ${pkgs.systemd}/bin/busctl --user list | grep -q org.freedesktop.secrets; do sleep 1; done'";
+      RestartSec = "10s";
+    };
   };
 }