From 83d584341024c74a5696ccbe4a215203f1380763 Mon Sep 17 00:00:00 2001 From: Rounak Datta Date: Fri, 19 Jan 2024 21:22:53 +0530 Subject: [PATCH] Add right password-store directory for darwin shells (#11) * Add right password-store directory for darwin shells * Apply nixpkgs-fmt --- configs/bash/default.nix | 1 + configs/fish/default.nix | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configs/bash/default.nix b/configs/bash/default.nix index 03de3dc..dccb7ce 100644 --- a/configs/bash/default.nix +++ b/configs/bash/default.nix @@ -4,6 +4,7 @@ initExtra = '' export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 + export PASSWORD_STORE_DIR=/Users/${config.home.username}/.password-store ''; }; } diff --git a/configs/fish/default.nix b/configs/fish/default.nix index 1dceda4..a8a713d 100644 --- a/configs/fish/default.nix +++ b/configs/fish/default.nix @@ -58,11 +58,12 @@ in '' + (if isDarwin then '' - # this is needed, otherwise darwin-rebuild wouldn't be in PATH - fish_add_path --prepend --global "$HOME/.nix-profile/bin" /nix/var/nix/profiles/default/bin /run/current-system/sw/bin - set PATH $PATH /etc/profiles/per-user/${config.home.username}/bin - set PATH $PATH /opt/homebrew/bin - set JAVA_HOME /usr/libexec/java_home + # this is needed, otherwise darwin-rebuild wouldn't be in PATH + fish_add_path --prepend --global "$HOME/.nix-profile/bin" /nix/var/nix/profiles/default/bin /run/current-system/sw/bin + set PATH $PATH /etc/profiles/per-user/${config.home.username}/bin + set PATH $PATH /opt/homebrew/bin + set JAVA_HOME /usr/libexec/java_home + set PASSWORD_STORE_DIR /Users/${config.home.username}/.password-store '' else ''