From 3418e57907622bbfb35a3d93939324d97e4fd924 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Sun, 3 Sep 2023 11:51:53 +0200 Subject: [PATCH] Enable zsh and fix key bindings --- m/common/main.nix | 4 +-- m/common/zsh.nix | 89 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 m/common/zsh.nix diff --git a/m/common/main.nix b/m/common/main.nix index 3792135..f664ef8 100644 --- a/m/common/main.nix +++ b/m/common/main.nix @@ -12,6 +12,7 @@ ./users.nix ./watchdog.nix ./rev.nix + ./zsh.nix ]; nixpkgs.overlays = [ @@ -73,9 +74,6 @@ nix.gc.dates = "weekly"; nix.gc.options = "--delete-older-than 30d"; - programs.zsh.enable = true; - programs.zsh.histSize = 100000; - programs.bash.promptInit = '' PS1="\h\\$ " ''; diff --git a/m/common/zsh.nix b/m/common/zsh.nix new file mode 100644 index 0000000..c437a49 --- /dev/null +++ b/m/common/zsh.nix @@ -0,0 +1,89 @@ +{ pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + direnv + zsh-completions + nix-zsh-completions + ]; + + programs.zsh = { + enable = true; + histSize = 1000000; + + shellInit = '' + # Disable new user prompt + if [ ! -e ~/.zshrc ]; then + touch ~/.zshrc + fi + ''; + + promptInit = '' + # Note that to manually override this in ~/.zshrc you should run `prompt off` + # before setting your PS1 and etc. Otherwise this will likely to interact with + # your ~/.zshrc configuration in unexpected ways as the default prompt sets + # a lot of different prompt variables. + autoload -U promptinit && promptinit && prompt default && setopt prompt_sp + ''; + + # Taken from Ulli Kehrle config: + # https://git.hrnz.li/Ulli/nixos/src/commit/2e203b8d8d671f4e3ced0f1744a51d5c6ee19846/profiles/shell.nix#L199-L205 + interactiveShellInit = '' + source "${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh" + + # dircolors doesn't support alacritty: + # https://lists.gnu.org/archive/html/bug-coreutils/2019-05/msg00029.html + export LS_COLORS='rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=00:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.avif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.webp=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:*~=00;90:*#=00;90:*.bak=00;90:*.old=00;90:*.orig=00;90:*.part=00;90:*.rej=00;90:*.swp=00;90:*.tmp=00;90:*.dpkg-dist=00;90:*.dpkg-old=00;90:*.ucf-dist=00;90:*.ucf-new=00;90:*.ucf-old=00;90:*.rpmnew=00;90:*.rpmorig=00;90:*.rpmsave=00;90:'; + + # From Arch Linux and GRML + bindkey "^R" history-incremental-pattern-search-backward + bindkey "^S" history-incremental-pattern-search-forward + + # Auto rehash for new binaries + zstyle ':completion:*' rehash true + # show a nice menu with the matches + zstyle ':completion:*' menu yes select + + bindkey '^[OA' history-substring-search-up # Up + bindkey '^[[A' history-substring-search-up # Up + + bindkey '^[OB' history-substring-search-down # Down + bindkey '^[[B' history-substring-search-down # Down + + bindkey '\e[1~' beginning-of-line # Home + bindkey '\e[7~' beginning-of-line # Home + bindkey '\e[H' beginning-of-line # Home + bindkey '\eOH' beginning-of-line # Home + + bindkey '\e[4~' end-of-line # End + bindkey '\e[8~' end-of-line # End + bindkey '\e[F ' end-of-line # End + bindkey '\eOF' end-of-line # End + + bindkey '^?' backward-delete-char # Backspace + bindkey '\e[3~' delete-char # Del + # bindkey '\e[3;5~' delete-char # sometimes Del, sometimes C-Del + bindkey '\e[2~' overwrite-mode # Ins + + bindkey '^H' backward-kill-word # C-Backspace + + bindkey '5~' kill-word # C-Del + bindkey '^[[3;5~' kill-word # C-Del + bindkey '^[[3^' kill-word # C-Del + + bindkey "^[[1;5H" backward-kill-line # C-Home + bindkey "^[[7^" backward-kill-line # C-Home + + bindkey "^[[1;5F" kill-line # C-End + bindkey "^[[8^" kill-line # C-End + + bindkey '^[[1;5C' forward-word # C-Right + bindkey '^[0c' forward-word # C-Right + bindkey '^[[5C' forward-word # C-Right + + bindkey '^[[1;5D' backward-word # C-Left + bindkey '^[0d' backward-word # C-Left + bindkey '^[[5D' backward-word # C-Left + ''; + }; +}