From d30356ea06e75f7a3f260d5c2047ced345fd542e Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Fri, 18 Jul 2025 12:10:07 -0500
Subject: Use tofi again instead of rofi

---
 hypr/hyprland.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index c09dc9f..166c40b 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -307,8 +307,8 @@ submap = reset
 #}}}
 
 #{{{ Menu bindings
-bind = $mainMod, R, exec, sh -c "rofi -show drun"
-bind = $mainMod, D, exec, sh -c "rofi -show run"
+bind = $mainMod, R, exec, sh -c "tofi-drun --drun-launch=true -c $HOME/.config/tofi/themes/dmenu_vertical"
+bind = $mainMod, D, exec, sh -c "$(tofi-run -c $HOME/.config/tofi/themes/dmenu_vertical)"
 bind = $mainMod $secdMod, Q, exec, qbc
 bind = $mainMod $secdMod, W, exec, lwc
 bind = $mainMod $secdMod, E, exec, mbc
-- 
cgit v1.2.3


From 198d8117842bf354af83b5e99e9ef263860ee566 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Fri, 18 Jul 2025 12:10:22 -0500
Subject: Fix tofi colors

---
 tofi/themes/dmenu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tofi/themes/dmenu b/tofi/themes/dmenu
index 5aaef23..5f01aab 100644
--- a/tofi/themes/dmenu
+++ b/tofi/themes/dmenu
@@ -1,4 +1,4 @@
-include = "themes/colors"
+include = "colors"
 
 hidden-character = "*"
 anchor = top
-- 
cgit v1.2.3


From 69d1aa0bc866139683cd1df54a1e13169027f69a Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Fri, 18 Jul 2025 12:10:41 -0500
Subject: Fix tofi height

---
 tofi/themes/dmenu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tofi/themes/dmenu b/tofi/themes/dmenu
index 5f01aab..e2dc14d 100644
--- a/tofi/themes/dmenu
+++ b/tofi/themes/dmenu
@@ -3,7 +3,7 @@ include = "colors"
 hidden-character = "*"
 anchor = top
 width = 100%
-height = 24
+height = 36
 horizontal = true
 font-size = 18
 prompt-text = ""
-- 
cgit v1.2.3


From 6ec8acc98fe0512eb5341265f651878be92e8405 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Fri, 18 Jul 2025 23:24:19 -0500
Subject: Use lf not lfrun

---
 hypr/hyprland.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 166c40b..b6177dd 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -323,7 +323,7 @@ bind = $mainMod $secdMod, P, exec, passmenu
 
 #{{{ Misc bindings
 bind = $mainMod, Return, exec, st
-bind = $mainMod $secdMod, F, exec, st lfrun
+bind = $mainMod $secdMod, F, exec, st lf
 bind = $mainMod, W, exec, pkill -USR1 waybar
 bind = $mainMod, Q, exec, loginctl lock-session
 bind = $mainMod $secdMod CONTROL, Q, exec, systemctl suspend
-- 
cgit v1.2.3


From f4c7084c7a822bd5052c62e6fcb2a586b53c0787 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Fri, 18 Jul 2025 23:24:42 -0500
Subject: Use pipewire not pulseaudio for mpd

---
 mpd/mpd.conf | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/mpd/mpd.conf b/mpd/mpd.conf
