From f9723333625cfe9d490e856176876ef047eb07cf Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Mon, 13 Jan 2025 07:34:26 +0000 Subject: [PATCH] Replace protonmail-bridge with protonmail-bridge-gui --- system/desktop.nix | 1 + system/home/hyprland.nix | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/system/desktop.nix b/system/desktop.nix index 2ab8fda6..8319bf41 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -28,6 +28,7 @@ hunspellDicts.en_GB-large wl-clipboard proton-pass + protonmail-bridge-gui hyprpicker grim slurp diff --git a/system/home/hyprland.nix b/system/home/hyprland.nix index fe98be1e..72024151 100644 --- a/system/home/hyprland.nix +++ b/system/home/hyprland.nix @@ -14,13 +14,6 @@ ./avizo.nix ./wlogout.nix ]; - home.packages = [ - (pkgs.writeShellScriptBin "protonmail-setup-bridge" '' - pkill -9 -f protonmail-bridge - PASSWORD_STORE_DIR=/dev/null ${pkgs.protonmail-bridge}/bin/protonmail-bridge -c - ${config.wayland.windowManager.hyprland.finalPackage}/bin/hyprctl dispatch exec "PASSWORD_STORE_DIR=/dev/null ${pkgs.protonmail-bridge}/bin/protonmail-bridge -n" - '') - ]; stylix.targets.hyprlock.enable = false; # TODO maybe re-enable once I've checked what it does services = { kanshi.systemdTarget = "hyprland-session.target"; @@ -163,7 +156,6 @@ "systemctl --user import-environment WAYLAND_DISPLAY QT_QPA_PLATFORMTHEME" "${config.wayland.windowManager.hyprland.finalPackage}/bin/hyprctl setcursor ${config.gtk.cursorTheme.name} ${toString config.gtk.cursorTheme.size}" "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1" - "PASSWORD_STORE_DIR=/dev/null ${pkgs.protonmail-bridge}/bin/protonmail-bridge -n" "${pkgs.dex}/bin/dex -a" ]; gestures.workspace_swipe = true;