Switch back to macOS.

_cli/zsh/.zshenv

@@ -3,9 +3,6 @@ export XDG_CACHE_HOME=/tmp/${USER}-cache
 export XDG_CONFIG_HOME=$HOME/.config
 export XDG_DATA_HOME=$HOME/.local/share
 export XDG_STATE_HOME=$HOME/.local/state
+export HISTFILE=$XDG_DATA_HOME/zsh/history
 export HISTSIZE=10000
 export SAVEHIST=$HISTSIZE
-export HISTFILE=$XDG_DATA_HOME/zsh/history
-# if test -z "$XDG_RUNTIME_DIR"; then
-#   export XDG_RUNTIME_DIR=$(mktemp -d /tmp/$(id -u)-runtime-dir.XXX)
-# fi

_cli/zsh/.zshrc

@@ -1,6 +1,6 @@
-if test -z "$XDG_RUNTIME_DIR"; then
+# mac specific configuration
-    export XDG_RUNTIME_DIR=$(mktemp -d /tmp/$(id -u)-runtime-dir.XXX)
+touch $HOME/.hushlogin
-fi
+eval "$(/opt/homebrew/bin/brew shellenv)"
 
 # prepare directories
 mkdir -p $XDG_CACHE_HOME/zsh
@@ -19,9 +19,9 @@ path=(~/.local/bin "$path[@]")
 # source configuration
 source $ZDOTDIR/aliases.zsh
 source $ZDOTDIR/cleanhome.zsh
+source $ZDOTDIR/fzf.zsh
 source $ZDOTDIR/keys.zsh
 source $ZDOTDIR/ssh.zsh
-source $ZDOTDIR/fzf.zsh
 
 # source modules
 source ~/.local/git/zsh_modules/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh

_cli/zsh/aliases.zsh

@@ -3,8 +3,6 @@ LOCAL_GIT_DIR=${HOME}/.local/git
 alias ga='git add .; git commit --no-edit --amend; git push --force-with-lease'
 alias gae='git add .; git commit --amend; git push --force-with-lease'
 alias less='less -R'
-alias lg="lazygit"
-alias qt="dbus-run-session qtile start -b wayland"
 
 if [[ $(command -v bat) ]]; then
   alias cat='bat -pp --color=always --tabs=2 --theme=Monokai\ Extended\ Bright'
