merge upstream

.config/hypr/custom/keybinds.conf

@@ -1,8 +1,10 @@
 # See https://wiki.hyprland.org/Configuring/Binds/
 #!
-##! User keybinds
-bind = Ctrl+Super+Alt, Slash, exec, xdg-open ~/.config/hypr/custom/keybinds.conf # Edit custom keybinds
+##! Extra keybinds
+bind = Ctrl+Super+Alt, Slash, exec, xdg-open ~/.config/hypr/custom/keybinds.conf # Edit extra keybinds
 
 # Add stuff here
 # Use #! to add an extra column on the cheatsheet
 # Use ##! to add a section in that column
+# Add a comment after a bind to add a description, like above
+

.config/hypr/hyprland.conf

@@ -1,5 +1,5 @@
 # This file sources other files in `hyprland` and `custom` folders
-# You wanna add your stuff in file in `custom`
+# You wanna add your stuff in files in `custom`
 
 exec = hyprctl dispatch submap global # DO NOT REMOVE THIS OR YOU WON'T BE ABLE TO USE ANY KEYBIND
 submap = global # This is required for catchall to work

.config/hypr/hyprland/keybinds.conf

@@ -23,6 +23,7 @@ bindd = Super, A, Toggle left sidebar, global, quickshell:sidebarLeftToggle # To
 bind = Super, O, global, quickshell:sidebarLeftToggle # [hidden]
 bindd = Super, N, Toggle right sidebar, global, quickshell:sidebarRightToggle # Toggle right sidebar
 bindd = Super, Slash, Toggle cheatsheet, global, quickshell:cheatsheetToggle # Toggle cheatsheet
+bindd = Super, M, Toggle media controls, global, quickshell:mediaControlsToggle # Toggle media controls
 bindd = Ctrl+Alt, Delete, Toggle session menu, global, quickshell:sessionToggle # Toggle session menu
 bind = Ctrl+Alt, Delete, exec, qs ipc call TEST_ALIVE || pkill wlogout || wlogout -p layer-shell # [hidden]
 
@@ -46,8 +47,8 @@ bindd = Ctrl+Shift+Alt+Super, Delete, Shutdown, exec, systemctl poweroff || logi
 
 ##! Utilities
 # Screenshot, Record, OCR, Color picker, Clipboard history
-bindd = Super, V, Copy clipboard history entry, exec, pkill fuzzel || cliphist list | fuzzel  --match-mode fzf --dmenu | cliphist decode | wl-copy # Clipboard history >> clipboard
-bindd = Super, Period, Copy an emoji, exec, pkill fuzzel || ~/.local/bin/fuzzel-emoji # Pick emoji >> clipboard
+bindd = Super, V, Copy clipboard history entry, exec, pkill fuzzel || cliphist list | fuzzel --match-mode fzf --dmenu | cliphist decode | wl-copy # Clipboard history >> clipboard
+bindd = Super, Period, Copy an emoji, exec, pkill fuzzel || ~/.local/bin/fuzzel-emoji # Emoji
 bindd = Super+Shift, S, Screen snip, exec, grimblast --freeze copy area # Screen snip >> clipboard
 bindd = Super+Shift+Alt, S, Screen snip and annotate, exec, grim -g "$(slurp)" - | swappy -f - # Screen snip and annotate
 # OCR
@@ -198,8 +199,8 @@ bind = Super+Alt, E, exec, thunar # [hidden]
 bind = Super, W, exec, zen-browser # [hidden]
 bind = Super+Shift, W, exec, wps # WPS Office
 bind = Ctrl+Super, V, exec, pavucontrol # Pavucontrol (volume mixer)
+bind = Super, I, exec, better-control # Better Control (settings app)
 bind = Super, X, exec, gnome-text-editor --new-window # GNOME Text Editor
-bind = Super, I, exec, XDG_CURRENT_DESKTOP="gnome" gnome-control-center # GNOME Settings
 bind = Ctrl+Shift, Escape, exec, gnome-system-monitor # GNOME System monitor
 
 # Cursed stuff

.config/hypr/hyprland/rules.conf

@@ -105,15 +105,14 @@ layerrule = ignorealpha 0.6, osk[0-9]*
 
 # Quickshell
 ## My stuff
+layerrule = animation slide, quickshell:bar
 layerrule = animation fade, quickshell:screenCorners
 layerrule = animation slide right, quickshell:sidebarRight
 layerrule = animation slide left, quickshell:sidebarLeft
-layerrule = animation slide top, quickshell:onScreenDisplay
 layerrule = blur, quickshell:session
 layerrule = noanim, quickshell:session
 # Launchers need to be FAST
 layerrule = noanim, quickshell:overview
-layerrule = noanim, launcher
 layerrule = noanim, gtk4-layer-shell
 ## outfoxxed's stuff
 layerrule = blur, shell:bar