Merge branches 'upstream-custom' and 'zshfish' into dev

hypr/conf/keybindings/custom.conf

@@ -32,6 +32,7 @@ bind = $mainMod SHIFT, left, resizeactive, -100 0
 bind = $mainMod SHIFT, up, resizeactive, 0 -100
 bind = $mainMod SHIFT, down, resizeactive, 0 100
 bind = $mainMod, G, togglegroup
+bind = $mainMod CTRL, Tab, changegroupactive, f
 
 # Actions
 bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh

hypr/conf/misc.conf

@@ -7,4 +7,5 @@ misc {
     disable_splash_rendering = true
     enable_swallow = true
     swallow_regex = ^(Alacritty|kitty|thunar)$
+    font_family = FiraCode Nerd Font
 }

hypr/conf/windows/default.conf

@@ -11,3 +11,12 @@ general {
     col.inactive_border = rgba(ffffffff)
     layout = dwindle
 }
+
+group {
+    col.border_active = $color11
+    col.border_inactive = rgba(ffffffff)
+    groupbar {
+        col.active = $color11
+        col.inactive = $color13
+    }
+}