From a9cd37c5a6d25a54db6518e876da23dd54e6ebaa Mon Sep 17 00:00:00 2001 From: Michael Thomson Date: Sat, 7 Sep 2024 13:05:11 -0400 Subject: [PATCH] fix pass --- modules/home-manager/password-store/default.nix | 10 ++++------ modules/home-manager/zsh/default.nix | 7 +++---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/modules/home-manager/password-store/default.nix b/modules/home-manager/password-store/default.nix index 780bd6a..1fa7b7d 100644 --- a/modules/home-manager/password-store/default.nix +++ b/modules/home-manager/password-store/default.nix @@ -1,18 +1,16 @@ { pkgs, config, ... }: { - - home.packages = with pkgs; [ - passExtensions.pass-otp - passExtensions.pass-file - ]; - programs = { gpg = { enable = true; }; password-store = { enable = true; + package = pkgs.pass.withExtensions (exts: [ exts.pass-otp exts.pass-file exts.pass-import ]); + settings = { + PASSWORD_STORE_DIR = "\${HOME}/.password-store"; + }; }; browserpass = { enable = true; diff --git a/modules/home-manager/zsh/default.nix b/modules/home-manager/zsh/default.nix index 4f933ed..61fd323 100644 --- a/modules/home-manager/zsh/default.nix +++ b/modules/home-manager/zsh/default.nix @@ -20,10 +20,9 @@ cdi = "zi"; cat = "bat"; }; - #initExtra = '' - #eval "$(/opt/homebrew/bin/brew shellenv)" - #. "/etc/profiles/per-user/$USER/etc/profile.d/hm-session-vars.sh" - #''; + initExtra = '' + . "/etc/profiles/per-user/$USER/etc/profile.d/hm-session-vars.sh" + ''; }; starship = { enable = true;