johno/nixos-configs
1
0
Fork 0
Code Issues 3 Pull Requests 8 Actions Packages Projects Releases Wiki Activity

[home-work] Fix bash/zsh init conflicts

Browse Source
This commit is contained in:
John Ogle
2025-09-30 08:33:38 -07:00
parent eed88a9ac0
commit 2b7cf66e69
1 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
home/home-darwin-work.nix
View File

@@ -15,34 +15,10 @@ in
# Override Darwin-incompatible settings from base role # Override Darwin-incompatible settings from base role
programs.rbw.settings.pinentry = lib.mkForce pkgs.pinentry_mac; programs.rbw.settings.pinentry = lib.mkForce pkgs.pinentry_mac;
programs.bash = {
enable = true;
initExtra = ''
source ~/Development/config_files/square/bashrc
# Generated by Hermit; START; DO NOT EDIT. # Disable direct control over bash and zsh
if [[ $- == *i* ]]; then programs.bash.enable = lib.mkForce false;
HERMIT_ROOT_BIN="''${HERMIT_ROOT_BIN:-"$HOME/bin/hermit"}" programs.zsh.enable = lib.mkForce false;
eval "$(test -x $HERMIT_ROOT_BIN && $HERMIT_ROOT_BIN shell-hooks --print --bash)"
fi
# Generated by Hermit; END; DO NOT EDIT.
'';
};
programs.zsh = {
enable = true;
initContent = ''
source ~/Development/config_files/square/zshrc
# Generated by Hermit; START; DO NOT EDIT.
if [[ -o interactive ]]; then
HERMIT_ROOT_BIN="''${HERMIT_ROOT_BIN:-"$HOME/bin/hermit"}"
eval "$(test -x $HERMIT_ROOT_BIN && $HERMIT_ROOT_BIN shell-hooks --print --zsh)"
fi
# Generated by Hermit; END; DO NOT EDIT.
'';
};
# Keep SSH and Git disabled to avoid conflicts with work environment # Keep SSH and Git disabled to avoid conflicts with work environment
programs.ssh.enable = lib.mkForce false; programs.ssh.enable = lib.mkForce false;
@@ -51,8 +27,14 @@ in
home.shell.enableShellIntegration = true; home.shell.enableShellIntegration = true;
home.roles = {
base.enable = true;
};
imports = [ imports = [
./roles
./modules/emacs ./modules/emacs
./modules/kubectl
./modules/tmux ./modules/tmux
]; ];
} }