From d300dc0020fbe7579be489a03ece7b62ad33ffd2 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Mon, 17 Jul 2023 22:16:01 -0500
Subject: Make ^l reset to delete terminal history

---
 zsh/.zshrc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'zsh/.zshrc')

diff --git a/zsh/.zshrc b/zsh/.zshrc
index d11c091..91abe7c 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -94,6 +94,7 @@ bindkey -- '^[[B'                                               down-line-or-beg
 [[ -n "${key[Right]}" ]] && bindkey -- "${key[Right]}"          forward-char
 [[ -n "${key[Shift-Tab]}" ]] && bindkey -- "${key[Shift-Tab]}"  reverse-menu-complete
 [[ -n "${key[Delete]}" ]] && bindkey -- "${key[Delete]}"        delete-char
+bindkey -s '^l' "^ureset^M"
 
 #eval "$(starship init zsh)"
 type portmaster-start 2>&1 >/dev/null && eval "$(portmaster-start --data=/opt/safing/portmaster completion zsh)"
-- 
cgit v1.2.3


From 9aeae2e662aa1384b14fa507b525dadd30300499 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Mon, 17 Jul 2023 22:25:31 -0500
Subject: On second thought, reset should be alias

---
 sh/aliases | 2 +-
 zsh/.zshrc | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'zsh/.zshrc')

diff --git a/sh/aliases b/sh/aliases
index e3996bd..93672b9 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -43,7 +43,7 @@ alias ga='git add -A'
 alias gd='git diff'
 
 ## Single Chars
-alias r='cd ~ && clear && exec $SHELL'
+alias r='cd ~ && reset && exec $SHELL'
 alias q='exit'
 alias c='clear'
 alias m='make'
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 91abe7c..d11c091 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -94,7 +94,6 @@ bindkey -- '^[[B'                                               down-line-or-beg
 [[ -n "${key[Right]}" ]] && bindkey -- "${key[Right]}"          forward-char
 [[ -n "${key[Shift-Tab]}" ]] && bindkey -- "${key[Shift-Tab]}"  reverse-menu-complete
 [[ -n "${key[Delete]}" ]] && bindkey -- "${key[Delete]}"        delete-char
-bindkey -s '^l' "^ureset^M"
 
 #eval "$(starship init zsh)"
 type portmaster-start 2>&1 >/dev/null && eval "$(portmaster-start --data=/opt/safing/portmaster completion zsh)"
-- 
cgit v1.2.3


From 0e3d7c9afdc49e1b81f976a380a878db0d0c3947 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Wed, 23 Aug 2023 02:02:51 -0500
Subject: Add zfunc completion path support

---
 zsh/.zshrc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'zsh/.zshrc')

diff --git a/zsh/.zshrc b/zsh/.zshrc
index d11c091..0c0366f 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -63,6 +63,8 @@ zle -N zle-line-init
 zle -N zle-keymap-select
 export KEYTIMEOUT=1
 
+fpath+="$ZDOTDIR/zfunc"
+
 autoload -Uz compinit promptinit
 compinit -d $CONFIG/zcompdump
 promptinit
-- 
cgit v1.2.3


From e7f2de1fc4362673d4cce38441e396e08929c942 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Thu, 19 Oct 2023 09:07:03 -0500
Subject: Change shell alias and ENV, set kitty title

Adding in lb=lsblk, adding in more XDG dirs, and permanently set kitty
title to 'terminal' from zsh.
---
 sh/aliases | 2 +-
 sh/profile | 9 +++++++--
 zsh/.zshrc | 3 +--
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'zsh/.zshrc')

diff --git a/sh/aliases b/sh/aliases
index 6b254d7..ef9a53b 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -24,13 +24,13 @@ esac
 alias ll='ls -l'
 alias la='ls -A'
 alias lla='ls -lA'
+alias lb='lsblk'
 alias md='mkdir -p'
 alias ch='cd $HOME'
 
 #alias nvim='vim'
 alias nv='nvim'
 alias v='nvim'
-#alias lf='lfrun'
 
 ## Change utils
 alias rm='rm -i'
diff --git a/sh/profile b/sh/profile
index 1174421..79151b9 100644
--- a/sh/profile
+++ b/sh/profile
@@ -2,11 +2,17 @@
 . /etc/profile
 [ -f /etc/profile.d/nix-daemon.sh ] && . /etc/profile.d/nix-daemon.sh
 
