Merge branch 'master' of zachir.xyz:zachir/dotfiles

7 files changed, 16 insertions, 10 deletions

diff --git a/.gitignore b/.gitignore
index 4f34bf9..03e3093 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 zsh/hist
 zsh/zcompdump
 zsh/.zsh_theme
+zsh/.zcompdump
 zoomus.conf
 zirless/
 zec-qt-wallet-org/
@@ -12,6 +13,7 @@ xmonad/stack.yaml.lock
 xmonad/xmonad-x86_64-linux
 xmonad/xmonad.o
 xmonad/xmonad.hi
+whoozle.github.io/
 weechat/
 waybar/config-Hyprland-*
 waybar/config-river-*
@@ -176,6 +178,7 @@ amsynth/
 aIR Impulse RackEX.settings
 abook/
 VirtualBox/
+VeraCrypt/
 UNDERTALE*/
 The Crown EXEX.settings
 SUPERHOT/
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 6a663f5..f94f806 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -55,7 +55,7 @@ general {
 #{{{ Misc options
 misc {
     enable_swallow = true
-    swallow_regex = ^(St)$
+    swallow_regex = ^(foot)$
     vfr = false
 }
 #}}}
@@ -160,10 +160,11 @@ bind = $mainMod+SHIFT, J, layoutmsg, swapnext #MASTER
 bind = $mainMod+SHIFT, K, layoutmsg, swapprev #MASTER
 bind = $mainMod+SHIFT, H, layoutmsg, addmaster #MASTER
 bind = $mainMod+SHIFT, L, layoutmsg, removemaster #MASTER
-bindr = $mainMod, J, layoutmsg, cyclenext
-bindr = $mainMod, K, layoutmsg, cycleprev
-bindr = $mainMod, H, splitratio, -0.01 #MASTER
-bindr = $mainMod, L, splitratio, +0.01 #MASTER
+binde = $mainMod, J, layoutmsg, cyclenext #MASTER
+binde = $mainMod, K, layoutmsg, cycleprev #MASTER
+binde = $mainMod, H, splitratio, -0.01 #MASTER
+binde = $mainMod, L, splitratio, +0.01 #MASTER
+bind = $mainMod+SHIFT, O, splitratio, exact 0.5 #MASTER
 bind = $mainMod, O, splitratio, exact 0.69 #MASTER
 #}}}
 
@@ -264,7 +265,7 @@ submap = reset
 
 #{{{ Menu bindings
 bind = $mainMod, R, exec, exec j4-dmenu-desktop --dmenu="bemenu -i -l 10 -p \"Run:\""
-bind = $mainMod, D, exec, exec bemenu-run -l 15 -p "Run:"
+bind = $mainMod, D, exec, exec bemenu-run -i -l 15 -p "Run:"
 bind = $mainMod $secdMod, Q, exec, qbc
 bind = $mainMod $secdMod, W, exec, lwc
 bind = $mainMod $secdMod, E, exec, mbc
diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf
index 1b8480c..65bc2e3 100644
--- a/hypr/hyprpaper.conf
+++ b/hypr/hyprpaper.conf
@@ -6,6 +6,7 @@ preload = ~/background.jpg
 #set the default wallpaper(s) seen on inital workspace(s) --depending on the number of monitors used
 wallpaper = eDP-1,~/background.jpg
 wallpaper = HDMI-A-1,~/background.jpg
+wallpaper = HDMI-A-2,~/background.jpg
 wallpaper = DP-1,~/background.jpg
 #if more than one monitor in use, can load a 2nd image
 #wallpaper = monitor2,~/background.jpg
diff --git a/swayidle/config b/swayidle/config
index fb741b3..210ff01 100644
--- a/swayidle/config
+++ b/swayidle/config
@@ -1,3 +1,3 @@
-timeout 600 waylockd
-before-sleep waylockd
+timeout 600 swaylockd
+before-sleep swaylockd
 lock waylockd
diff --git a/swaylock/config b/swaylock/config
new file mode 100644
index 0000000..55ca360
--- /dev/null
+++ b/swaylock/config
@@ -0,0 +1,2 @@
+ignore-empty-password
+color=000000
diff --git a/waylock/config b/waylock/config
deleted file mode 100644
index d25aa13..0000000
--- a/waylock/config
+++ /dev/null
@@ -1 +0,0 @@
--init-color 0x000000 -input-color 0x39C1ED -fail-color 0xCC342B
diff --git a/zsh/.zshrc b/zsh/.zshrc
index d397cf3..d11c091 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -96,4 +96,4 @@ bindkey -- '^[[B'                                               down-line-or-beg
 [[ -n "${key[Delete]}" ]] && bindkey -- "${key[Delete]}"        delete-char
 
 #eval "$(starship init zsh)"
-eval "$(portmaster-start --data=/opt/safing/portmaster completion zsh)"
+type portmaster-start 2>&1 >/dev/null && eval "$(portmaster-start --data=/opt/safing/portmaster completion zsh)"