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

10 files changed, 230 insertions, 71 deletions

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 13f405d..1c60913 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -30,6 +30,7 @@ input {
     numlock_by_default = true
     scroll_method = "2fg"
     follow_mouse = 1
+    mouse_refocus = false
     touchpad {
         natural_scroll = no
     }
@@ -56,9 +57,11 @@ general {
 #{{{ Misc options
 misc {
     disable_hyprland_logo = true
+    disable_splash_rendering = true
     enable_swallow = true
     swallow_regex = ^(kitty)$
     vfr = false
+    vrr = true
 }
 #}}}
 
@@ -113,7 +116,7 @@ master {
     # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
     new_is_master = false
     new_on_top = true
-    no_gaps_when_only = true
+    no_gaps_when_only = false
     orientation = left
     inherit_fullscreen = true
 }
@@ -126,20 +129,12 @@ gestures {
 }
 #}}}
 
-#{{{ Device options
-# Example per-device config
-# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
-device:epic mouse V1 {
-    sensitivity = -0.5
-}
-#}}}
-
 #{{{ plugin options
-plugin {
-  split-monitor-workspaces {
-    count = 9
-  }
-}
+#plugin {
+#  split-monitor-workspaces {
+#    count = 9
+#  }
+#}
 #}}}
 
 #{{{ Windowrules
@@ -156,6 +151,29 @@ windowrulev2 = float, class:^(yabridge-host.exe.so)$, title:^(menu)$
 windowrulev2 = float,floating:0,title:^(menu*)
 windowrulev2 = forceinput,title:^(menu*)
 windowrulev2 = windowdance,title:^(menu*)
+windowrule = float, class:^(xdg-desktop-portal-gtk)
+windowrule = float, class:^(Tk)$
+windowrule = workspace 2, title:^(REAPER .*initializing.*)$
+windowrulev2 = stayfocused, title:^()$,class:^(steam)$
+windowrulev2 = minsize 1 1, title:^()$,class:^(steam)$
+windowrulev2 = stayfocused, title:^(menu)$,class:^(yabridge-host.exe.so)$
+windowrulev2 = minsize 1 1, title:^(menu)$,class:^(yabridge-host.exe.so)$
+windowrulev2 = tile, class:^(REAPER)$, title:^(.*REAPER v[0-9.]* - Licensed for personal/small business use)$
+windowrulev2 = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(menu)$
+#windowrulev2 = nofocus, class:^(yabridge-host.exe.so)$, title:^(\s*)$
+#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Snap/Grid Settings)$
+#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Routing for track [0-9]*)$
+#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Metronome and pre-roll settings)$
+windowrulev2 = tile, class:^(WebApp-Qobuz[0-9]*)$
+#windowrulev2 = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(menu)$
+#windowrulev2 = nofocus, class:^(yabridge-host.exe.so)$, title:^(\s*)$
+#windowrulev2 = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(\s*)$
+#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Snap/Grid Settings)$
+#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Routing for track [0-9]*)$
+#windowrulev2 = float,floating:0, title:^(menu)$
+#windowrulev2 = forceinput, title:^(menu)$
+#windowrulev2 = windowdance, title:^(menu)$
+#windowrulev2 = nofocus, title:^(menu)$, class:^(yabridge\-host\.exe\.so)$
 #}}}
 
 #{{{ Mods
@@ -185,20 +203,20 @@ bind = $mainMod, O, splitratio, exact 0.69 #MASTER
 #}}}
 
 #{{{ Dwindle layout binds
-## Dwindle layout binds
+# Dwindle layout binds
 #bind = $mainMod, P, pseudo, #DWINDLE
 #bind = $mainMod $secdMod, S, togglesplit, #DWINDLE
-## Move focus with mainMod + HJKL
+# Move focus with mainMod + HJKL
 #bind = $mainMod, H, movefocus, l #DWINDLE
 #bind = $mainMod, L, movefocus, r #DWINDLE
 #bind = $mainMod, K, movefocus, u #DWINDLE
 #bind = $mainMod, J, movefocus, d #DWINDLE
-## Move window with mainMod + HJKL
+# Move window with mainMod + HJKL
 #bind = $mainMod SHIFT, L, movewindow, r #DWINDLE
 #bind = $mainMod SHIFT, H, movewindow, l #DWINDLE
 #bind = $mainMod SHIFT, J, movewindow, d #DWINDLE
 #bind = $mainMod SHIFT, K, movewindow, u #DWINDLE
-## Resize clients with mainMod + secdMod + HJKL
+# Resize clients with mainMod + secdMod + HJKL
 #binde = $mainMod $secdMod, L, resizeactive, 10 0 #DWINDLE
 #binde = $mainMod $secdMod, H, resizeactive, -10 0 #DWINDLE
 #binde = $mainMod $secdMod, K, resizeactive, 0 -10 #DWINDLE
@@ -227,40 +245,76 @@ bind = $mainMod, N, exec, pypr toggle_special
 bind = $mainMod SHIFT, N, togglespecialworkspace, minimized
 #}}}
 
-#{{{ Workspace binds (implied using split-monitor-workspaces plugin!)
+#{{{ Workspace binds (using split-monitor-workspaces plugin!)
+# Switch workspaces with mainMod + [0-9]
+#bind = $mainMod, 1, split-workspace, 1
+#bind = $mainMod, 2, split-workspace, 2
+#bind = $mainMod, 3, split-workspace, 3
+#bind = $mainMod, 4, split-workspace, 4
+#bind = $mainMod, 5, split-workspace, 5
+#bind = $mainMod, 6, split-workspace, 6
+#bind = $mainMod, 7, split-workspace, 7
+#bind = $mainMod, 8, split-workspace, 8
+#bind = $mainMod, 9, split-workspace, 9
+# Move active window to a workspace with mainMod + SHIFT + [0-9]
+#bind = $mainMod SHIFT, 1, split-movetoworkspacesilent, 1
+#bind = $mainMod SHIFT, 2, split-movetoworkspacesilent, 2
+#bind = $mainMod SHIFT, 3, split-movetoworkspacesilent, 3
+#bind = $mainMod SHIFT, 4, split-movetoworkspacesilent, 4
+#bind = $mainMod SHIFT, 5, split-movetoworkspacesilent, 5
+#bind = $mainMod SHIFT, 6, split-movetoworkspacesilent, 6
+#bind = $mainMod SHIFT, 7, split-movetoworkspacesilent, 7
+#bind = $mainMod SHIFT, 8, split-movetoworkspacesilent, 8
+#bind = $mainMod SHIFT, 9, split-movetoworkspacesilent, 9
+#bind = $mainMod CONTROL SHIFT, 1, split-movetoworkspace, 1
+#bind = $mainMod CONTROL SHIFT, 2, split-movetoworkspace, 2
+#bind = $mainMod CONTROL SHIFT, 3, split-movetoworkspace, 3
+#bind = $mainMod CONTROL SHIFT, 4, split-movetoworkspace, 4
+#bind = $mainMod CONTROL SHIFT, 5, split-movetoworkspace, 5
+#bind = $mainMod CONTROL SHIFT, 6, split-movetoworkspace, 6
+#bind = $mainMod CONTROL SHIFT, 7, split-movetoworkspace, 7
+#bind = $mainMod CONTROL SHIFT, 8, split-movetoworkspace, 8
+#bind = $mainMod CONTROL SHIFT, 9, split-movetoworkspace, 9
+#bind = $mainMod, mouse_down, split-workspace, e+1
+#bind = $mainMod, mouse_up, split-workspace, e-1
+#bind = $mainMod, comma, split-changemonitor, +1
+#bind = $mainMod, period, split-changemonitor, -1
+#}}}
+
+#{{{ Workspace binds (not using split-monitor-workspaces plugin!)
 # Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, split-workspace, 1
-bind = $mainMod, 2, split-workspace, 2
-bind = $mainMod, 3, split-workspace, 3
-bind = $mainMod, 4, split-workspace, 4
-bind = $mainMod, 5, split-workspace, 5
-bind = $mainMod, 6, split-workspace, 6
-bind = $mainMod, 7, split-workspace, 7
-bind = $mainMod, 8, split-workspace, 8
-bind = $mainMod, 9, split-workspace, 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, split-movetoworkspacesilent, 1
-bind = $mainMod SHIFT, 2, split-movetoworkspacesilent, 2
-bind = $mainMod SHIFT, 3, split-movetoworkspacesilent, 3
-bind = $mainMod SHIFT, 4, split-movetoworkspacesilent, 4
-bind = $mainMod SHIFT, 5, split-movetoworkspacesilent, 5
-bind = $mainMod SHIFT, 6, split-movetoworkspacesilent, 6
-bind = $mainMod SHIFT, 7, split-movetoworkspacesilent, 7
-bind = $mainMod SHIFT, 8, split-movetoworkspacesilent, 8
-bind = $mainMod SHIFT, 9, split-movetoworkspacesilent, 9
-bind = $mainMod CONTROL SHIFT, 1, split-movetoworkspace, 1
-bind = $mainMod CONTROL SHIFT, 2, split-movetoworkspace, 2
-bind = $mainMod CONTROL SHIFT, 3, split-movetoworkspace, 3
-bind = $mainMod CONTROL SHIFT, 4, split-movetoworkspace, 4
-bind = $mainMod CONTROL SHIFT, 5, split-movetoworkspace, 5
-bind = $mainMod CONTROL SHIFT, 6, split-movetoworkspace, 6
-bind = $mainMod CONTROL SHIFT, 7, split-movetoworkspace, 7
-bind = $mainMod CONTROL SHIFT, 8, split-movetoworkspace, 8
-bind = $mainMod CONTROL SHIFT, 9, split-movetoworkspace, 9
-bind = $mainMod, mouse_down, split-workspace, e+1
-bind = $mainMod, mouse_up, split-workspace, e-1
-bind = $mainMod, comma, split-changemonitor, +1
-bind = $mainMod, period, split-changemonitor, -1
+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, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+#bind = $mainMod, comma, split-changemonitor, +1
+#bind = $mainMod, period, split-changemonitor, -1
 #}}}
 
 #{{{ Mouse binds
diff --git a/hypr/pyprland.toml b/hypr/pyprland.toml
index f9775ab..dfa2aab 100644
--- a/hypr/pyprland.toml
+++ b/hypr/pyprland.toml
@@ -10,70 +10,94 @@ animation = ""
 command = "kitty --class sphtop htop"
 class = "sphtop"
 lazy = true
+size = "50% 50%"
+position = "25% 25%"
 
 [scratchpads.spterm]
 animation = ""
 command = "kitty --class spterm"
 class = "spterm"
 lazy = true
+size = "50% 50%"
+position = "25% 25%"
 
 [scratchpads.sppmxr]
 animation = ""
 command = "kitty --class sppmxr pulsemixer"
 class = "sppmxr"
 lazy = true
+size = "50% 50%"
+position = "25% 25%"
 
 [scratchpads.spblue]
 animation = ""
 command = "kitty --class spblue bluetoothctl"
 class = "spblue"
 lazy = true
+size = "50% 50%"
+position = "25% 25%"
 
 [scratchpads.spncmp]
 animation = ""
 command = "kitty --class spncmp ncmpcpp"
 class = "spncmp"
 lazy = true
+size = "50% 50%"
+position = "25% 25%"
 
 [scratchpads.spmutt]
 animation = ""
 command = "kitty --class spmutt neomutt"
 class = "spmutt"
 lazy = true
+size = "50% 50%"
+position = "25% 25%"
 
 [scratchpads.spprof]
 animation = ""
 command = "kitty --class spprof profanity"
 class = "spprof"
 lazy = true
+size = "50% 50%"
+position = "25% 25%"
 
 [scratchpads.spirss]
 animation = ""
 command = "kitty --class spirss irssi"
 class = "spirss"
 lazy = true
+size = "50% 50%"
+position = "25% 25%"
 
 [scratchpads.sptodo]
 animation = ""
 command = "kitty --class sptodo todo"
 class = "sptodo"
 lazy = true
+size = "50% 50%"
+position = "25% 25%"
 
 [scratchpads.sptrmc]
 animation = ""
 command = "kitty --class sptrmc tremc"
 class = "sptremc"
 lazy = true
+size = "50% 50%"
+position = "25% 25%"
 
 [scratchpads.qpwgraph]
 animation = ""
 command = "qpwgraph"
 class = "org.rncbc.qpwgraph"
 lazy = true
+size = "50% 50%"
+position = "25% 25%"
 
 [scratchpads.easyeffects]
 animation = ""
 command = "flatpak run com.github.wwmm.easyeffects"
 class = "com.github.wwmm.easyeffects"
 lazy = true
+size = "50% 50%"
+position = "25% 25%"
 unfocus = "hide"
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 99d5440..6207c2f 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -1469,7 +1469,7 @@ color15 #ffffff
 #: This option must be a comma separated list of the above values.
 #: This only source the first valid one in the above order.
 
-# term xterm-kitty
+term xterm-256color
 
 #: The value of the TERM environment variable to set. Changing this
 #: can break many terminal programs, only change it if you know what
diff --git a/nvim/init.vim b/nvim/init.vim
index a28cfc3..8c0d378 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -43,9 +43,7 @@ set showmatch " Highlight matching brace
 set number
 set relativenumber
 
-"colorscheme CandyPaper
-"colorscheme SlateDark
-colorscheme preglow
+colorscheme 256-grayvim
  
 set hlsearch                    " Highlight all search results
 set smartcase                   " Enable smart-case search
@@ -191,12 +189,12 @@ augroup custom
   au BufEnter     *.tex :LLPStartPreview
   au BufEnter     *.md :set textwidth=80
   au BufEnter     *.ms :set textwidth=80
-  au BufEnter     *.c :colo DevC++
-  au BufEnter     *.h :colo DevC++
-  au BufEnter     *.cc :colo DevC++
-  au BufEnter     *.hh :colo DevC++
-  au BufEnter     *.cpp :colo DevC++
-  au BufEnter     *.hpp :colo DevC++
+  "au BufEnter     *.c :colo DevC++
+  "au BufEnter     *.h :colo DevC++
+  "au BufEnter     *.cc :colo DevC++
+  "au BufEnter     *.hh :colo DevC++
+  "au BufEnter     *.cpp :colo DevC++
+  "au BufEnter     *.hpp :colo DevC++
   au BufWritePost init.vim :source %
   " au BufWritePost *.tex :make
   au BufWritePost *sxhkdrc* :!pkill -USR1 -x sxhkd
diff --git a/qt5ct/qt5ct.conf b/qt5ct/qt5ct.conf
new file mode 100644
index 0000000..bf4c0e0
--- /dev/null
+++ b/qt5ct/qt5ct.conf
@@ -0,0 +1,32 @@
+[Appearance]
+color_scheme_path=/usr/share/qt5ct/colors/darker.conf
+custom_palette=false
+icon_theme=Mint-X-Grey
+standard_dialogs=gtk2
+style=gtk2
+
+[Fonts]
+fixed=@Variant(\0\0\0@\0\0\0\x1e\0\x44\0\x65\0j\0\x61\0V\0u\0 \0L\0G\0\x43\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
+general=@Variant(\0\0\0@\0\0\0\x1e\0\x44\0\x65\0j\0\x61\0V\0u\0 \0L\0G\0\x43\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
+
+[Interface]
+activate_item_on_single_click=1
+buttonbox_layout=0
+cursor_flash_time=1000
+dialog_buttons_have_icons=1
+double_click_interval=400
+gui_effects=@Invalid()
+keyboard_scheme=2
+menus_have_icons=true
+show_shortcuts_in_context_menus=true
+stylesheets=@Invalid()
+toolbutton_style=4
+underline_shortcut=1
+wheel_scroll_lines=3
+
+[SettingsWindow]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x1\x95\0\0\0\xfb\0\0\x5\x45\0\0\x3\x93\0\0\x1\x96\0\0\0\xfc\0\0\x5\x44\0\0\x3\x92\0\0\0\0\0\0\0\0\a\x80\0\0\x1\x96\0\0\0\xfc\0\0\x5\x44\0\0\x3\x92)
+
+[Troubleshooting]
+force_raster_widgets=1
+ignored_applications=@Invalid()
diff --git a/qt6ct/qt6ct.conf b/qt6ct/qt6ct.conf
new file mode 100644
index 0000000..29cd0a9
--- /dev/null
+++ b/qt6ct/qt6ct.conf
@@ -0,0 +1,32 @@
+[Appearance]
+color_scheme_path=/usr/share/qt6ct/colors/airy.conf
+custom_palette=false
+icon_theme=Mint-X
+standard_dialogs=default
+style=qt6gtk2
+
+[Fonts]
+fixed="DejaVu LGC Sans,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1"
+general="DejaVu LGC Sans,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1"
+
+[Interface]
+activate_item_on_single_click=1
+buttonbox_layout=0
+cursor_flash_time=1000
+dialog_buttons_have_icons=1
+double_click_interval=400
+gui_effects=@Invalid()
+keyboard_scheme=2
+menus_have_icons=true
+show_shortcuts_in_context_menus=true
+stylesheets=@Invalid()
+toolbutton_style=4
+underline_shortcut=1
+wheel_scroll_lines=3
+
+[SettingsWindow]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3\x42\0\0\x3\xe7\0\0\0\0\0\0\0\0\0\0\x2\xde\0\0\x2\x46\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x3\x42\0\0\x3\xe7)
+
+[Troubleshooting]
+force_raster_widgets=1
+ignored_applications=@Invalid()
diff --git a/sh/aliases b/sh/aliases
index ef9a53b..7b3eba2 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -71,5 +71,9 @@ case `uname -s` in
     ;;
 esac
 
+## Systemctl
+alias us='systemctl --user'
+alias s='systemctl'
+
 ## Runit
 #alias ursm='env SVDIR="$HOME/.local/sv/" rsm'
diff --git a/sh/profile b/sh/profile
index 9dc2e46..d424439 100644
--- a/sh/profile
+++ b/sh/profile
@@ -6,13 +6,14 @@
 export XDG_DATA_HOME=${XDG_DATA_HOME:="$HOME/.local/share"}
 export XDG_CACHE_HOME=${XDG_CACHE_HOME:="$HOME/.cache"}
 export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:="$HOME/.config"}
-[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs"
+. "$HOME/.config/user-dirs.dirs"
 export XDG_CURRENT_DESKTOP="i3"
 export XDG_DOCUMENTS_DIR=${HOME}/Documents
 export XDG_DOWNLOAD_DIR=${HOME}/Downloads
 export XDG_DESKTOP_DIR=${HOME}/Desktop
 export XDG_VIDEOS_DIR=${HOME}/Videos
 
+export XDG_DATA_DIRS="${XDG_DATA_DIRS}:$HOME/.nix-profile/share"
 
 # Doesn't seem to work
 export ANDROID_SDK_HOME="$XDG_CONFIG_HOME"/android
diff --git a/waybar/config b/waybar/config
index e8e01a1..1bc5dd3 100644
--- a/waybar/config
+++ b/waybar/config
@@ -19,16 +19,29 @@
       "format": "{icon}",
       "active-only": false,
       "all-outputs": false,
-      "persistent_workspaces": {
-        "1": [],
-        "2": [],
-        "3": [],
-        "4": [],
-        "5": [],
-        "6": [],
-        "7": [],
-        "8": [],
-        "9": []
+      "format-icons": {
+        "1": "1",
+        "2": "2",
+        "3": "3",
+        "4": "4",
+        "5": "5",
+        "6": "6",
+        "7": "7",
+        "8": "8",
+        "9": "9",
+        "10": "1",
+        "11": "2",
+        "12": "3",
+        "13": "4",
+        "14": "5",
+        "15": "6",
+        "16": "7",
+        "17": "8",
+        "18": "9",
+      },
+      "persistent-workspaces": {
+        "DP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ],
+        "HDMI-A-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ],
       },
       "on-scroll-up": "hyprctl dispatch split-workspace e+1",
       "on-scroll-down": "hyprctl dispatch split-workspace e-1",
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 286e11a..1740c82 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -1,3 +1,4 @@
 # ZSH SPECIFIC CONFIGS
 unset HISTFILE
+[ -f "$HOME/.profile" ] && . "$HOME/.profile"
 export ZDOTDIR=$HOME/.config/zsh