-# Other XDG paths
+# Other XDG vars
 export XDG_DATA_HOME=${XDG_DATA_HOME:="$HOME/.local/share"}
 export XDG_CACHE_HOME=${XDG_CACHE_HOME:="$HOME/.cache"}
 export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:="$HOME/.config"}
 [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs"
+export XDG_CURRENT_DESKTOP="i3"
+export XDG_DOCUMENTS_DIR=${HOME}/Documents
+export XDG_DOWNLOAD_DIR=${HOME}/Downloads
+export XDG_DESKTOP_DIR=${HOME}/Desktop
+export XDG_VIDEOS_DIR=${HOME}/Videos
+
 
 # Doesn't seem to work
 export ANDROID_SDK_HOME="$XDG_CONFIG_HOME"/android
@@ -55,7 +61,6 @@ export QT_QPA_PLATFORMTHEME=qt5ct
 # Fix wayland stuff
 export MOZ_ENABLE_WAYLAND=1
 export XKB_DEFAULT_OPTIONS=caps:escape
-export XDG_CURRENT_DESKTOP=Unity
 
 # Default Apps
 export EDITOR="nvim"
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 0c0366f..3314bb3 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -97,5 +97,4 @@ bindkey -- '^[[B'                                               down-line-or-beg
 [[ -n "${key[Shift-Tab]}" ]] && bindkey -- "${key[Shift-Tab]}"  reverse-menu-complete
 [[ -n "${key[Delete]}" ]] && bindkey -- "${key[Delete]}"        delete-char
 
-#eval "$(starship init zsh)"
-type portmaster-start 2>&1 >/dev/null && eval "$(portmaster-start --data=/opt/safing/portmaster completion zsh)"
+precmd () {print -Pn "\e]0;terminal\a"}
-- 
cgit v1.2.3


From 5c08cffb9924377b063220adc5ba0712f19e2505 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Tue, 4 Jun 2024 23:31:17 -0500
Subject: Remove unnecessary zsh command

It doesn't need to set the terminal title to "terminal"?
---
 zsh/.zshrc | 1 -
 1 file changed, 1 deletion(-)

(limited to 'zsh/.zshrc')

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 3314bb3..00be912 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -97,4 +97,3 @@ bindkey -- '^[[B'                                               down-line-or-beg
 [[ -n "${key[Shift-Tab]}" ]] && bindkey -- "${key[Shift-Tab]}"  reverse-menu-complete
 [[ -n "${key[Delete]}" ]] && bindkey -- "${key[Delete]}"        delete-char
 
-precmd () {print -Pn "\e]0;terminal\a"}
-- 
cgit v1.2.3


From f627c6a471c89f3a13ef0dfee411dc6dbf18a0ee Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Thu, 31 Oct 2024 12:08:12 -0500
Subject: Add auto-cpufreq zsh completion

---
 zsh/.zshrc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'zsh/.zshrc')

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 00be912..a00f116 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -97,3 +97,4 @@ bindkey -- '^[[B'                                               down-line-or-beg
 [[ -n "${key[Shift-Tab]}" ]] && bindkey -- "${key[Shift-Tab]}"  reverse-menu-complete
 [[ -n "${key[Delete]}" ]] && bindkey -- "${key[Delete]}"        delete-char
 
+eval "$(_AUTO_CPUFREQ_COMPLETE=zsh_source auto-cpufreq)"
-- 
cgit v1.2.3


From 44fbfc95f779e5d6bbdaaf250ada4dfcdae5cb2a Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Sat, 18 Jan 2025 23:39:25 -0600
Subject: Cleanup zsh configs + add zplug

Just a couple plugins for syntax highlighting and history searching,
removing a bunch of old unused files, and changing to just accept the
standard of using dotfiles in the home directory.
---
 Makefile                  |  16 +++++---
 installers/set_zshdirs.sh |  13 ------
 sh/profile                |   2 +-
 zsh/.zlogout              |   1 -
 zsh/.zprofile             |   6 ---
 zsh/.zshenv               |   5 ---
 zsh/.zshrc                | 100 ----------------------------------------------
 zsh/zshenv                |   6 +++
 zsh/zshrc                 |  72 +++++++++++++++++++++++++++++++++
 9 files changed, 90 insertions(+), 131 deletions(-)
 delete mode 100755 installers/set_zshdirs.sh
 delete mode 100644 zsh/.zlogout
 delete mode 100644 zsh/.zprofile
 delete mode 100644 zsh/.zshenv
 delete mode 100644 zsh/.zshrc
 create mode 100644 zsh/zshenv
 create mode 100644 zsh/zshrc

(limited to 'zsh/.zshrc')

diff --git a/Makefile b/Makefile
index e27af0a..898fe9e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,26 @@
 VIM := $(shell command -v vim 2>/dev/null)
 NVIM := $(shell command -v nvim 2>/dev/null)
-ZCONFS := zsh/.zshenv
+ZCONFS := zsh/zshenv zsh/zshrc
+SCONFS := sh/profile
 DCONFS := doas.conf
 
 all:
 
-install: install-zshconfigs vimplug-vim vimplug-nvim
+install: install-zshconfigs install-shconfigs vimplug-vim vimplug-nvim
 
 install-zshconfigs: $(ZCONFS)
 	@echo "Installing zsh conf files..."
-	@echo "Setting ZSHDOTDIR globally..."
-	@$(shell sudo installers/set_zshdirs.sh)
 	@echo ".zshenv..."
-	@ln -sf `pwd`/zsh/.zshenv ~/.zshenv
+	@ln -sf `pwd`/zsh/zshenv ~/.zshenv
+	@echo ".zshrc..."
+	@ln -sf `pwd`/zsh/zshrc ~/.zshrc
 	@echo "Done."
 
