diff options
author | Franck Cuny <franck@fcuny.net> | 2022-06-19 15:57:45 -0700 |
---|---|---|
committer | Franck Cuny <franck@fcuny.net> | 2022-06-20 14:39:35 -0700 |
commit | b5c428822468b9a2dfb00a673c39e809f4ac0651 (patch) | |
tree | 54e2190f9b20ce11827d0d5b10da2a96c135437a /home/zsh | |
parent | feat(tools/seqstat): add a tool to report stats about a sequence (diff) | |
download | world-b5c428822468b9a2dfb00a673c39e809f4ac0651.tar.gz |
ref(home/shell): make it easier to share common things between shells
I'm considering trying again fish, and there are a number of things that should be common between zsh and fish (aliases, environment variables, ...). Instead of duplicating these settings multiple time, I'm consolidating the shell configurations under `home/shell`, and I can set the shell I want to use with `my.home.shell.name`. The first step is to move the modules for fish and zsh under `home/shell`, add an interface to pick which one I want to use, and modify the `host/home.nix` configuration to keep using zsh with the new interface. Change-Id: Idb66b1a6fcc11a6eeaf5fd2d32dd3698d2d85bdf Reviewed-on: https://cl.fcuny.net/c/world/+/455 Tested-by: CI Reviewed-by: Franck Cuny <franck@fcuny.net>
Diffstat (limited to 'home/zsh')
-rw-r--r-- | home/zsh/completion-style.zsh | 34 | ||||
-rw-r--r-- | home/zsh/default.nix | 58 | ||||
-rw-r--r-- | home/zsh/gerrit.zsh | 5 | ||||
-rw-r--r-- | home/zsh/options.zsh | 27 | ||||
-rw-r--r-- | home/zsh/prompt.zsh | 11 | ||||
-rw-r--r-- | home/zsh/sway.zsh | 3 | ||||
-rw-r--r-- | home/zsh/tmux.zsh | 9 |
7 files changed, 0 insertions, 147 deletions
diff --git a/home/zsh/completion-style.zsh b/home/zsh/completion-style.zsh deleted file mode 100644 index 32bd6f4..0000000 --- a/home/zsh/completion-style.zsh +++ /dev/null @@ -1,34 +0,0 @@ -# Style the completion a bit -zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS} - -# Show a prompt on selection -zstyle ':completion:*' select-prompt '%SScrolling active: current selection at %p%s' - -# Use arrow keys in completion list -zstyle ':completion:*' menu select - -# Group results by category -zstyle ':completion:*' group-name '' - -# Keep directories and files separated -zstyle ':completion:*' list-dirs-first true - -# Add colors to processes for kill completion -zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31' - -# match uppercase from lowercase -zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' - -# Filename suffixes to ignore during completion (except after rm command) -zstyle ':completion:*:*:(^rm):*:*files' ignored-patterns '*?.old' - -# command for process lists, the local web server details and host completion -# on processes completion complete all user processes -zstyle ':completion:*:processes' command 'ps -au$USER' - -# Completion formatting and messages -zstyle ':completion:*' verbose yes -zstyle ':completion:*:descriptions' format '%B%d%b' -zstyle ':completion:*:messages' format '%d' -zstyle ':completion:*:warnings' format 'No matches for: %d' -zstyle ':completion:*:corrections' format '%B%d (errors: %e)%b' diff --git a/home/zsh/default.nix b/home/zsh/default.nix deleted file mode 100644 index 21dbedd..0000000 --- a/home/zsh/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ config, pkgs, lib, ... }: -let cfg = config.my.home.zsh; -in -{ - options.my.home.zsh = with lib; { - enable = mkEnableOption "zsh configuration"; - }; - - config = lib.mkIf cfg.enable { - home.packages = with pkgs; [ zsh-completions ]; - - programs.zsh = { - enable = true; - dotDir = ".config/zsh"; - enableCompletion = true; - - history = { - size = 500000; - save = 500000; - extended = false; - ignoreSpace = true; - ignoreDups = true; - share = false; - # see - # https://github.com/nix-community/home-manager/blob/32a7da69dc53c9eb5ad0675eb7fdc58f7fe35272/modules/programs/zsh.nix#L537 - path = ".local/share/zsh/zsh_history"; - }; - - localVariables = { - # Print timing statistics for everything which takes longer than 5 seconds of - # user + system time. - REPORTTIME = 5; - }; - - shellAliases = { - ll = "ls -l --color=auto"; - lt = "ls -ltrh --color=auto"; - }; - - defaultKeymap = "emacs"; - - # the order matters for sway.zsh: I want to load it first - # to start the session if I log on a machine where it's - # available. - # it can't be loaded with `initExtraFirst` because the session - # variables from home-manager are not set yet otherwise (and I - # need them for things like firefox or emacs). - initExtra = lib.concatMapStrings builtins.readFile [ - ./sway.zsh - ./completion-style.zsh - ./gerrit.zsh - ./options.zsh - ./prompt.zsh - ./tmux.zsh - ]; - }; - }; -} diff --git a/home/zsh/gerrit.zsh b/home/zsh/gerrit.zsh deleted file mode 100644 index 9766b2f..0000000 --- a/home/zsh/gerrit.zsh +++ /dev/null @@ -1,5 +0,0 @@ -function rgerrit() { - # gerrit runs on tahoe, and we ssh to it through its tailscale - # network interface. - ssh $(tailscale status --json | jq -r '.Peer | map(select(.HostName == "tahoe"))[0].TailscaleIPs[0]') -p 29418 gerrit $@ -} diff --git a/home/zsh/options.zsh b/home/zsh/options.zsh deleted file mode 100644 index 6d39bc1..0000000 --- a/home/zsh/options.zsh +++ /dev/null @@ -1,27 +0,0 @@ -# Show an error when a globbing expansion doesn't find any match -setopt nomatch - -# List on ambiguous completion and Insert first match immediately -setopt autolist menucomplete - -# Use pushd when cd-ing around -setopt autopushd pushdminus pushdsilent - -# Use single quotes in string without the weird escape tricks -setopt rcquotes - -# Single word commands can resume an existing job -setopt autoresume - -# Append commands to history as they are exectuted -setopt inc_append_history_time - -# Remove useless whitespace from commands -setopt hist_reduce_blanks - -# Those options aren't wanted -unsetopt beep extendedglob notify - -# word select works like in bash -autoload -U select-word-style -select-word-style bash diff --git a/home/zsh/prompt.zsh b/home/zsh/prompt.zsh deleted file mode 100644 index 1c21d4b..0000000 --- a/home/zsh/prompt.zsh +++ /dev/null @@ -1,11 +0,0 @@ -setopt prompt_subst - -PROMPT='%K{cyan}%F{black}%m%k%f %~ %% ' - -# For tramp (emacs). -if [ "$TERM" = "dumb" ]; then - unset PROMPT - PS1='$ ' - unsetopt zle -fi - diff --git a/home/zsh/sway.zsh b/home/zsh/sway.zsh deleted file mode 100644 index 69d5103..0000000 --- a/home/zsh/sway.zsh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then - exec sway -fi diff --git a/home/zsh/tmux.zsh b/home/zsh/tmux.zsh deleted file mode 100644 index 97944f5..0000000 --- a/home/zsh/tmux.zsh +++ /dev/null @@ -1,9 +0,0 @@ -# If we're not in an ssh connection, and tmux is installed, and we're -# not already in a tmux session, attach to the session named -# 'default', and if the session does not exist, start one named -# 'default' -if [ -z "$SSH_CONNECTION" ]; then - if command -v tmux &> /dev/null && [ -z "$TMUX" ]; then - tmux attach -t default || tmux new -s default - fi -fi |