summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzachir <zachir@librem.one>2025-07-21 16:05:54 -0500
committerzachir <zachir@librem.one>2025-07-21 16:05:54 -0500
commit93390102e1c4a5027dbf45584fc26cd4f307094b (patch)
tree58e3300305445770ea3a5c50e1fe7dad5a874899
parent3e9a0b3eb3926de7a04be493300fa105229a2b2e (diff)
parent4b766c45c32489d47af59a9d9b43c92857e321e8 (diff)
Merge remote-tracking branch 'origin/master' into cas
-rw-r--r--hypr/hyprland.conf38
-rw-r--r--qt6ct/qt6ct.conf4
-rw-r--r--sh/profile2
-rw-r--r--zsh/.zshenv (renamed from zsh/zshenv)0
-rw-r--r--zsh/.zshrc (renamed from zsh/zshrc)10
5 files changed, 47 insertions, 7 deletions
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 4c46144..3122513 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -279,7 +279,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
@@ -318,6 +318,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
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 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
index 3719ef4..3719ef4 100644
--- a/zsh/zshenv
+++ b/zsh/.zshenv
diff --git a/zsh/zshrc b/zsh/.zshrc
index 09a5e32..791b5d1 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"
if [ -n "$ZPLUG_INSTALLED" ]; then
# zsh history substring search
@@ -88,8 +88,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