From 8fcecd63ee54e5f5940e470c9ffb5553250305fd Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 1 Aug 2024 16:12:30 +0900 Subject: [PATCH] Avoid to install goldwarden in unsupported macOS --- home-manager/common.nix | 3 --- home-manager/linux.nix | 11 ++++++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/home-manager/common.nix b/home-manager/common.nix index a7750dce..ef6f932e 100644 --- a/home-manager/common.nix +++ b/home-manager/common.nix @@ -62,9 +62,6 @@ LESSCHARSET = "utf-8"; STACK_XDG = "https://github.com/commercialhaskell/stack/blob/72f0a1273dd1121740501a159988fc23df2fb362/doc/stack_root.md?plain=1#L7-L11"; - - # For implementation, handling bitwarden logins which contains space seprared text here looks complex and buggy. So extracted to a script. - RCLONE_PASSWORD_COMMAND = lib.getExe homemade-pkgs.get-rclone-config-password; }; sessionPath = [ diff --git a/home-manager/linux.nix b/home-manager/linux.nix index 392a48ab..aa6a887f 100644 --- a/home-manager/linux.nix +++ b/home-manager/linux.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, ... }: +{ + pkgs, + lib, + homemade-pkgs, + ... +}: # https://github.com/nix-community/home-manager/issues/414#issuecomment-427163925 lib.mkMerge [ @@ -12,5 +17,9 @@ lib.mkMerge [ }; xdg.configFile."hypr/hyprland.conf".source = ../config/hyprland/hyprland.conf; + + # For implementation, handling bitwarden logins which contains space seprared text here looks complex and buggy. So extracted to a script. + # And the dependent goldwarden does not support darwin yet: https://github.com/NixOS/nixpkgs/pull/278362/files#diff-062253d551cb2a1ebc07a298c69c8b69b1fb1152e8b08dc805e170ffe8134ae3R45 + home.sessionVariables.RCLONE_PASSWORD_COMMAND = lib.getExe homemade-pkgs.get-rclone-config-password; }) ]