From f32b5102d5f0e777579fa47cb783ebdfd6b34ca2 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Mon, 6 May 2024 18:53:45 +0100 Subject: [PATCH] Add initial zsh config --- .zshrc | 63 ++++++++---------------------------------- home-configuration.scm | 4 ++- 2 files changed, 15 insertions(+), 52 deletions(-) diff --git a/.zshrc b/.zshrc index deca10c..0b2cd73 100644 --- a/.zshrc +++ b/.zshrc @@ -12,66 +12,27 @@ typeset -U path cdpath fpath manpath # oh-my-zsh extra settings for plugins # oh-my-zsh configuration generated by NixOS -plugins=(colored-man-pages lol rand-quote) +# plugins=(colored-man-pages lol rand-quote) -source $ZSH/oh-my-zsh.sh +# source $ZSH/oh-my-zsh.sh -# History options should be set in .zshrc and after oh-my-zsh sourcing. -# See https://github.com/nix-community/home-manager/issues/177. -HISTSIZE="10000" -SAVEHIST="10000" - -HISTFILE="$HOME/.zsh_history" -mkdir -p "$(dirname "$HISTFILE")" - -setopt HIST_FCNTL_LOCK -setopt HIST_IGNORE_DUPS -unsetopt HIST_IGNORE_ALL_DUPS -setopt HIST_IGNORE_SPACE -unsetopt HIST_EXPIRE_DUPS_FIRST -setopt SHARE_HISTORY -setopt EXTENDED_HISTORY -setopt autocd - -if [[ $options[zle] = on ]]; then - . /nix/store/dysv1z18q6541q9pvcy8nv8ksjg5fcjv-fzf-0.45.0/share/fzf/completion.zsh - . /nix/store/dysv1z18q6541q9pvcy8nv8ksjg5fcjv-fzf-0.45.0/share/fzf/key-bindings.zsh -fi - -source /nix/store/bk46a9hcbw8hi3qh5f15x41yskw3jpvv-transient.zsh +# source /nix/store/bk46a9hcbw8hi3qh5f15x41yskw3jpvv-transient.zsh GPG_TTY="$(tty)" export GPG_TTY if [[ $TERM != "dumb" ]]; then - eval "$(/etc/profiles/per-user/pixelifytica/bin/starship init zsh)" + command -v starship && eval "$(starship init zsh)" + command -v direnv && eval "$(direnv hook zsh)" fi -eval "$(/nix/store/vhskx613mi6c7cc10maw83bbgay906cl-direnv-2.32.3/bin/direnv hook zsh)" - -source <(/nix/store/z83aybmr0dc35pz3w62i8s89dcrnkhhm-carapace-0.28.3/bin/carapace _carapace zsh) - -. /nix/store/n1xls9daqgkgpa521fdpjvi0dwqr1g1a-vte-0.74.2/etc/profile.d/vte.sh - - # Aliases -alias eza='eza '\''--icons'\'' '\''--git'\'' '\''--octal-permissions'\''' -alias gsa='git-sync-all' -alias la='eza -a' -alias ll='eza -l' -alias lla='eza -la' -alias ls='eza' -alias lt='eza --tree' - -# Named Directory Hashes - - -source /nix/store/aidna5daxlq5sv2y2898wrma6246hgzq-zsh-syntax-highlighting-0.7.1/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -ZSH_HIGHLIGHT_HIGHLIGHTERS+=() - - -source /nix/store/if3mlcs93q5nqnsvj3xplda76lalpkv2-zsh-history-substring-search-1.1.0/share/zsh-history-substring-search/zsh-history-substring-search.zsh -bindkey "^[[A" history-substring-search-up -bindkey "^[[B" history-substring-search-down +alias eza="eza --icons --git --octal-permissions" +alias gsa="git-sync-all" +alias la="eza -a" +alias ll="eza -l" +alias lla="eza -la" +alias ls="eza" +alias lt="eza --tree" diff --git a/home-configuration.scm b/home-configuration.scm index 01eafbf..cd4a49e 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -26,4 +26,6 @@ ("la" . "eza -a") ("ll" . "eza -l") ("lla" . "eza -la") - ("lt" . "eza --tree")))))))) + ("lt" . "eza --tree"))))) + (service home-zsh-service-type + (home-zsh-configuration)))))