index e26dbd1..755f1c8 100644
--- a/mpd/mpd.conf
+++ b/mpd/mpd.conf
@@ -275,11 +275,18 @@ input {
 #
 # An example of a pulseaudio output (streaming to a remote pulseaudio server)
 #
+#audio_output {
+# type		"pulse"
+# name		"My Pulse Output"
+##	server		"remote_server"		# optional
+##	sink		"remote_server_sink"	# optional
+#}
+#
+# Pipewire output
+#
 audio_output {
- type		"pulse"
- name		"My Pulse Output"
-#	server		"remote_server"		# optional
-#	sink		"remote_server_sink"	# optional
+  type "pipewire"
+  name "Pipewire Sound Server"
 }
 
 audio_output {
-- 
cgit v1.2.3


From 3d3d9d5bdffcad1f32b99246591b9a03c4efe2ef Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Fri, 18 Jul 2025 23:25:00 -0500
Subject: Set waybar layer to bottom

---
 waybar/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/waybar/config b/waybar/config
index 664a19d..77f7386 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,5 +1,5 @@
 {
-    "layer": "top",
+    "layer": "bottom",
     "position": "top",
     "height": 36,
     //"output": "%%DISPLAY%%",
-- 
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

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 ccabaaf2d562cf400d76ddad2e62dc35d1f06c0d Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Sat, 19 Jul 2025 22:45:20 -0500
Subject: Fix name of plugin in hyprland (it's hyprsplit!)

---
 hypr/hyprland.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index b6177dd..2b496f9 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -250,7 +250,7 @@ bind = $mainMod, N, exec, pypr toggle_special
 bind = $mainMod SHIFT, N, togglespecialworkspace, minimized
 #}}}
 
-#{{{ Workspace binds (using split-monitor-workspaces plugin!)
+#{{{ Workspace binds (using hyprsplit plugin!)
 # Switch workspaces with mainMod + [0-9]
 bind = $mainMod, 1, split:workspace, 1
 bind = $mainMod, 2, split:workspace, 2
-- 
cgit v1.2.3


From 89edbd416a3ca577cf836ed38e9dd52d8fd8cb7f Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Sat, 19 Jul 2025 22:45:44 -0500
Subject: Add hypr bindings for when not using hyprsplit

---
 hypr/hyprland.conf | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 2b496f9..48ac312 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -289,6 +289,42 @@ bind = $mainMod SHIFT, comma, movewindow, mon:-1
 bind = $mainMod SHIFT, period, movewindow, mon:+1
 #}}}
 
+#{{{ Workspace binds (not using hyprsplit plugin)
+## Switch workspaces with mainMod + [0-9]
+#bind = $mainMod, 1, workspace, 1
+#bind = $mainMod, 2, workspace, 2
+#bind = $mainMod, 3, workspace, 3
+#bind = $mainMod, 4, workspace, 4
+#bind = $mainMod, 5, workspace, 5
+#bind = $mainMod, 6, workspace, 6
+#bind = $mainMod, 7, workspace, 7
+#bind = $mainMod, 8, workspace, 8
+#bind = $mainMod, 9, workspace, 9
+## Move active window to a workspace with mainMod + SHIFT + [0-9]
+#bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1
+#bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2
+#bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3
+#bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4
+#bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5
+#bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6
+#bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7
+#bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8
+#bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9
+#bind = $mainMod CONTROL SHIFT, 1, movetoworkspace, 1
+#bind = $mainMod CONTROL SHIFT, 2, movetoworkspace, 2
+#bind = $mainMod CONTROL SHIFT, 3, movetoworkspace, 3
+#bind = $mainMod CONTROL SHIFT, 4, movetoworkspace, 4
+#bind = $mainMod CONTROL SHIFT, 5, movetoworkspace, 5
+#bind = $mainMod CONTROL SHIFT, 6, movetoworkspace, 6
+#bind = $mainMod CONTROL SHIFT, 7, movetoworkspace, 7
+#bind = $mainMod CONTROL SHIFT, 8, movetoworkspace, 8
+#bind = $mainMod CONTROL SHIFT, 9, movetoworkspace, 9
+#bind = $mainMod, comma, focusmonitor, -1
+#bind = $mainMod, period, focusmonitor, +1
+#bind = $mainMod SHIFT, comma, movewindow, mon:-1
+#bind = $mainMod SHIFT, period, movewindow, mon:+1
+#}}}
+
 #{{{ Mouse binds
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = $mainMod, mouse:272, movewindow
-- 
cgit v1.2.3


From 4b766c45c32489d47af59a9d9b43c92857e321e8 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Sat, 19 Jul 2025 22:45:58 -0500
Subject: Use style-colors in qt6ct

---
 qt6ct/qt6ct.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qt6ct/qt6ct.conf b/qt6ct/qt6ct.conf
index 5d9a12c..3dce998 100644
--- a/qt6ct/qt6ct.conf
+++ b/qt6ct/qt6ct.conf
@@ -1,6 +1,6 @@
 [Appearance]
-color_scheme_path=/usr/share/qt6ct/colors/airy.conf
-custom_palette=false
+color_scheme_path=/home/zachir/.config/qt6ct/style-colors.conf
+custom_palette=true
 icon_theme=Cosmic
 standard_dialogs=gtk2
 style=qt6gtk2
-- 
cgit v1.2.3