diff options
Diffstat (limited to '.config/shell')
| -rw-r--r-- | .config/shell/.zshrc | 21 | ||||
| -rw-r--r-- | .config/shell/envvarrc | 34 | ||||
| -rw-r--r-- | .config/shell/temp | 6 |
3 files changed, 36 insertions, 25 deletions
diff --git a/.config/shell/.zshrc b/.config/shell/.zshrc index 028b8b8..2ae7bd6 100644 --- a/.config/shell/.zshrc +++ b/.config/shell/.zshrc @@ -9,18 +9,27 @@ fpath=(/usr/share/zsh/site-functions $fpath) # ─── 2) Shell behaviour ────────────────────────────────────────────────────── autoload -Uz colors && colors setopt auto_pushd +setopt auto_param_slash setopt no_check_jobs setopt pushd_ignore_dups setopt pushd_silent setopt autocd +setopt auto_menu +setopt menu_complete setopt interactive_comments -stty stop undef -stty -ixon +setopt no_case_glob +setopt no_case_match unsetopt beep +[[ -t 0 ]] && { + stty stop undef + stty -ixon +} zstyle ':completion:*' cache-path "${XDG_CACHE_HOME:-$HOME/.cache}/zsh/zcompcache" zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' zstyle ':completion:*' use-cache on +zstyle ':completion:*' special-dirs +zstyle ':completion:*' squeeze-slashes # ─── 3) Prompt ─────────────────────────────────────────────────────────────── local blue=$(tput setaf 34) @@ -33,14 +42,16 @@ local reset=$(tput sgr0) PS1="%{$blue%}%n%{$green%}@%{$cyan%}%m %{$lime%}%1~ %{$reset%}$ " # ─── 4) History ────────────────────────────────────────────────────────────── -HISTSIZE=10000000 -SAVEHIST=10000000 +HISTSIZE=100000 +SAVEHIST=100000 if [[ ! -d "${XDG_CACHE_HOME:-$HOME/.cache}/shell" ]]; then mkdir -p "${XDG_CACHE_HOME:-$HOME/.cache}/shell" fi HISTFILE="${XDG_CACHE_HOME:-$HOME/.cache}/shell/history" +setopt append_history setopt inc_append_history +setopt share_history setopt hist_ignore_all_dups setopt hist_find_no_dups setopt hist_save_no_dups @@ -90,7 +101,7 @@ else fi zstyle ':completion:*' menu select zmodload zsh/complist -_comp_options+=(globdots) +_comp_options+=(globdots extended_glob) # ─── 8) Keybindings ────────────────────────────────────────────────────────── # Better backspace in vi mode diff --git a/.config/shell/envvarrc b/.config/shell/envvarrc index 9974529..b79294d 100644 --- a/.config/shell/envvarrc +++ b/.config/shell/envvarrc @@ -1,7 +1,6 @@ #!/bin/sh # Filip's envvarrc -# This litte script sets my environment variables. - +# This little script sets my environment variables. # Primary programs export BROWSER="librewolf" @@ -13,47 +12,45 @@ export TERMINAL="st" export TERMINAL_PROG="st" export SHELL="zsh" - # XDG base directories export XDG_CACHE_HOME="$HOME/.cache" export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" - +export XDG_STATE_HOME="$HOME/.local/state" # PATH and scripts export SCRIPTS="$HOME/.scripts" for dir in \ - "$SCRIPTS" \ - "$HOME/langs/R" \ - "$HOME/.cargo/bin" \ - "$HOME/.local/bin" -do - [ -d "$dir" ] || continue - - case ":$PATH:" in + "$SCRIPTS" \ + "$HOME/langs/R" \ + "$HOME/.cargo/bin" \ + "$HOME/.local/bin"; do + [ -d "$dir" ] || continue + + case ":$PATH:" in *":$dir:"*) ;; *) PATH="$dir:$PATH" ;; - esac + esac done export PATH - # Shell / config locations export ZDOTDIR="$XDG_CONFIG_HOME/shell" export ZSHDIR="$ZDOTDIR" export ALIASRC="$ZDOTDIR/aliasrc" export ENVVARRC="$ZDOTDIR/envvarrc" - # X / input export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc" export XINPUTRC="$XDG_CONFIG_HOME/x11/xinputrc" export XPROFILE="$XDG_CONFIG_HOME/x11/xprofile" - # Language runtimes & tools +# Rust +export CARGO_HOME="$XDG_DATA_HOME/cargo" + # R export R_HOME="/usr/lib/R" export R_LIBS_USER="$HOME/langs/R" @@ -62,6 +59,7 @@ export R_HISTFILE="$HOME/langs/R/.Rhistory" # Go export GOPATH="$HOME/langs/go" +export GOBIN="$GOPATH/bin" # Python / Conda export _CONDA_ROOT="$HOME/.local/opt/miniconda3" @@ -70,12 +68,10 @@ export IPYTHONDIR="$XDG_CONFIG_HOME/ipython" # Ren'Py export RENPY_USER="$HOME/langs/python/renpy" - # Neovim export NVIMPLUGINS="$XDG_CONFIG_HOME/nvim/lua/plugins" export NVIMSNIPPETS="$XDG_CONFIG_HOME/nvim/lua/snips" - # CLI / TUI tools export TIGRC_USER="$XDG_CONFIG_HOME/tig/tigrc" export STARSHIP_CONFIG="$XDG_CONFIG_HOME/starship/starship.toml" @@ -89,13 +85,11 @@ export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store" export STARDICT_DATA_DIR="$XDG_DATA_HOME/stardict" export OBSIDIAN_HOME="$XDG_CACHE_HOME/obsidian" - # Locale export LANG="en_US.UTF-8" export LC_ALL="en_US.UTF-8" export LC_CTYPE="UTF-8" - # Better less export LESS="R" export LESS_TERMCAP_mb="$(printf '%b' '[1;31m')" diff --git a/.config/shell/temp b/.config/shell/temp new file mode 100644 index 0000000..75c2b03 --- /dev/null +++ b/.config/shell/temp @@ -0,0 +1,6 @@ +#!/bin/sh + +# TEMPORARY +export TRANSITLAND_API_KEY="Wj10MMRSKE4PJTNgtGLB5bK5cXd0Pyyr" +export DUFFEL_API_TOKEN="duffel_test_I5aqDofO6D445pIQRsOZlU9leLCjSqfiQ7_B0G4SRxb" +export GEOAPIFY_API_KEY="29df0878ddb04c6aaca758653f692eed" |
