Merge remote-tracking branch 'origin/master' into mac

9 files changed, 70 insertions, 23 deletions

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index c09dc9f..48ac312 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
@@ -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
@@ -307,8 +343,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
@@ -323,7 +359,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
diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf
index 57f9fdd..2ec72d3 100644
--- a/hypr/hyprlock.conf
+++ b/hypr/hyprlock.conf
@@ -1,10 +1,10 @@
 general {
-  disable_loading_bar = true
   hide_cursor = true
-  grace = 0
-  no_fade_in = true
-  no_fade_out = true
-  ignore_empty_input = true
+  immediate_render = true
+}
+
+animations {
+  enabled = false
 }
 
 background {
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 {
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
diff --git a/sh/profile b/sh/profile
index 45911b5..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
@@ -77,7 +77,7 @@ export XKB_DEFAULT_OPTIONS=caps:escape
 export EDITOR="nvim"
 export READER="zathura"
 export VISUAL="nvim"
-export TERMINAL="alacritty"
+export TERMINAL="st"
 export BROWSER="browser"
 export VIDEO="mpv"
 export IMAGE="sxiv"
diff --git a/tofi/themes/dmenu b/tofi/themes/dmenu
index 5aaef23..e2dc14d 100644
--- a/tofi/themes/dmenu
+++ b/tofi/themes/dmenu
@@ -1,9 +1,9 @@
-include = "themes/colors"
+include = "colors"
 
 hidden-character = "*"
 anchor = top
 width = 100%
-height = 24
+height = 36
 horizontal = true
 font-size = 18
 prompt-text = ""
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%%",
diff --git a/zsh/zshenv b/zsh/.zshenv
index 3719ef4..3719ef4 100644
--- a/zsh/zshenv
+++ b/zsh/.zshenv
diff --git a/zsh/zshrc b/zsh/.zshrc
index fdd757f..45123bb 100644
--- a/zsh/zshrc
+++ b/zsh/.zshrc
@@ -68,7 +68,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/zfunc"
 
 autoload -Uz compinit
 
@@ -92,8 +92,12 @@ if [ -n "$ZPLUG_INSTALLED" ]; then
   zplug load
 fi
 
-autoload -Uz compinit
-compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
+autoload -Uz compinit 
+if [[ -n ${ZDOTDIR}/.zcompdump(#qN.mh+24) ]]; then
+  compinit
+else
+	compinit -C;
+fi;
 
 zstyle ':completion:*' hosts off