bump: hypr

7 files changed, 111 insertions, 55 deletions

diff --git a/dot-config/hypr/autostart.conf b/dot-config/hypr/autostart.conf
index 78224eca..033f9364 100644
--- a/dot-config/hypr/autostart.conf
+++ b/dot-config/hypr/autostart.conf
@@ -72,6 +72,7 @@ exec-once = syshud -M audio_in,audio_out,brightness -b /sys/bus/ddcci/devices/dd
 # night light
 # exec-once = gammastep -l geoclue2
 exec-once = $HOME/scripts/hyprsunset.sh
+exec-once = systemd-inhibit --who="Hyprland" --why="Handling power key" --what=handle-power-key sleep infinity
 
 # user applications
 exec-once = udiskie
diff --git a/dot-config/hypr/bg.conf b/dot-config/hypr/bg.conf
new file mode 100644
index 00000000..87e649ca
--- /dev/null
+++ b/dot-config/hypr/bg.conf
@@ -0,0 +1 @@
+$bg = /home/system/Pictures/wallpapers/a_train_tracks_in_a_foggy_day.jpg
diff --git a/dot-config/hypr/binds.conf b/dot-config/hypr/binds.conf
index 8cde0f64..834f8659 100644
--- a/dot-config/hypr/binds.conf
+++ b/dot-config/hypr/binds.conf
@@ -47,7 +47,7 @@ bind = ctrl alt, v, exec, $termfloat -e $editor
 
 # Emergency
 bindtp = ctrl alt, b, exec, $termfloat --title=btop -e sudo nice -n -20 ionice -c 1 sudo btop
-bindtp = ctrl alt, delete, execr, $rofiexec/rofi_shutdown_menu
+bindtp = ctrl alt, delete, execr, $HOME/scripts/hyprshutdown.sh
 bindtp = ctrl shift, escape, execr, missioncenter
 
 # Misc
@@ -72,9 +72,11 @@ bindo = ,XF86AudioNext, execr, playerctl -p spotify next
 bind = ,XF86AudioPrev, execr, playerctl position 5-
 bindo = ,XF86AudioPrev, execr, playerctl -p spotify previous
 bindl = ,XF86AudioPlay, exec, [workspace 7 silent; noinitialfocus] playerctl -p spotify play-pause || LD_PRELOAD=/usr/lib/spotify-adblock.so spotify
+# bindl = ,XF86AudioPlay, exec, [workspace 7 silent; noinitialfocus] playerctl -p chromium play-pause || /opt/Aonsoku/aonsoku
 bindol = ,XF86AudioPlay, exec, [workspace 7 silent; noinitialfocus] playerctl --all-players pause || LD_PRELOAD=/usr/lib/spotify-adblock.so spotify
+# bindol = ,XF86AudioPlay, exec, [workspace 7 silent; noinitialfocus] playerctl --all-players pause || /opt/Aonsoku/aonsoku
 bind = ,XF86AudioStop, execr, playerctl -p spotify stop
-bind = ,XF86PowerOff, execr, $rofiexec/rofi_shutdown
+bind = ,XF86PowerOff, execr, $HOME/scripts/hyprshutdown.sh
 
 # Pause
 bind = $mod, Pause, execr, hyprfreeze -s -a
@@ -89,13 +91,10 @@ binde = ,XF86MonBrightnessDown, execr, $HOME/scripts/sysutil.sh brightness --dec
 # binde = ,XF86MonBrightnessDown, execr, hyprctl hyprsunset gamma -5
 
 # Window management
-# bind = $mod, d, execr, $HOME/scripts/hyprhide h
-# bind = $mod, i, execr, $HOME/scripts/hyprhide s
-bind = $mod, d, execr, hyprctl dispatch movetoworkspacesilent special:minimized
+bind = $mod, d, movetoworkspacesilent, special:minimized
 bind = $mod, i, togglespecialworkspace, minimized
-bind = $mod, i, execr, hyprctl dispatch movetoworkspace +0
+bind = $mod, i, movetoworkspace, +0
 binde = $mod, q, killactive
