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')

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')

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 95d509eeaba97aa0a35bb8c42225495e69d3a2c1 Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Tue, 21 Jan 2025 19:11:45 -0600
Subject: Use zkbd for zsh keybindings

---
 zsh/zshrc | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'zsh')

diff --git a/zsh/zshrc b/zsh/zshrc
index fb5b167..c95feb3 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -33,7 +33,16 @@ elif [ -f "$HOME"/.zshrc ]; then
   alias e='source ~/.zshrc'
 fi
 
+source ~/.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
 
 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 {
@@ -52,10 +61,10 @@ 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 '${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
   
-- 
cgit v1.2.3


From a9be74adf57403f7840d09f7a0081b6390864d5a Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Tue, 21 Jan 2025 19:12:56 -0600
Subject: Change zsh prompt to have <~> for powerline

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

(limited to 'zsh')

diff --git a/zsh/zshrc b/zsh/zshrc
index c95feb3..0d6ecd5 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -44,9 +44,9 @@ bindkey "${key[End]}" end-of-line
 bindkey "${key[PageUp]}" history-substring-search-up
 bindkey "${key[PageDown]}" history-substring-search-down
 
-MYPROMPT=$'%B%S%F{002}[%n@%m]%s\UE0B0%F{015}%~%S%F{002}\UE0B0%#%s\UE0B0%f%k%b '
+MYPROMPT=$'%B%S%F{002}[%n@%m]\UE0B2%F{015}%s%~%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 '
+  VIM_PROMPT=$'%B%S%F{012}[%n@%m]\UE0B2%F{015}%s%~%S%F{012}\UE0B0%#%s\UE0B0%f%k%b '
   PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}"
   zle reset-prompt
 }
-- 
cgit v1.2.3


From dd88548e55fc05f2b9dff855143e87141690b42a Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Thu, 23 Jan 2025 14:17:04 -0600
Subject: Fix zsh search bindkeys

They used single quotes, but needed to be double quotes.
---
 zsh/zshrc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'zsh')

diff --git a/zsh/zshrc b/zsh/zshrc
index 0d6ecd5..4c633ee 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -61,12 +61,12 @@ 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
+  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
-- 
cgit v1.2.3


From e3cde1579bbc9e07c0afc71084c9b5e83adf4ed7 Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Thu, 23 Jan 2025 14:19:01 -0600
Subject: Un-bold the zsh prompt (fixes issue in some terms)

Namely cool-retro-term doesn't like bolded powerline symbols.
---
 zsh/zshrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'zsh')

diff --git a/zsh/zshrc b/zsh/zshrc
index 4c633ee..9acd42f 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -44,9 +44,9 @@ bindkey "${key[End]}" end-of-line
 bindkey "${key[PageUp]}" history-substring-search-up
 bindkey "${key[PageDown]}" history-substring-search-down
 
-MYPROMPT=$'%B%S%F{002}[%n@%m]\UE0B2%F{015}%s%~%S%F{002}\UE0B0%#%s\UE0B0%f%k%b '
+MYPROMPT=$'%S%F{002}[%n@%m]\UE0B2%F{015}%s%~%S%F{002}\UE0B0%#%s\UE0B0%f '
 function zle-line-init zle-keymap-select {
-  VIM_PROMPT=$'%B%S%F{012}[%n@%m]\UE0B2%F{015}%s%~%S%F{012}\UE0B0%#%s\UE0B0%f%k%b '
+  VIM_PROMPT=$'%S%F{012}[%n@%m]\UE0B2%F{015}%s%~%S%F{012}\UE0B0%#%s\UE0B0%f '
   PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}"
   zle reset-prompt
 }
-- 
cgit v1.2.3


From 9ca0fcebf70babcaa9caf87ce313540ba3567546 Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Fri, 25 Apr 2025 19:16:37 -0500
Subject: Update theming with EC0101 red

---
 gtk-2.0/gtkrc              |  6 +++---
 gtk-3.0/settings.ini       | 14 ++++++++++----
 waybar/style.css           | 24 ++++++++++++------------
 xsettingsd/xsettingsd.conf |  2 +-
 zsh/zshrc                  |  8 ++++++--
 5 files changed, 32 insertions(+), 22 deletions(-)

(limited to 'zsh')

diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
index 3c97dc3..d0152f7 100644
--- a/gtk-2.0/gtkrc
+++ b/gtk-2.0/gtkrc
@@ -1,12 +1,12 @@
 # DO NOT EDIT! This file will be overwritten by nwg-look.
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
-gtk-theme-name="Flat-Remix-GTK-Green-Darkest"
+gtk-theme-name="Flat-Remix-GTK-Red-Darkest"
 gtk-icon-theme-name="Cosmic"
-gtk-font-name="Cantarell 11"
+gtk-font-name="Noto Sans,  10"
 gtk-cursor-theme-name="BreezeX-Black"
 gtk-cursor-theme-size=32
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
+gtk-toolbar-style=3
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
 gtk-button-images=0
 gtk-menu-images=0
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index 85d3ba5..c597fa3 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,10 +1,10 @@
 [Settings]