+install-shconfigs: $(SCONFS)
+	@echo "Installing sh conf files..."
+	@echo ".profile..."
+	@ln -sf `pwd`/sh/profile ~/.profile
+
 vimplug-vim: installers/vimplug_vim.sh
 ifdef VIM
 	@echo "Installing vim-plug for vim..."
diff --git a/installers/set_zshdirs.sh b/installers/set_zshdirs.sh
deleted file mode 100755
index 2d82f19..0000000
--- a/installers/set_zshdirs.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-if [ -f /etc/zshenv ]; then
-  ZSHENV="/etc/zshenv"
-elif [ -d /etc/zsh ]; then
-    ZSHENV="/etc/zsh/zshenv"
-else
-  ZSHENV="/etc/zshenv"
-fi
-
-if ! grep -q "ZDOTDIR" $ZSHENV 2>/dev/null; then
-  echo "export ZDOTDIR=\"\$HOME\"/.config/zsh" >> $ZSHENV
-fi
diff --git a/sh/profile b/sh/profile
index de79a65..b83d012 100644
--- a/sh/profile
+++ b/sh/profile
@@ -36,7 +36,7 @@ export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages
 export RXVT_SOCKET="$XDG_RUNTIME_DIR"/urxvtd
 export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
 export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
-export ZDOTDIR=$HOME/.config/zsh
+#export ZDOTDIR=$HOME/.config/zsh
 export CARGO_HOME="$XDG_DATA_HOME"/cargo
 export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
 export WEECHAT_HOME="$XDG_CONFIG_HOME"/weechat
