From cadc1b79b9a30180ef13f82d6d3b2cc0079b7858 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Mon, 13 Jan 2025 09:07:22 +0000 Subject: [PATCH] Remove setting PASSWORD_STORE_DIR for protonmail-bridge Remove proton-pass standalone GUI, only need it for initial import to seahorse and websites otherwise --- system/desktop.nix | 1 - system/home/hyprland.nix | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/system/desktop.nix b/system/desktop.nix index 2ab8fda6..bfc561f4 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -27,7 +27,6 @@ hunspell hunspellDicts.en_GB-large wl-clipboard - proton-pass hyprpicker grim slurp diff --git a/system/home/hyprland.nix b/system/home/hyprland.nix index fe98be1e..7cbc5294 100644 --- a/system/home/hyprland.nix +++ b/system/home/hyprland.nix @@ -17,8 +17,8 @@ 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" + ${pkgs.protonmail-bridge}/bin/protonmail-bridge -c + ${config.wayland.windowManager.hyprland.finalPackage}/bin/hyprctl dispatch exec "${pkgs.protonmail-bridge}/bin/protonmail-bridge -n" '') ]; stylix.targets.hyprlock.enable = false; # TODO maybe re-enable once I've checked what it does @@ -163,7 +163,7 @@ "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.protonmail-bridge}/bin/protonmail-bridge -n" "${pkgs.dex}/bin/dex -a" ]; gestures.workspace_swipe = true;