@@ -50,9 +48,3 @@ function ud() {
   for i in ${LOCAL_GIT_DIR}/dotfiles ${LOCAL_GIT_DIR}/zsh_modules/*; do git -C ${i} pull; done
   nvim -c "lua require('lazy').sync({wait = true})"
 }
-function upgrade() {
-  case $(lsb_release -si) in
-    Gentoo) eix-sync && eix-update && emerge -avuNDU @world ;;
-    VoidLinux) xbps-install -Su && xbps-remove -RoO && xlocate -S ;;
-  esac
-}

_cli/zsh/cleanhome.zsh

@@ -1,3 +1,2 @@
 export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 export LESSHISTFILE='/dev/null'
-mkdir -p ~/.local/share/tig

_cli/zsh/fzf.zsh

@@ -1,9 +1,4 @@
 if [[ $(command -v fzf) ]]; then
-  case $(lsb_release -si) in
-    Gentoo) source /usr/share/zsh/site-functions/_fzf ;;
-    VoidLinux) source /usr/share/fzf/completion.zsh ;;
-  esac
-  source /usr/share/fzf/key-bindings.zsh
   export FZF_DEFAULT_COMMAND='fd -H -L --ignore-file ~/.local/config/fd'
   export FZF_CTRL_T_COMMAND='fd -H -L --ignore-file ~/.local/config/fd'
   export FZF_DEFAULT_OPTS="--multi -e --ansi --layout=reverse --preview='bat --color=always --tabs=2 --style=plain --theme=Monokai\ Extended\ Bright {}'"

_linux/_cli/zsh/.zshenv

@@ -0,0 +1,11 @@
+skip_global_compinit=1
+export XDG_CACHE_HOME=/tmp/${USER}-cache
+export XDG_CONFIG_HOME=$HOME/.config
+export XDG_DATA_HOME=$HOME/.local/share
+export XDG_STATE_HOME=$HOME/.local/state
+export HISTSIZE=10000
+export SAVEHIST=$HISTSIZE
+export HISTFILE=$XDG_DATA_HOME/zsh/history
+# if test -z "$XDG_RUNTIME_DIR"; then
+#   export XDG_RUNTIME_DIR=$(mktemp -d /tmp/$(id -u)-runtime-dir.XXX)
+# fi

_linux/_cli/zsh/.zshrc

@@ -0,0 +1,69 @@
+if test -z "$XDG_RUNTIME_DIR"; then
+    export XDG_RUNTIME_DIR=$(mktemp -d /tmp/$(id -u)-runtime-dir.XXX)
+fi
+
+# prepare directories
+mkdir -p $XDG_CACHE_HOME/zsh
+mkdir -p $XDG_DATA_HOME/zsh
+
+# global exports and options
+setopt HIST_IGNORE_ALL_DUPS
+setopt HIST_SAVE_NO_DUPS
+setopt HIST_REDUCE_BLANKS
+setopt SHARE_HISTORY
+setopt INC_APPEND_HISTORY
+
+# set path
+path=(~/.local/bin "$path[@]")
+
+# source configuration
+source $ZDOTDIR/aliases.zsh
+source $ZDOTDIR/cleanhome.zsh
+source $ZDOTDIR/keys.zsh
+source $ZDOTDIR/ssh.zsh
+source $ZDOTDIR/fzf.zsh
+
+# source modules
+source ~/.local/git/zsh_modules/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh
+source ~/.local/git/zsh_modules/wd/wd.plugin.zsh
+export WD_CONFIG=$XDG_CONFIG_HOME/wd_list
+
+# set fpath
+fpath=(~/.local/git/zsh_modules/wd $fpath)
+
+# theme and colors
+if [[ $(command -v vivid) ]]; then
+  export LS_COLORS=$(vivid generate molokai)
+else
+  unset LS_COLORS
+fi
+tabs 2
+export STARSHIP_CACHE="$XDG_CACHE_HOME"/starship
+eval "$(STARSHIP_CACHE="$XDG_CACHE_HOME"/starship starship init zsh)"
+
+# completion
+zstyle ':completion:*' menu select
+zstyle ':completion:*' list-colors ''
+
+autoload -Uz compinit
+if [ ! -e $XDG_DATA_HOME/zsh/zcompdump.zwc ]; then
+  autoload -Uz zrecompile
+  zrecompile -p -R $XDG_DATA_HOME/zsh/zcompdump
+fi
+if [[ -n $XDG_DATA_HOME/zsh/zcompdump(#qN.mh+24) ]]; then
+	compinit -d $XDG_DATA_HOME/zsh/zcompdump
+else
+	compinit -C -d $XDG_DATA_HOME/zsh/zcompdump
+fi
+
+# quick note functionality
+if [[ -f ~/.note ]]; then
+  echo
+  cat ~/.note
+  echo
+fi
+
+# local settings
+if [[ -f ~/.local/config/zsh ]]; then
+  source ~/.local/config/zsh
+fi

_linux/_cli/zsh/aliases.zsh

@@ -0,0 +1,58 @@
+LOCAL_GIT_DIR=${HOME}/.local/git
+
+alias ga='git add .; git commit --no-edit --amend; git push --force-with-lease'
+alias gae='git add .; git commit --amend; git push --force-with-lease'
+alias less='less -R'
+alias lg="lazygit"
+alias qt="dbus-run-session qtile start -b wayland"
+
+if [[ $(command -v bat) ]]; then
+  alias cat='bat -pp --color=always --tabs=2 --theme=Monokai\ Extended\ Bright'
+fi
+
+if [[ $(command -v eza) ]]; then
+  alias ls='eza --git --octal-permissions --no-permissions --group-directories-first'
+  alias ll='eza --git --octal-permissions --no-permissions --group-directories-first -l'
+else
+  case $(uname -s) in;
+    Darwin) alias ls='ls -G';;
+    Linux)  alias ls='ls --color';;
+  esac
+  alias ll='ls -l'
+fi
+
+if [[ $(command -v fd) ]]; then
+  if [[ -f ~/.local/config/fd ]]; then
+    alias fd='fd -H -L --ignore-file ~/.local/config/fd'
+  else
+    alias fd='fd -H -L'
+  fi
+fi
+
+if [ $(command -v nvim) ]; then
+  export EDITOR=nvim
+  export MANPAGER="nvim +Man!"
+  alias vim=nvim
+  alias vimdiff="nvim -d"
+elif [ $(command -v vim) ] ; then
+  export EDITOR=vim
+else
+  export EDITOR=vi
+fi
+
+if [[ $(command -v rg) ]]; then
+  alias grep='rg -i'
+else
+  alias grep='grep --color'
+fi
+
+function ud() {
+  for i in ${LOCAL_GIT_DIR}/dotfiles ${LOCAL_GIT_DIR}/zsh_modules/*; do git -C ${i} pull; done
+  nvim -c "lua require('lazy').sync({wait = true})"
+}
+function upgrade() {
+  case $(lsb_release -si) in
+    Gentoo) eix-sync && eix-update && emerge -avuNDU @world ;;
+    VoidLinux) xbps-install -Su && xbps-remove -RoO && xlocate -S ;;
+  esac
+}

_linux/_cli/zsh/cleanhome.zsh

@@ -0,0 +1,3 @@
+export GNUPGHOME="$XDG_DATA_HOME/gnupg"
+export LESSHISTFILE='/dev/null'
+mkdir -p ~/.local/share/tig

_linux/_cli/zsh/fzf.zsh

@@ -0,0 +1,17 @@
+if [[ $(command -v fzf) ]]; then
+  case $(lsb_release -si) in
+    Gentoo) source /usr/share/zsh/site-functions/_fzf ;;
+    VoidLinux) source /usr/share/fzf/completion.zsh ;;
+  esac
+  source /usr/share/fzf/key-bindings.zsh
+  export FZF_DEFAULT_COMMAND='fd -H -L --ignore-file ~/.local/config/fd'
+  export FZF_CTRL_T_COMMAND='fd -H -L --ignore-file ~/.local/config/fd'
+  export FZF_DEFAULT_OPTS="--multi -e --ansi --layout=reverse --preview='bat --color=always --tabs=2 --style=plain --theme=Monokai\ Extended\ Bright {}'"
+  export FZF_CTRL_R_OPTS="-e --ansi --layout=reverse --preview=''"
+  _fzf_compgen_path() {
+    fd -H -L --ignore-file ~/.local/config/fd . "$1"
+  }
+  _fzf_compgen_dir() {
+    fd -H -L --ignore-file ~/.local/config/fd --type d . "$1"
+  }
+fi

_linux/_cli/zsh/keys.zsh

@@ -0,0 +1,22 @@
+# key mode
+bindkey -e
+
+# proudly stolen from oh-my-zsh
+if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
+  function zle-line-init() {
+    echoti smkx
+  }
+  function zle-line-finish() {
+    echoti rmkx
+  }
+  zle -N zle-line-init
+  zle -N zle-line-finish
+fi
+if [[ -n "${terminfo[kcuu1]}" ]]; then
+  autoload -U up-line-or-beginning-search
+  zle -N up-line-or-beginning-search
+
+  bindkey -M emacs "${terminfo[kcuu1]}" up-line-or-beginning-search
+  bindkey -M viins "${terminfo[kcuu1]}" up-line-or-beginning-search
+  bindkey -M vicmd "${terminfo[kcuu1]}" up-line-or-beginning-search
+fi

_linux/_cli/zsh/ssh.zsh

@@ -0,0 +1,6 @@
+if ! pgrep -u "$USER" ssh-agent > /dev/null; then
+  ssh-agent > "$XDG_CACHE_HOME/ssh-agent.env"
+fi
+if [[ ! "$SSH_AUTH_SOCK" ]]; then
+  source "$XDG_CACHE_HOME/ssh-agent.env" >/dev/null
+fi