diff --git a/zsh/.zlogout b/zsh/.zlogout
deleted file mode 100644
index 33666be..0000000
--- a/zsh/.zlogout
+++ /dev/null
@@ -1 +0,0 @@
-rm -rf /tmp/xorg-awake
diff --git a/zsh/.zprofile b/zsh/.zprofile
deleted file mode 100644
index 1eae5e7..0000000
--- a/zsh/.zprofile
+++ /dev/null
@@ -1,6 +0,0 @@
-#export GDK_DPI_SCALE=0.7
-
-#gnome_schema=org.gnome.desktop.interface
-#
-#gsettings set $gnome_schema gtk-theme 'Plata-Noir-Compact'
-#gsettings set $gnome_schema icon-theme 'Papirus-Dark'
diff --git a/zsh/.zshenv b/zsh/.zshenv
deleted file mode 100644
index f02f83a..0000000
--- a/zsh/.zshenv
+++ /dev/null
@@ -1,5 +0,0 @@
-# ZSH SPECIFIC CONFIGS
-unset HISTFILE
-export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
-[ -f /etc/profile ] && . /etc/profile
-[ -f "$XDG_CONFIG_HOME/sh/profile" ] && . "$XDG_CONFIG_HOME/sh/profile"
diff --git a/zsh/.zshrc b/zsh/.zshrc
deleted file mode 100644
index a00f116..0000000
--- a/zsh/.zshrc
+++ /dev/null
@@ -1,100 +0,0 @@
-HISTFILE="$ZDOTDIR"/hist
-SAVEHIST=1000
-HISTSIZE=1000
-setopt APPEND_HISTORY
-setopt HIST_FIND_NO_DUPS
-setopt HIST_EXPIRE_DUPS_FIRST
-setopt HIST_VERIFY
-setopt HIST_IGNORE_DUPS
-setopt INC_APPEND_HISTORY
-setopt HIST_REDUCE_BLANKS
-
-_SH="zsh"
-
-if [ -f "$XDG_CONFIG_HOME"/sh/aliases ]; then
-	source "$XDG_CONFIG_HOME"/sh/aliases
-fi
-if [ -f "$XDG_CONFIG_HOME"/sh/functions ]; then
-	source "$XDG_CONFIG_HOME"/sh/functions
-fi
-
-if [ -n "$ZDOTDIR"/.zshrc -a -f "$ZDOTDIR"/.zshrc ]; then
-  alias e='source "$ZDOTDIR"/.zshrc'
-elif [ -f "$HOME"/.zshrc ]; then
-  alias e='source ~/.zshrc'
-fi
-
-bindkey "^?" backward-delete-char
-
-# bindkey -v
-
-if [ "$TERM" = "st-256color" ] || [ "$TERM" = "xterm-256color" ]; then
-  function zle-line-init () { echoti smkx }
-  function zle-line-finish () { echoti rmkx }
-
-  zle -N zle-line-init
-  zle -N zle-line-finish
-fi
-
-unset COLOR1
-ZSHTHEMERC="${ZDOTDIR:-$HOME}/.zsh_theme"
-[ -f "$ZSHTHEMERC" ] && . "$ZSHTHEMERC"
-
-if [ -z "$COLOR1" ]; then
-  case "$(whoami)" in
-    zachir) COLOR1="014" ;;
-    git) COLOR1="013" ;;
-    subsonic) COLOR1="012" ;;
-    *) COLOR1="015" ;;
-  esac
-fi
-
-MYPROMPT='%B%S%F{'"$COLOR1"'}[%n@%m]:%f%s%F{015}%~%f%S%F{'"$COLOR1"'}%#%f%s%b '
-function zle-line-init zle-keymap-select {
-	VIM_PROMPT="%B%F{012}[%n@%m]:%f%F{015}%~%f%F{012}%#%f%b "
-	PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}"
-	#PS1="$PROMPT $KEYMAP"
-	zle reset-prompt
-}
-
-unset COLOR1
-
-zle -N zle-line-init
-zle -N zle-keymap-select
-export KEYTIMEOUT=1
-
-fpath+="$ZDOTDIR/zfunc"
-
-autoload -Uz compinit promptinit
-compinit -d $CONFIG/zcompdump
-promptinit
-autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
-zle -N up-line-or-beginning-search
-zle -N down-line-or-beginning-search
-
-zstyle ':completion:*' menu select
-zstyle ':completion::complete:*' gain-privileges 1
-zstyle ':completion:*' rehash true
-
-setopt COMPLETE_ALIASES
-setopt AUTO_CD
-
-typeset -g -A key
-
-key[Up]="${terminfo[kcuu1]}"
-key[Down]="${terminfo[kcud1]}"
-key[Left]="${terminfo[kcub1]}"
-key[Right]="${terminfo[kcuf1]}"
-key[Shift-Tab]="${terminfo[kcbt]}"
-key[Delete]="${terminfo[kdch1]}"
-
-[[ -n "${key[Up]}" ]] && bindkey -- "${key[Up]}"                up-line-or-beginning-search
-bindkey -- '^[[A'                                               up-line-or-beginning-search
-bindkey -- '^[[B'                                               down-line-or-beginning-search
-[[ -n "${key[Down]}" ]] && bindkey -- "${key[Down]}"            down-line-or-beginning-search
-[[ -n "${key[Left]}" ]] && bindkey -- "${key[Left]}"            backward-char
-[[ -n "${key[Right]}" ]] && bindkey -- "${key[Right]}"          forward-char
-[[ -n "${key[Shift-Tab]}" ]] && bindkey -- "${key[Shift-Tab]}"  reverse-menu-complete
-[[ -n "${key[Delete]}" ]] && bindkey -- "${key[Delete]}"        delete-char
-
-eval "$(_AUTO_CPUFREQ_COMPLETE=zsh_source auto-cpufreq)"
diff --git a/zsh/zshenv b/zsh/zshenv
new file mode 100644
index 0000000..df0371e
--- /dev/null
+++ b/zsh/zshenv
@@ -0,0 +1,6 @@
+# ZSH SPECIFIC CONFIGS
+unset HISTFILE
+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+export skip_global_compinit=1
+[ -f /etc/profile ] && . /etc/profile
+[ -f "$XDG_CONFIG_HOME/sh/profile" ] && . "$XDG_CONFIG_HOME/sh/profile"
diff --git a/zsh/zshrc b/zsh/zshrc
new file mode 100644
index 0000000..fb5b167
--- /dev/null
+++ b/zsh/zshrc
@@ -0,0 +1,72 @@
+#zmodload zsh/zprof
+if [ -d "$HOME/.zplug" ]; then
+  export ZPLUG_INSTALLED="y"
+  source "$HOME/.zplug/init.zsh"
+fi
+HISTFILE="$XDG_CONFIG_HOME/zsh/hist"
+SAVEHIST=1000
+HISTSIZE=1000
+setopt APPEND_HISTORY
+setopt HIST_FIND_NO_DUPS
+setopt HIST_EXPIRE_DUPS_FIRST
+setopt HIST_VERIFY
+setopt HIST_IGNORE_DUPS
+setopt INC_APPEND_HISTORY
+setopt HIST_REDUCE_BLANKS
+setopt COMPLETE_ALIASES
+setopt AUTO_CD
+
+_SH="zsh"
+
+if [ -f "$XDG_CONFIG_HOME"/sh/aliases ]; then
+  source "$XDG_CONFIG_HOME"/sh/aliases
+fi
+if [ -f "$XDG_CONFIG_HOME"/sh/functions ]; then
+  source "$XDG_CONFIG_HOME"/sh/functions
+fi
+
+if [ -f "$XDG_CONFIG_HOME/zsh/zshrc" ]; then
+  alias e='source "$XDG_CONFIG_HOME/zsh/zshrc"'
+elif [ -f "$XDG_CONFIG_HOME/zshrc" ]; then
+  alias e='source "$XDG_CONFIG_HOME/zshrc"'
+elif [ -f "$HOME"/.zshrc ]; then
+  alias e='source ~/.zshrc'
+fi
+
+bindkey -v
+
+MYPROMPT=$'%B%S%F{002}[%n@%m]%s\UE0B0%F{015}%~%S%F{002}\UE0B0%#%s\UE0B0%f%k%b '
+function zle-line-init zle-keymap-select {
+  VIM_PROMPT=$'%B%S%F{012}[%n@%m]%s\UE0B0%F{015}%~%S%F{012}\UE0B0%#%s\UE0B0%f%k%b '
+  PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}"
+  zle reset-prompt
+}
+
+zle -N zle-line-init
+zle -N zle-keymap-select
+export KEYTIMEOUT=1
+
+fpath+="$XDG_CONFIG_HOME/zsh/zfunc"
+
+if [ -n "$ZPLUG_INSTALLED" ]; then
+  # zsh history substring search
+  zplug "zsh-users/zsh-history-substring-search", as:plugin
+  
+  bindkey '^[[A' history-substring-search-up
+  bindkey '^[[B' history-substring-search-down
+  bindkey -M vicmd '^[[A' history-substring-search-up
+  bindkey -M vicmd '^[[B' history-substring-search-down
+  bindkey -M vicmd 'k' history-substring-search-up
+  bindkey -M vicmd 'j' history-substring-search-down
+  
+  # zsh syntax highlighting
+  zplug "zsh-users/zsh-syntax-highlighting", defer:2
+  
+  # load zsh plugins
+  zplug load
+fi
+
+autoload -Uz compinit
+compinit
+
+#zprof
-- 
cgit v1.2.3


