diff options
author | Karel Kočí <cynerd@email.cz> | 2023-03-16 13:22:29 +0100 |
---|---|---|
committer | Karel Kočí <cynerd@email.cz> | 2023-03-16 22:00:43 +0100 |
commit | da54fd0a08cb5d29cf0d52f1688736634ebe03cb (patch) | |
tree | fb78ec2353cab663b49497a599aa4dee4f865e8c /nixos.nix | |
parent | f4e8372bc0cd143ea30cd3c28ec581b73649cfe0 (diff) | |
download | shellrc-da54fd0a08cb5d29cf0d52f1688736634ebe03cb.tar.gz shellrc-da54fd0a08cb5d29cf0d52f1688736634ebe03cb.tar.bz2 shellrc-da54fd0a08cb5d29cf0d52f1688736634ebe03cb.zip |
pkgs: fix build failure
Diffstat (limited to 'nixos.nix')
-rw-r--r-- | nixos.nix | 35 |
1 files changed, 22 insertions, 13 deletions
@@ -7,16 +7,6 @@ overlays: { with lib; let cnf = config.programs.shellrc; zshEnable = config.programs.zsh.enable; - - # Source all files in an appropriate shell directory in every profile - shellInit = dir: '' - for p in $NIX_PROFILES; do - for file in $p/etc/${dir}/*; do - [ -f "$file" ] || continue - . "$file" - done - done - ''; in { options = { programs.shellrc = { @@ -37,12 +27,31 @@ in { { nixpkgs.overlays = overlays; - programs.bash.interactiveShellInit = shellInit "bashrc.d"; - programs.zsh.interactiveShellInit = mkIf zshEnable (shellInit "zshrc.d"); + environment.pathsToLink = ["/etc/shellrc.d" "/etc/bashrc.d"] ++ optional zshEnable "/etc/zshrc.d"; + programs.bash.interactiveShellInit = '' + # Load files provided by packages + for p in $NIX_PROFILES; do + [ -e $p/etc/bashrc.d ] || continue + for file in $p/etc/bashrc.d/*; do + [ -f "$file" ] || continue + . "$file" + done + done + ''; + programs.zsh.interactiveShellInit = mkIf zshEnable '' + # Load files provided by packages + for p in ''${=NIX_PROFILES}; do + [ -e $p/etc/zshrc.d ] || continue + for file in $p/etc/zshrc.d/*; do + [ -f "$file" ] || continue + . "$file" + done + done + ''; } (mkIf cnf.enable { environment.systemPackages = - [pkgs.shellrc-bash] + [pkgs.shellrc-generic pkgs.shellrc-bash] ++ optional cnf.desktop pkgs.shellrc-desktop ++ optional zshEnable pkgs.shellrc-zsh; |