-# bind = $mod shift, q, execr, kill -9 $(hyprctl activewindow | grep pid | tail -1 | awk '{print$2}')
 bind = $mod shift, q, forcekillactive
 bind = ctrl alt, escape, execr, hyprctl kill
 bind = ctrl $mod shift, r, execr, hyprctl reload
@@ -118,8 +117,8 @@ bind = alt, grave, execr, hyprswitch gui --mod-key alt_l --key tab --close mod-k
 
 binde = ctrl alt, left, workspace, -1
 binde = ctrl alt, right, workspace, +1
-binde = $mod shift, h, movewindow, l
-binde = $mod shift, l, movewindow, r
+binde = $mod shift, h, layoutmsg, swapcol l
+binde = $mod shift, l, layoutmsg, swapcol r
 binde = $mod shift, k, movewindow, u
 binde = $mod shift, j, movewindow, d
 # binde = $mod shift, h, scroller:movewindow, l
@@ -140,8 +139,8 @@ binde = $mod shift, j, movewindow, d
 # binde = ctrl $mod, down, resizeactive, 0 20
 # binde = ctrl $mod alt, space, setfloating, 1
 # binde = ctrl $mod alt, space, centerwindow, 1
-binde = ctrl $mod alt, space, scroller:setheight, one
-binde = ctrl $mod alt, space, scroller:setwidth, one
+binde = ctrl $mod alt, space, layoutmsg, fit active
+# binde = ctrl $mod alt, space, scroller:setwidth, one
 # binde = shift alt, left, moveactive, -20 0
 # binde = shift alt, right, moveactive, 20 0
 # binde = shift alt, up, moveactive, 0 -20
@@ -152,19 +151,24 @@ binde = ctrl $mod alt, space, scroller:setwidth, one
 # binde = ctrl $mod shift, h, scroller:movefocus, l
 # binde = ctrl $mod shift, h, scroller:movefocus, r
 # binde = ctrl $mod shift, l, scroller:setsize, onehalf
-binde = ctrl $mod shift, l, scroller:cyclewidth, next
-binde = ctrl $mod shift, h, scroller:cyclewidth, prev
+# binde = ctrl $mod shift, l, scroller:cyclewidth, next
+# binde = ctrl $mod shift, h, scroller:cyclewidth, prev
+binde = ctrl $mod shift, h, layoutmsg, colresize -conf # or 0.5 or 0.2 or something?
+binde = ctrl $mod shift, l, layoutmsg, colresize +conf # or 0.5 or 0.2 or something?
 
-binde = ctrl $mod shift, j, scroller:cycleheight, next
-binde = ctrl $mod shift, k, scroller:cycleheight, prev
+# fixme
+binde = ctrl $mod shift, j, resizeactive, 0% 50%
+binde = ctrl $mod shift, k, resizeactive, 0% -50%
+# binde = ctrl $mod shift, j, scroller:cycleheight, next
+# binde = ctrl $mod shift, k, scroller:cycleheight, prev
 
-binde = $mod ctrl, h, scroller:admitwindow, l
-binde = $mod ctrl, l, scroller:admitwindow, r
-binde = $mod alt, h, scroller:expelwindow, r
-binde = $mod alt, l, scroller:expelwindow, l
+binde = $mod ctrl, h, moveintoorcreategroup, l
+binde = $mod ctrl, l, moveintoorcreategroup, r
+binde = $mod alt, h, moveoutofgroup, r
+binde = $mod alt, l, moveoutofgroup, l
 
-bind = $mod, home, scroller:movefocus, begin
-bind = $mod, end, scroller:movefocus, end
+# bind = $mod, home, scroller:movefocus, begin
+# bind = $mod, end, scroller:movefocus, end
 
 # zoom
 # bind = $mod, equal, execr, /bin/bash -c "hyprctl keyword cursor:zoom_factor $(($(hyprctl getoption cursor:zoom_factor | awk '/float/ {print $2}')+0.1))"