From 1e976efb21acb4a4e1046dd97e89307bba5e6baf Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Sat, 19 Jul 2025 22:43:50 -0500
Subject: Add optimization to zsh loading

It requires using ZDOTDIR again
---
 sh/profile  |   2 +-
 zsh/.zshenv |   7 +++++
 zsh/.zshrc  | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 zsh/zshenv  |   7 -----
 zsh/zshrc   |  96 ---------------------------------------------------------
 5 files changed, 108 insertions(+), 104 deletions(-)
 create mode 100644 zsh/.zshenv
 create mode 100644 zsh/.zshrc
 delete mode 100644 zsh/zshenv
 delete mode 100644 zsh/zshrc

(limited to 'zsh/.zshrc')

diff --git a/sh/profile b/sh/profile
index 1582d5a..e4659a5 100644
--- a/sh/profile
+++ b/sh/profile
@@ -40,7 +40,7 @@ export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages
 export RXVT_SOCKET="$XDG_RUNTIME_DIR"/urxvtd
 export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
 export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
-#export ZDOTDIR=$HOME/.config/zsh
+export ZDOTDIR=$HOME/.config/zsh
 export CARGO_HOME="$XDG_DATA_HOME"/cargo
 export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
 export WEECHAT_HOME="$XDG_CONFIG_HOME"/weechat
