diff options
| author | Martin Fischer <martin@push-f.com> | 2024-12-12 08:14:18 +0100 |
|---|---|---|
| committer | Martin Fischer <martin@push-f.com> | 2024-12-12 08:14:18 +0100 |
| commit | d17efc051d99e27abd44655acaf508e360c41bac (patch) | |
| tree | f83607c9378403270c9aca1f682a06cec7bb741b /user/zsh/.zshrc | |
| parent | 2cac94f9c3aa9797a8b86921cb01c96eee013a7f (diff) | |
refactor: move part-specifics out of .zshrc
Diffstat (limited to 'user/zsh/.zshrc')
| -rw-r--r-- | user/zsh/.zshrc | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/user/zsh/.zshrc b/user/zsh/.zshrc index ba07dc2..a579784 100644 --- a/user/zsh/.zshrc +++ b/user/zsh/.zshrc @@ -22,9 +22,7 @@ function ls() { } ## Aliases -alias code='codium' alias ls='ls --color=auto --group-directories-first' # see also ls function -alias tokei='tokei -s code -n commas' alias tree='tree -aI .git --dirsfirst' ## Shell variables @@ -52,7 +50,6 @@ export XDG_CONFIG_HOME=$HOME/.config export EDITOR=vim export INPUTRC=$XDG_CONFIG_HOME/readline/inputrc -export NPM_CONFIG_PREFIX="$HOME/.local/npm" export PYTHON_BASIC_REPL=1 # use readline (Python >=3.13 defaults to its own REPL which has no vi keybindings) # If we'd extend the PATH with PATH=$PATH:extra the PATH would become longer with each subshell. @@ -60,26 +57,15 @@ export PYTHON_BASIC_REPL=1 # use readline (Python >=3.13 defaults to its own REP typeset -U path PATH # Now we can append PATH entries with path+=... without the PATH growing in each subshell. -path+=~/.cargo/bin -path+=($NPM_CONFIG_PREFIX/bin) - ## Completion autoload -Uz compinit [ -d "$XDG_CACHE_HOME"/zsh ] || mkdir -p "$XDG_CACHE_HOME"/zsh compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-$ZSH_VERSION -# Terminal emulator specifics -if [ $TERM = foot ]; then - # Enable spawning of new terminal instances in the current working directory - function osc7-pwd() { - emulate -L zsh # also sets localoptions for us - setopt extendedglob - local LC_ALL=C - printf '\e]7;file://%s%s\e\' $HOST ${PWD//(#m)([^@-Za-z&-;_~])/%${(l:2::0:)$(([##16]#MATCH))}} - } - - function chpwd-osc7-pwd() { - (( ZSH_SUBSHELL )) || osc7-pwd - } - add-zsh-hook -Uz chpwd chpwd-osc7-pwd +# Environment-specifics +if [ -n "$MYNIX_DEV" ]; then + source "$ZDOTDIR/zshrc-dev.sh" +fi +if [ -n "$MYNIX_GRAPHICAL" ]; then + source "$ZDOTDIR/zshrc-graphical.sh" fi |