From 395ae79d612b2e9df19cb4947e9ac8487691eec4 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Mon, 12 Feb 2024 16:09:06 -0500
Subject: [PATCH] fix(protonmail): start bridge from hyprland conf to have
 access to keyring

---
 devices/binto/default.nix     |  1 -
 devices/wim/default.nix       |  1 -
 modules/hyprland/packages.nix |  2 ++
 modules/proton-bridge.nix     | 10 ----------
 4 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 modules/proton-bridge.nix

diff --git a/devices/binto/default.nix b/devices/binto/default.nix
index c9ca0425..fc82922b 100644
--- a/devices/binto/default.nix
+++ b/devices/binto/default.nix
@@ -9,7 +9,6 @@ in {
     ../../modules/hyprland
     ../../modules/kmscon.nix
     ../../modules/printer.nix
-    ../../modules/proton-bridge.nix
     ../../modules/razer.nix
     ../../modules/sshd.nix
     ../../modules/tailscale.nix
diff --git a/devices/wim/default.nix b/devices/wim/default.nix
index 93f6963b..09d38bf4 100644
--- a/devices/wim/default.nix
+++ b/devices/wim/default.nix
@@ -10,7 +10,6 @@ in {
     ../../modules/kmscon.nix
     ../../modules/plymouth.nix
     ../../modules/printer.nix
-    ../../modules/proton-bridge.nix
     ../../modules/tailscale.nix
 
     ./modules/security.nix
diff --git a/modules/hyprland/packages.nix b/modules/hyprland/packages.nix
index 71cbff12..2dac20d4 100644
--- a/modules/hyprland/packages.nix
+++ b/modules/hyprland/packages.nix
@@ -28,6 +28,7 @@ in {
 
       # Apps
       thunderbird # TODO: use programs.thunderbird
+      protonmail-bridge
       spotifywm
       photoqt
       nextcloud-client
@@ -62,6 +63,7 @@ in {
           "wl-paste --watch cliphist store"
 
           "sleep 3; nextcloud --background"
+          "sleep 3; protonmail-bridge --noninteractive --log-level info"
 
           "[workspace special:thunder silent] thunderbird"
           "[workspace special:spot silent] spotify"
diff --git a/modules/proton-bridge.nix b/modules/proton-bridge.nix
deleted file mode 100644
index e35729a6..00000000
--- a/modules/proton-bridge.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{pkgs, ...}: {
-  systemd.user.services.protonmail-bridge = {
-    description = "Protonmail Bridge";
-    enable = true;
-    script = "${pkgs.protonmail-bridge}/bin/protonmail-bridge --noninteractive --log-level info";
-    path = [pkgs.gnome.gnome-keyring]; # HACK: https://github.com/ProtonMail/proton-bridge/issues/176
-    wantedBy = ["graphical-session.target"];
-    partOf = ["graphical-session.target"];
-  };
-}