@@ -179,7 +183,7 @@ bind = $mod shift, mouse_down, exec, hyprctl -q keyword cursor:zoom_factor 1
 bind = $mod shift, mouse_up, exec, hyprctl -q keyword cursor:zoom_factor 1
 
 # spotify lyrics ig
-bind = $mod shift, u, execr, $SCRIPTSDIR/togglespot.sh
+# bind = $mod shift, u, execr, $SCRIPTSDIR/togglespot.sh
 
 # window shortcuts
 bind = $mod, f, fullscreen
diff --git a/dot-config/hypr/colors.conf b/dot-config/hypr/colors.conf
new file mode 100644
index 00000000..0fa10983
--- /dev/null
+++ b/dot-config/hypr/colors.conf
@@ -0,0 +1,20 @@
+$wallpaper = /home/system/Pictures/wallpapers/a_train_tracks_in_a_foggy_day.jpg
+$background = rgb(000000)
+$foreground = rgb(D8E4F4)
+$cursor = rgb(9EABBC)
+$color0 = rgb(000000)
+$color1 = rgb(747B83)
+$color2 = rgb(6C788A)
+$color3 = rgb(6F7C8F)
+$color4 = rgb(6A798E)
+$color5 = rgb(7F9BBF)
+$color6 = rgb(90B2DE)
+$color7 = rgb(BFD0E6)
+$color8 = rgb(8692A1)
+$color9 = rgb(747B83)
+$color10 = rgb(6C788A)
+$color11 = rgb(6F7C8F)
+$color12 = rgb(6A798E)
+$color13 = rgb(7F9BBF)
+$color14 = rgb(90B2DE)
+$color15 = rgb(BFD0E6)
diff --git a/dot-config/hypr/hyprland.conf b/dot-config/hypr/hyprland.conf
index ff74cc61..a79d913c 100644
--- a/dot-config/hypr/hyprland.conf
+++ b/dot-config/hypr/hyprland.conf
@@ -70,7 +70,8 @@ general {
     # Please see https://wiki.hyprland.org/Configuring/Tearing before you turn this on
     allow_tearing = true
 
-    layout = scroller
+    layout = scrolling
+
     snap {
         enabled = true
 		respect_gaps = true
@@ -122,7 +123,7 @@ decoration {
 		# light
 		# size = 8
 		# passes = 3
-        # noise = 0
+  #       noise = 0
 
         # crazy & cool options
         # brightness = 1
@@ -192,6 +193,13 @@ master {
     new_status = inherit
 }
 
+scrolling {
+	follow_min_visible = 0
+	fullscreen_on_one_column = true
+	explicit_column_widths = 0.333, 0.5, 0.667, 1.0
+	# focus_fit_method = 1
+}
+
 # https://wiki.hyprland.org/Configuring/Variables/#misc
 misc {
     force_default_wallpaper = 1 # Set to 0 or 1 to disable the anime mascot wallpapers
@@ -206,11 +214,14 @@ misc {
     # animate_mouse_windowdragging = true
     middle_click_paste = false
     enable_swallow = false # true
-    swallow_regex = ^(Alacritty)$
+    # swallow_regex = ^(Alacritty)$
     new_window_takes_over_fullscreen = 2
 }
 
 group {
+	auto_group = false
+	disbandgrouponnone = true
+
     groupbar {
         # enabled = false
         render_titles = false
@@ -423,4 +434,4 @@ debug {
 
 experimental:xx_color_management_v4 = true
 
-plugin:kill-intercept:window = class:BeeperTexts, hide
+# plugin:kill-intercept:window = class:BeeperTexts, hide
diff --git a/dot-config/hypr/hyprlandd.conf b/dot-config/hypr/hyprlandd.conf
index 17e9a1fd..d8de88a2 100644
--- a/dot-config/hypr/hyprlandd.conf
+++ b/dot-config/hypr/hyprlandd.conf
@@ -64,19 +64,19 @@ general {
     # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
     allow_tearing = true
 
-    layout = dwindle
+    layout = scrolling
     snap {
         enabled = true
     }
 }
 
-xwayland {
-  force_zero_scaling = true
-}
+# xwayland {
+#   force_zero_scaling = true
+# }
 
-# https://wiki.hyprland.org/Configuring/Variables/#decoration
-decoration {
-    rounding = 7
+# # https://wiki.hyprland.org/Configuring/Variables/#decoration
+# decoration {
+#     rounding = 7
 
     # Change transparency of focused and unfocused windows
     active_opacity = 0.95
@@ -136,6 +136,21 @@ animations {
     animation = workspaces, 1, 6, fast-slow, slide
     animation = workspacesIn, 1, 6, fast-slow, slidefade
     animation = borderangle, 1, 100, linear, loop
+        # 1. Using a predefined normalized spring
+    # Duration is still controlled by the '7' speed parameter
+    animation = windows, 1, 7, spring-snappy
+
+    # 2. Using a custom normalized spring
+    animation = workspaces, 1, 5, spring:0.8:20
+
+    # 3. Using Physics mode
+    # The '1' speed parameter is ignored; duration is calculated by physics
+    animation = windowsIn, 1, 1, spring-physics-bouncy
+
+    # 4. Using custom Physics parameters
+    # High damping (1.5) means it will slowly slide into place with zero bounce
+    animation = windowsOut, 1, 1, spring-physics:1.5:10
+
 }
 
 # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
@@ -145,14 +160,14 @@ dwindle {
     force_split = 3
 }
 
-# https://wiki.hyprland.org/Configuring/Variables/#misc
-misc { 
-    force_default_wallpaper = 1 # Set to 0 or 1 to disable the anime mascot wallpapers
-    focus_on_activate = true
-    # disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :(
-    # vfr = false
-    # vrr = 1 # 1 = always, 2 = only in full screen
-    mouse_move_enables_dpms = true
+# # https://wiki.hyprland.org/Configuring/Variables/#misc
+# misc { 
+#     force_default_wallpaper = 1 # Set to 0 or 1 to disable the anime mascot wallpapers
+#     focus_on_activate = true
+#     # disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :(
+#     # vfr = false
+#     # vrr = 1 # 1 = always, 2 = only in full screen
+#     mouse_move_enables_dpms = true
     key_press_enables_dpms = true
     # animate_manual_resizes = true
     # animate_mouse_windowdragging = true
@@ -163,6 +178,7 @@ misc {
 }
 
 group {
+	auto_group = false
     groupbar {
         # enabled = false
         render_titles = false
@@ -215,13 +231,13 @@ input {
     # }
 }
 
-cursor {
-    # allow_dumb_copy = true
-    no_hardware_cursors = false
-    # no_break_fs_vrr = true
-    # zoom_rigid = true
-    # persistent_warps = true
-}
+# cursor {
+#     # allow_dumb_copy = true
+#     no_hardware_cursors = false
+#     # no_break_fs_vrr = true
+#     # zoom_rigid = true
+#     # persistent_warps = true
+# }
 
 plugin {
     overview {
@@ -390,3 +406,6 @@ source = ~/.config/hypr/env.conf
 source = ~/.config/hypr/rules.conf
 source = ~/.config/hypr/binds.conf
 
+permission = /usr/bin/cliphist, clipboard-read, ask
+
+group:disband_on_empty = true
diff --git a/dot-config/hypr/hyprtoolkit.conf b/dot-config/hypr/hyprtoolkit.conf
index 3a9167a8..81acf054 100644
--- a/dot-config/hypr/hyprtoolkit.conf
+++ b/dot-config/hypr/hyprtoolkit.conf
@@ -1,7 +1,7 @@
-background = FF1A1B16
-base = FF444640
-text = FFD0C9B8
-alternate_base = FF7E7766
-bright_text = FFB4A991
-accent = FF726E4F
-accent_secondary = FF8B7F5C
+background = FF000000
+base = FF000000
+text = FFD8E4F4
+alternate_base = FF8692A1
+bright_text = FFBFD0E6
+accent = FF6C788A
+accent_secondary = FF6A798E