diff --git a/_zshrc b/_zshrc index 6126eec..3534108 100755 --- a/_zshrc +++ b/_zshrc @@ -30,8 +30,8 @@ function zle-keymap-select { } zle -N zle-keymap-select -[ -f "$HOME/.bashrc" ] && emulate sh -c "source $HOME/.bashrc" -[ -f "$HOME/./config/bashrc" ] && emulate sh -c "source $HOME/./config/bashrc" +[ -f "$HOME/.bashrc" ] && emulate bash -c "source $HOME/.bashrc" +[ -f "$HOME/./config/bashrc" ] && emulate bash -c "source $HOME/./config/bashrc" [ -f "/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" ] && source "/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" [ -f "/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh" ] && source "/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh" diff --git a/flake.nix b/flake.nix index 124ac8e..19d64ac 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,6 @@ userEmail = "osh@oshgnacknak.de"; }; - programs.neovim = { enable = true; package = neovim-nightly-overlay.packages.${pkgs.system}.default; @@ -43,9 +42,12 @@ programs.home-manager.enable = true; - programs.bash.initExtra = '' - exec zsh - ''; + programs.bash = { + enable = true; + initExtra = '' + exec zsh + ''; + }; programs.zsh = { enable = true;