-gtk-theme-name=Flat-Remix-GTK-Green-Darkest
+gtk-theme-name=Flat-Remix-GTK-Red-Darkest
 gtk-icon-theme-name=Cosmic
-gtk-font-name=Cantarell 11
+gtk-font-name=Noto Sans,  10
 gtk-cursor-theme-name=BreezeX-Black
 gtk-cursor-theme-size=32
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
+gtk-toolbar-style=3
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
 gtk-button-images=0
 gtk-menu-images=0
@@ -14,4 +14,10 @@ gtk-xft-antialias=1
 gtk-xft-hinting=1
 gtk-xft-hintstyle=hintslight
 gtk-xft-rgba=rgb
-gtk-application-prefer-dark-theme=0
+gtk-application-prefer-dark-theme=1
+gtk-decoration-layout=icon:minimize,maximize,close
+gtk-enable-animations=true
+gtk-modules=colorreload-gtk-module
+gtk-primary-button-warps-slider=true
+gtk-sound-theme-name=ocean
+gtk-xft-dpi=98304
diff --git a/waybar/style.css b/waybar/style.css
index 88b8900..8fc3d0a 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -53,7 +53,7 @@ window#waybar.hidden {
 */
 
 #workspaces button.active {
-    background: #198844;
+    background: #EC0101;
 }
 
 /*
@@ -157,7 +157,7 @@ label:focus {
 }
 
 #memory {
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
@@ -167,12 +167,12 @@ label:focus {
 }
 
 #backlight {
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
 #network {
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
@@ -181,14 +181,14 @@ label:focus {
     color: #ffffff;
 }
 
-#pulseaudio {
-    background-color: #198844;
+#wireplumber {
+    background-color: #EC0101;
     color: #ffffff;
 }
 
-#pulseaudio.muted {
+#wireplumber.muted {
     background-color: #1b1d1c;
-    color: #198844;
+    color: #EC0101;
 }
 
 #custom-media {
@@ -278,19 +278,19 @@ label:focus {
 }
 
 #tray {
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
 #tray > .passive {
     -gtk-icon-effect: dim;
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
 #tray > .needs-attention {
     -gtk-icon-effect: highlight;
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
@@ -301,7 +301,7 @@ label:focus {
 }
 
 #idle_inhibitor.activated {
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
     border-radius: 20px 0px 0px 20px;
 
diff --git a/xsettingsd/xsettingsd.conf b/xsettingsd/xsettingsd.conf
index e762fa9..622b06f 100644
--- a/xsettingsd/xsettingsd.conf
+++ b/xsettingsd/xsettingsd.conf
@@ -1,4 +1,4 @@
-Net/ThemeName "Flat-Remix-GTK-Green-Darkest"
+Net/ThemeName "Flat-Remix-GTK-Red-Darkest"
 Net/IconThemeName "Cosmic"
 Gtk/CursorThemeName "BreezeX-Black"
 Net/EnableEventSounds 1
diff --git a/zsh/zshrc b/zsh/zshrc
index 9acd42f..557bf93 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -44,9 +44,13 @@ bindkey "${key[End]}" end-of-line
 bindkey "${key[PageUp]}" history-substring-search-up
 bindkey "${key[PageDown]}" history-substring-search-down
 
-MYPROMPT=$'%S%F{002}[%n@%m]\UE0B2%F{015}%s%~%S%F{002}\UE0B0%#%s\UE0B0%f '
+if (env | grep -Fq 'DISTROBOX'); then
+  MYPROMPT=$'%F{000}%K{004}[%n@%m]%F{015}\UE0B2%K{015}%F{000}%~%F{015}%K{004}\UE0B0%F{000}%#%F{004}%k\UE0B0%f '
+else
+  MYPROMPT=$'%F{015}%K{009}[%n@%m]%F{015}\UE0B2%K{015}%F{000}%~%F{015}%K{009}\UE0B0%F{015}%#%F{009}%k\UE0B0%f '
+fi
 function zle-line-init zle-keymap-select {
-  VIM_PROMPT=$'%S%F{012}[%n@%m]\UE0B2%F{015}%s%~%S%F{012}\UE0B0%#%s\UE0B0%f '
+  VIM_PROMPT=$'%F{000}%K{012}[%n@%m]%F{015}\UE0B2%K{015}%F{000}%~%F{015}%K{012}\UE0B0%F{000}%#%F{012}%k\UE0B0%f '
   PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}"
   zle reset-prompt
 }
-- 
cgit v1.2.3


From 760d34062229dad9b8276c454262536ce0ca9e7b Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Thu, 1 May 2025 15:06:03 -0500
Subject: Change Zsh prompt

---
 zsh/zshrc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'zsh')

diff --git a/zsh/zshrc b/zsh/zshrc
index 557bf93..dffdc65 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -45,12 +45,12 @@ 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{015}\UE0B2%K{015}%F{000}%~%F{015}%K{004}\UE0B0%F{000}%#%F{004}%k\UE0B0%f '
+  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{015}%K{009}[%n@%m]%F{015}\UE0B2%K{015}%F{000}%~%F{015}%K{009}\UE0B0%F{015}%#%F{009}%k\UE0B0%f '
+  MYPROMPT=$'%F{000}%K{009}[%n@%m]%F{013}\UE0B2%K{013}%F{000}%~%F{013}%K{009}\UE0B0%F{000}%#%F{009}%k\UE0B0%f '
 fi
 function zle-line-init zle-keymap-select {
-  VIM_PROMPT=$'%F{000}%K{012}[%n@%m]%F{015}\UE0B2%K{015}%F{000}%~%F{015}%K{012}\UE0B0%F{000}%#%F{012}%k\UE0B0%f '
+  VIM_PROMPT=$'%F{000}%K{012}[%n@%m]%F{013}\UE0B2%K{013}%F{000}%~%F{013}%K{012}\UE0B0%F{000}%#%F{012}%k\UE0B0%f '
   PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}"
   zle reset-prompt
 }
-- 
cgit v1.2.3


From 9f80bcde3c3ff4e35be9aaeda800ed4bed2f174c Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Sun, 29 Jun 2025 13:45:44 -0500
Subject: Add zsh functions path

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

(limited to 'zsh')

diff --git a/zsh/zshenv b/zsh/zshenv
index df0371e..3719ef4 100644
--- a/zsh/zshenv
+++ b/zsh/zshenv
@@ -2,5 +2,6 @@
 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"
-- 
cgit v1.2.3


From 031c015e5a8bf3ec5f9e5b29197b551cf188a6cd Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Sun, 29 Jun 2025 21:11:05 -0500
Subject: Fix zsh colorscheme

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

(limited to 'zsh')

diff --git a/zsh/zshrc b/zsh/zshrc
index dffdc65..f748913 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -47,10 +47,10 @@ 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{009}[%n@%m]%F{013}\UE0B2%K{013}%F{000}%~%F{013}%K{009}\UE0B0%F{000}%#%F{009}%k\UE0B0%f '
+  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{013}\UE0B2%K{013}%F{000}%~%F{013}%K{012}\UE0B0%F{000}%#%F{012}%k\UE0B0%f '
+  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
 }
-- 
cgit v1.2.3


From 5412cb6d6b3a958429a9bf781a95ee81fd29d0b4 Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Sun, 29 Jun 2025 23:19:57 -0500
Subject: Make more things XDG compliant

Specifically .dotnet, .zplug, and .zcompdump
---
 sh/profile | 2 ++
 zsh/zshrc  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'zsh')

diff --git a/sh/profile b/sh/profile
index a97e9e8..4337cc0 100644
--- a/sh/profile
+++ b/sh/profile
@@ -22,6 +22,8 @@ export ADB_VENDOR_KEY="$XDG_CONFIG_HOME"/android
 export LESSHISTFILE=-
 
 # Fixing Paths
+export ZPLUG_HOME="$XDG_DATA_HOME/zplug"
+export DOTNET_CLI_HOME="$XDG_DATA_HOME"/dotnet
 export MBSYNCRC="$XDG_CONFIG_HOME"/isync/mbsyncrc
 export ATOM_HOME="$XDG_DATA_HOME"/atom
 export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
diff --git a/zsh/zshrc b/zsh/zshrc
index f748913..532fb15 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -80,6 +80,6 @@ if [ -n "$ZPLUG_INSTALLED" ]; then
 fi
 
 autoload -Uz compinit
-compinit
+compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
 
 #zprof
-- 
cgit v1.2.3


From faa34b8084be0814a05512e009d9ffa1ea349670 Mon Sep 17 00:00:00 2001
From: ZachIR <zachir@librem.one>
Date: Mon, 30 Jun 2025 00:25:49 -0500
Subject: Fix zplug install in XDG dir

---
 zsh/zshrc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'zsh')

diff --git a/zsh/zshrc b/zsh/zshrc
index 532fb15..0e87993 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,5 +1,13 @@
 #zmodload zsh/zprof
-if [ -d "$HOME/.zplug" ]; then
+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
-- 
cgit v1.2.3


From 9d5498e0a8be1b987c5584659a0e97116ca50079 Mon Sep 17 00:00:00 2001
From: Zach Smith <zsmith@newhopechurch.tv>
Date: Mon, 30 Jun 2025 09:38:19 -0500
Subject: Define XDG_CONFIG_HOME in zshrc if it is not already

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

(limited to 'zsh')

diff --git a/zsh/zshrc b/zsh/zshrc
index 0e87993..f8fdac5 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -11,6 +11,7 @@ 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
-- 
cgit v1.2.3