merge: (desktop) cleanup

diff --git a/.zshenv b/.zshenv
index 137c0bcbaf0a2ce3e94354e686eee675c71d1cd1..87ab2ed3d12479015d6fd075d1f145ccdb16f94f 100644 (file)
--- a/.zshenv
+++ b/.zshenv
@@ -10,6 +10,7 @@ export ZSH="$ZDOTDIR"
 export ZSHEXTRA="$ZDOTDIR/extra"
 export ZSHINCLUDE="$ZDOTDIR/include"
 export ZSHCOMPLETION="$ZSH/completions"
+export ZSHHISTORY="$ZSH/history"
 export ZSH_COMPDUMP="$ZSH/cache/.zcompdump-$HOST"
 
 # my folders
@@ -24,7 +25,7 @@ export CONFIG="$XDG_CONFIG_HOME"
 export LANG=en_US.UTF-8
 
 # path variables
-export PATH="$PATH:$HOME/.local/bin:$REPOS/script:$REPOS/ruby:$XDG_DATA_HOME/cargo/bin:."
+export PATH="$PATH:$HOME/.local/bin:$REPOS/script:$REPOS/ruby:."
 export CDPATH=".:$HOME:$HOME/$REPOS:$HOME/$XDG_CONFIG_HOME:/"
 
 # language variables
@@ -32,14 +33,13 @@ export GOPATH="$XDG_DATA_HOME/go"
 export PERL_LOCAL_LIB_ROOT="$XDG_DATA_HOME/perl5"
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
-
-# terminal setting:
-# [[ -n $TMUX ]] && export TERM=tmux-256color || export TERM=alacritty
+export PATH="$PATH:$XDG_DATA_HOME/cargo/bin"
+export PATH="$PATH:$XDG_DATA_HOME/gem/ruby/3.0.0/bin"
 
 # preferred programs
-export PAGER='less'
+export PAGER='/usr/bin/less'
 export LESS='-R --use-color -Dd+r$Du+b'
-export MANPAGER='less -R --use-color -Dd+r -Du+b'
+export MANPAGER='/usr/bin/less -R --use-color -Dd+r -Du+b'
 export EDITOR="/usr/bin/nvim"
 export DIFFPROG="/usr/bin/nvim -d"
 export VISUAL="/usr/bin/nvim"

diff --git a/.zshrc b/.zshrc
index 085999a7ad2089ec0f1f03885e1c199b0d931e6d..f4e4fbb56b6b829c13a3842f6a2060514d7c754d 100644 (file)
--- a/.zshrc
+++ b/.zshrc
@@ -2,7 +2,7 @@
 
 # setup ~/.config/zsh
 . $ZDOTDIR/.zshenv
-[[ ! -d $ZSH ]] && mkdir -p $ZSH/cache $ZSHINCLUDE $ZSHCOMPLETION $ZSHEXTRA
+[[ ! -d $ZSH ]] && mkdir -p $ZSH/cache $ZSHINCLUDE $ZSHCOMPLETION $ZSHEXTRA $ZSHHISTORY
 
 # options
 ENABLE_CORRECTION="true"
@@ -58,7 +58,7 @@ bindkey "\e[2~" quoted-insert
 # custom prompt
 if [[ -n $SSH_CONNECTION ]]; then
 PROMPT='%(?..%B%F{red}x)
-%B%F{yellow}%n%b%f@%B%F{blue}%m%b%f: %F{cyan}%~ %F{red}[SSH] $F{magenta}[gentoo] %f$(git_prompt_enhanced_status)
+%B%F{yellow}%n%b%f@%B%F{red}%m%b%f: %F{blue}%~ %F{red}[SSH] %F{magenta}[gentoo] %f$(git_prompt_enhanced_status)
 %B%F{green}%(!.#.$) %f%b> '
 RPROMPT='%f[%!]'
 else