Autostart zsh

_bashrc

@@ -24,10 +24,6 @@ mkcd() {
     cd "$1"
 }
 
-if [ "$PREFERRED_SHELL" = zsh ] && command -v ls > /dev/null; then
-    exec zsh
-fi
-
 export PS1="
 $(tput bold)$(tput setaf 1)[$(tput setaf 3)\u$(tput setaf 2)@$(tput setaf 4)\H $(tput setaf 5)\w$(tput setaf 1)]$(tput setaf 7)
 $ $(tput sgr0)"

_config/nvim/plugins.vim

@@ -1,7 +1,6 @@
 call plug#begin(stdpath('data') . '/plugged')
 Plug 'preservim/nerdtree'
 Plug 'tpope/vim-fugitive'
-Plug 'vim-syntastic/syntastic'
 Plug 'junegunn/fzf.vim'
 Plug 'tpope/vim-surround'
 Plug 'mg979/vim-visual-multi'

_zshrc

@@ -30,9 +30,11 @@ function zle-keymap-select {
 }
 zle -N zle-keymap-select
 
-unset PREFERRED_SHELL
-[ -f "$HOME/./config/bashrc" ] && emulate sh -c "source $HOME/./config/bashrc"
-[ -f "$HOME/.bashrc" ] && emulate sh -c "source $HOME/.bashrc"
+if [ -f "$HOME/.config/bashrc" ]; then
+    emulate sh -c "source $HOME/.config/bashrc"
+else if [ -f "$HOME/.bashrc" ];
+    emulate sh -c "source $HOME/.bashrc"
+fi
 
 [ -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"

flake.nix

@@ -78,11 +78,23 @@
               };
           };
 
+          programs.bash.enable = true;
+          programs.bash.initExtra = ''
+            exec ${pkgs.zsh}/bin/zsh
+          '';
+
           programs.fzf = {
             enable = true;
             enableZshIntegration = true;
           };
 
+          home.keyboard = {
+            variant = null;
+            options = [
+              "caps:escape"           # make Caps = Escape
+            ];
+          };
+
           # Put extra packages in the *user* profile (not system)
           home.packages = with pkgs; [
             ripgrep
@@ -115,7 +127,6 @@
           # Environment variables only for this user/session
           home.sessionVariables = {
             EDITOR = "nvim";
-            PREFERRED_SHELL = "zsh";
           };
 
           # Good HM hygiene