diff --git a/zsh/.zshenv b/zsh/.zshenv
new file mode 100644
index 0000000..3719ef4
--- /dev/null
+++ b/zsh/.zshenv
@@ -0,0 +1,7 @@
+# ZSH SPECIFIC CONFIGS
+unset HISTFILE
+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+export skip_global_compinit=1
+fpath=($XDG_CONFIG_HOME/functions $fpath)
+[ -f /etc/profile ] && . /etc/profile
+[ -f "$XDG_CONFIG_HOME/sh/profile" ] && . "$XDG_CONFIG_HOME/sh/profile"
diff --git a/zsh/.zshrc b/zsh/.zshrc
new file mode 100644
index 0000000..791b5d1
--- /dev/null
+++ b/zsh/.zshrc
@@ -0,0 +1,100 @@
+#zmodload zsh/zprof
+if [ -n "$ZPLUG_HOME" ]; then
+  if [ -d "$ZPLUG_HOME" ]; then
+    export ZPLUG_INSTALLED="y"
+    source "$ZPLUG_HOME/init.zsh"
+  fi
+elif [ -d "$XDG_DATA_HOME/zplug" ]; then
+  export ZPLUG_INSTALLED="y"
+  source "$XDG_DATA_HOME/zplug/init.zsh"
+elif [ -d "$HOME/.zplug" ]; then
+  export ZPLUG_INSTALLED="y"
+  source "$HOME/.zplug/init.zsh"
+fi
+[ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
+HISTFILE="$XDG_CONFIG_HOME/zsh/hist"
+SAVEHIST=1000
+HISTSIZE=1000
+setopt APPEND_HISTORY
+setopt HIST_FIND_NO_DUPS
+setopt HIST_EXPIRE_DUPS_FIRST
+setopt HIST_VERIFY
+setopt HIST_IGNORE_DUPS
+setopt INC_APPEND_HISTORY
+setopt HIST_REDUCE_BLANKS
+setopt COMPLETE_ALIASES
+setopt AUTO_CD
+
+_SH="zsh"
+
+if [ -f "$XDG_CONFIG_HOME"/sh/aliases ]; then
+  source "$XDG_CONFIG_HOME"/sh/aliases
+fi
+if [ -f "$XDG_CONFIG_HOME"/sh/functions ]; then
+  source "$XDG_CONFIG_HOME"/sh/functions
+fi
+
+if [ -f "$XDG_CONFIG_HOME/zsh/zshrc" ]; then
+  alias e='source "$XDG_CONFIG_HOME/zsh/zshrc"'
+elif [ -f "$XDG_CONFIG_HOME/zshrc" ]; then
+  alias e='source "$XDG_CONFIG_HOME/zshrc"'
+elif [ -f "$HOME"/.zshrc ]; then
+  alias e='source ~/.zshrc'
+fi
+
+source ~/.config/zsh/.zkbd/$TERM-${${DISPLAY:t}:-$VENDOR-$OSTYPE}
+
+#autoload zkbd; zkbd
+bindkey -v
+bindkey "${key[Backspace]}" backward-delete-char
+bindkey "${key[Delete]}" delete-char
+bindkey "${key[Home]}" beginning-of-line
+bindkey "${key[End]}" end-of-line
+bindkey "${key[PageUp]}" history-substring-search-up
+bindkey "${key[PageDown]}" history-substring-search-down
+
+if (env | grep -Fq 'DISTROBOX'); then
+  MYPROMPT=$'%F{000}%K{004}[%n@%m]%F{013}\UE0B2%K{013}%F{000}%~%F{013}%K{004}\UE0B0%F{000}%#%F{004}%k\UE0B0%f '
+else
+  MYPROMPT=$'%F{000}%K{002}[%n@%m]%F{006}\UE0B2%K{006}%F{000}%~%F{006}%K{002}\UE0B0%F{000}%#%F{002}%k\UE0B0%f '
+fi
+function zle-line-init zle-keymap-select {
+  VIM_PROMPT=$'%F{000}%K{012}[%n@%m]%F{006}\UE0B2%K{006}%F{000}%~%F{006}%K{012}\UE0B0%F{000}%#%F{012}%k\UE0B0%f '
+  PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}"
+  zle reset-prompt
+}
+
+zle -N zle-line-init
+zle -N zle-keymap-select
+export KEYTIMEOUT=1
+
+#fpath+="$XDG_CONFIG_HOME/zsh/zfunc"
+
+if [ -n "$ZPLUG_INSTALLED" ]; then
+  # zsh history substring search
+  zplug "zsh-users/zsh-history-substring-search", as:plugin
+  
+  bindkey "${key[Up]}" history-substring-search-up
+  bindkey "${key[Down]}" history-substring-search-down
+  bindkey -M vicmd "${key[Up]}" history-substring-search-up
+  bindkey -M vicmd "${key[Down]}" history-substring-search-down
+  bindkey -M vicmd "k" history-substring-search-up
+  bindkey -M vicmd "j" history-substring-search-down
+  
+  # zsh syntax highlighting
+  zplug "zsh-users/zsh-syntax-highlighting", defer:2
+  
+  # load zsh plugins
+  zplug load
+fi
+
+autoload -Uz compinit 
+if [[ -n ${ZDOTDIR}/.zcompdump(#qN.mh+24) ]]; then
+  compinit
+else
+	compinit -C;
+fi;
+
+zstyle ':completion:*' hosts off
+
+#zprof
diff --git a/zsh/zshenv b/zsh/zshenv
deleted file mode 100644
index 3719ef4..0000000
--- a/zsh/zshenv
+++ /dev/null
@@ -1,7 +0,0 @@
-# ZSH SPECIFIC CONFIGS
-unset HISTFILE
-export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
-export skip_global_compinit=1
-fpath=($XDG_CONFIG_HOME/functions $fpath)
-[ -f /etc/profile ] && . /etc/profile
-[ -f "$XDG_CONFIG_HOME/sh/profile" ] && . "$XDG_CONFIG_HOME/sh/profile"
diff --git a/zsh/zshrc b/zsh/zshrc
deleted file mode 100644
index 09a5e32..0000000
--- a/zsh/zshrc
+++ /dev/null
@@ -1,96 +0,0 @@
-#zmodload zsh/zprof
-if [ -n "$ZPLUG_HOME" ]; then
-  if [ -d "$ZPLUG_HOME" ]; then
-    export ZPLUG_INSTALLED="y"
-    source "$ZPLUG_HOME/init.zsh"
-  fi
-elif [ -d "$XDG_DATA_HOME/zplug" ]; then
-  export ZPLUG_INSTALLED="y"
-  source "$XDG_DATA_HOME/zplug/init.zsh"
-elif [ -d "$HOME/.zplug" ]; then
-  export ZPLUG_INSTALLED="y"
-  source "$HOME/.zplug/init.zsh"
-fi
-[ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
-HISTFILE="$XDG_CONFIG_HOME/zsh/hist"
-SAVEHIST=1000
-HISTSIZE=1000
-setopt APPEND_HISTORY
-setopt HIST_FIND_NO_DUPS
-setopt HIST_EXPIRE_DUPS_FIRST
-setopt HIST_VERIFY
-setopt HIST_IGNORE_DUPS
-setopt INC_APPEND_HISTORY
-setopt HIST_REDUCE_BLANKS
-setopt COMPLETE_ALIASES
-setopt AUTO_CD
-
-_SH="zsh"
-
-if [ -f "$XDG_CONFIG_HOME"/sh/aliases ]; then
-  source "$XDG_CONFIG_HOME"/sh/aliases
-fi
-if [ -f "$XDG_CONFIG_HOME"/sh/functions ]; then
-  source "$XDG_CONFIG_HOME"/sh/functions
-fi
-
-if [ -f "$XDG_CONFIG_HOME/zsh/zshrc" ]; then
-  alias e='source "$XDG_CONFIG_HOME/zsh/zshrc"'
-elif [ -f "$XDG_CONFIG_HOME/zshrc" ]; then
-  alias e='source "$XDG_CONFIG_HOME/zshrc"'
-elif [ -f "$HOME"/.zshrc ]; then
-  alias e='source ~/.zshrc'
-fi
-
-source ~/.config/zsh/.zkbd/$TERM-${${DISPLAY:t}:-$VENDOR-$OSTYPE}
-
-#autoload zkbd; zkbd
-bindkey -v
-bindkey "${key[Backspace]}" backward-delete-char
-bindkey "${key[Delete]}" delete-char
-bindkey "${key[Home]}" beginning-of-line
-bindkey "${key[End]}" end-of-line
-bindkey "${key[PageUp]}" history-substring-search-up
-bindkey "${key[PageDown]}" history-substring-search-down
-
-if (env | grep -Fq 'DISTROBOX'); then
-  MYPROMPT=$'%F{000}%K{004}[%n@%m]%F{013}\UE0B2%K{013}%F{000}%~%F{013}%K{004}\UE0B0%F{000}%#%F{004}%k\UE0B0%f '
-else
-  MYPROMPT=$'%F{000}%K{002}[%n@%m]%F{006}\UE0B2%K{006}%F{000}%~%F{006}%K{002}\UE0B0%F{000}%#%F{002}%k\UE0B0%f '
-fi
-function zle-line-init zle-keymap-select {
-  VIM_PROMPT=$'%F{000}%K{012}[%n@%m]%F{006}\UE0B2%K{006}%F{000}%~%F{006}%K{012}\UE0B0%F{000}%#%F{012}%k\UE0B0%f '
-  PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}"
-  zle reset-prompt
-}
-
-zle -N zle-line-init
-zle -N zle-keymap-select
-export KEYTIMEOUT=1
-
-fpath+="$XDG_CONFIG_HOME/zsh/zfunc"
-
-if [ -n "$ZPLUG_INSTALLED" ]; then
-  # zsh history substring search
-  zplug "zsh-users/zsh-history-substring-search", as:plugin
-  
-  bindkey "${key[Up]}" history-substring-search-up
-  bindkey "${key[Down]}" history-substring-search-down
-  bindkey -M vicmd "${key[Up]}" history-substring-search-up
-  bindkey -M vicmd "${key[Down]}" history-substring-search-down
-  bindkey -M vicmd "k" history-substring-search-up
-  bindkey -M vicmd "j" history-substring-search-down
-  
-  # zsh syntax highlighting
-  zplug "zsh-users/zsh-syntax-highlighting", defer:2
-  
-  # load zsh plugins
-  zplug load
-fi
-
-autoload -Uz compinit
-compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
-
-zstyle ':completion:*' hosts off
-
-#zprof
-- 
cgit v1.2.3


From 1f4aad995aff13e53de23f469ae64f14ee66ce70 Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Mon, 21 Jul 2025 22:25:55 -0500
Subject: Replace zplug with zinit

---
 zsh/.zshrc | 86 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 54 insertions(+), 32 deletions(-)

(limited to 'zsh/.zshrc')

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 791b5d1..e08bb20 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,16 +1,4 @@
 #zmodload zsh/zprof
-if [ -n "$ZPLUG_HOME" ]; then
-  if [ -d "$ZPLUG_HOME" ]; then
-    export ZPLUG_INSTALLED="y"
-    source "$ZPLUG_HOME/init.zsh"
-  fi
-elif [ -d "$XDG_DATA_HOME/zplug" ]; then
-  export ZPLUG_INSTALLED="y"
-  source "$XDG_DATA_HOME/zplug/init.zsh"
-elif [ -d "$HOME/.zplug" ]; then
-  export ZPLUG_INSTALLED="y"
-  source "$HOME/.zplug/init.zsh"
-fi
 [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
 HISTFILE="$XDG_CONFIG_HOME/zsh/hist"
 SAVEHIST=1000
@@ -70,31 +58,65 @@ export KEYTIMEOUT=1
 
 #fpath+="$XDG_CONFIG_HOME/zsh/zfunc"
 
-if [ -n "$ZPLUG_INSTALLED" ]; then
-  # zsh history substring search
-  zplug "zsh-users/zsh-history-substring-search", as:plugin
-  
-  bindkey "${key[Up]}" history-substring-search-up
-  bindkey "${key[Down]}" history-substring-search-down
-  bindkey -M vicmd "${key[Up]}" history-substring-search-up
-  bindkey -M vicmd "${key[Down]}" history-substring-search-down
-  bindkey -M vicmd "k" history-substring-search-up
-  bindkey -M vicmd "j" history-substring-search-down
-  
-  # zsh syntax highlighting
-  zplug "zsh-users/zsh-syntax-highlighting", defer:2
-  
-  # load zsh plugins
-  zplug load
-fi
-
 autoload -Uz compinit 
 if [[ -n ${ZDOTDIR}/.zcompdump(#qN.mh+24) ]]; then
   compinit
 else
-	compinit -C;
-fi;
+	compinit -C
+fi
+
+zshcache_time="$(date +%s%N)"
+
+autoload -Uz add-zsh-hook
+
+rehash_precmd() {
+  if [[ -a /var/cache/zsh/pacman ]]; then
+    local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)"
+    if (( zshcache_time < paccache_time )); then
+      rehash
+      zshcache_time="$paccache_time"
+    fi
+  fi
+}
+
+add-zsh-hook -Uz precmd rehash_precmd
 
 zstyle ':completion:*' hosts off
 
+### Added by Zinit's installer
+if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then
+    print -P "%F{33} %F{220}Installing %F{33}ZDHARMA-CONTINUUM%F{220} Initiative Plugin Manager (%F{33}zdharma-continuum/zinit%F{220})…%f"
+    command mkdir -p "$HOME/.local/share/zinit" && command chmod g-rwX "$HOME/.local/share/zinit"
+    command git clone https://github.com/zdharma-continuum/zinit "$HOME/.local/share/zinit/zinit.git" && \
+        print -P "%F{33} %F{34}Installation successful.%f%b" || \
+        print -P "%F{160} The clone has failed.%f%b"
+fi
+
+source "$HOME/.local/share/zinit/zinit.git/zinit.zsh"
+autoload -Uz _zinit
+(( ${+_comps} )) && _comps[zinit]=_zinit
+
+# Load a few important annexes, without Turbo
+# (this is currently required for annexes)
+zinit light-mode for \
+    zdharma-continuum/zinit-annex-as-monitor \
+    zdharma-continuum/zinit-annex-bin-gem-node \
+    zdharma-continuum/zinit-annex-patch-dl \
+    zdharma-continuum/zinit-annex-rust
+
+### End of Zinit's installer chunk
+zinit snippet OMZ::plugins/git/git.plugin.zsh
+
+zinit load 'zsh-users/zsh-history-substring-search'
+zinit ice wait atload'_history_substring_search_config'
+
+bindkey "${key[Up]}" history-substring-search-up
+bindkey "${key[Down]}" history-substring-search-down
+bindkey -M vicmd "${key[Up]}" history-substring-search-up
+bindkey -M vicmd "${key[Down]}" history-substring-search-down
+bindkey -M vicmd "k" history-substring-search-up
+bindkey -M vicmd "j" history-substring-search-down
+
+source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+
 #zprof
-- 
cgit v1.2.3


From a2f528f57b7b768a77623d110343474ecd894905 Mon Sep 17 00:00:00 2001
From: zsmith <zsmith@newhopechurch.tv>
Date: Tue, 22 Jul 2025 11:51:04 -0500
Subject: Use zinit for syntax highlighting

---
 zsh/.zshrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'zsh/.zshrc')

diff --git a/zsh/.zshrc b/zsh/.zshrc
index e08bb20..a96f1c1 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -117,6 +117,6 @@ bindkey -M vicmd "${key[Down]}" history-substring-search-down
 bindkey -M vicmd "k" history-substring-search-up
 bindkey -M vicmd "j" history-substring-search-down
 
-source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-
+#source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+zinit light zsh-users/zsh-syntax-highlighting
 #zprof
-- 
cgit v1.2.3


From 11d957d896dbfd3502d1c1e00d8e573cbb235e2e Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Tue, 22 Jul 2025 23:01:46 -0500
Subject: Fix fpath in zshrc

---
 zsh/.zshrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'zsh/.zshrc')

diff --git a/zsh/.zshrc b/zsh/.zshrc
index a96f1c1..b70b3d4 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -56,7 +56,7 @@ zle -N zle-line-init
 zle -N zle-keymap-select
 export KEYTIMEOUT=1
 
-#fpath+="$XDG_CONFIG_HOME/zsh/zfunc"
+fpath+="$XDG_CONFIG_HOME/zsh/functions"
 
 autoload -Uz compinit 
 if [[ -n ${ZDOTDIR}/.zcompdump(#qN.mh+24) ]]; then
-- 
cgit v1.2.3


From 8888b075373c9126882a8b7c50a654fb663bd206 Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Tue, 22 Jul 2025 23:10:18 -0500
Subject: Autoload anonsh

---
 zsh/.zshrc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'zsh/.zshrc')

diff --git a/zsh/.zshrc b/zsh/.zshrc
index b70b3d4..4ca4d31 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -58,6 +58,8 @@ export KEYTIMEOUT=1
 
 fpath+="$XDG_CONFIG_HOME/zsh/functions"
 
+autoload -Uz anonsh
+
 autoload -Uz compinit 
 if [[ -n ${ZDOTDIR}/.zcompdump(#qN.mh+24) ]]; then
   compinit
-- 
cgit v1.2.3


From eb561e1c22629a3df4ac69e458c37330bd806fc5 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Fri, 25 Jul 2025 19:51:31 -0500
Subject: Update zinit calls

---
 zsh/.zshrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'zsh/.zshrc')

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 4ca4d31..d6e7718 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -120,5 +120,6 @@ bindkey -M vicmd "k" history-substring-search-up
 bindkey -M vicmd "j" history-substring-search-down
 
 #source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-zinit light zsh-users/zsh-syntax-highlighting
+zinit light 'zsh-users/zsh-syntax-highlighting'
+zinit ice wait atload'_history_substring_search_config'
 #zprof
-- 
cgit v1.2.3