Merge pull request #222 from ocf/skip_ocf_zshrc

zsh: emacs keybinds and $SKIP_OCF_ZSHRC

- add $SKIP_OCF_ZSHRC to skip our zshrc. this does not skip things enabled with nixos modules. those can be disabled with `zsh --no-rc` but we should figure out how we can let people do that in a config file (not a regression)
- enable emacs keybinds by default

Author: 24apricots

modules/shell/default.nix

@@ -11,7 +11,6 @@ in
   config = lib.mkIf cfg.enable {
     environment = {
       enableAllTerminfo = true;
-      etc."p10k.zsh".source = ./p10k.zsh;
 
       systemPackages = with pkgs; [
         bash
@@ -29,9 +28,26 @@ in
           zsh-newuser-install() { :; }
         '';
         interactiveShellInit = ''
+          # add default ocf config only if not disabled by user in ~/.zshenv by
+          # setting $SKIP_OCF_ZSHRC
+          if [[ -n "$SKIP_OCF_ZSHRC" ]]; then
+            return
+          fi
+
+          # emacs keybinds: ^u, ^k, ^a, ^e, etc
+          # this is a good nonintrusive default that adds useful keybinds while
+          # not interfering with people's muscle memory
+          bindkey -e
+
           source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
-          source /etc/p10k.zsh
+
+          # p10k.zsh start
+          ${builtins.readFile ./p10k.zsh}
+          # p10k.zsh end
+
+          # command_not_found_handler.zsh start
           ${builtins.readFile ./command_not_found_handler.zsh}
+          # command_not_found_handler.zsh end
         '';
       };