raveos-hyprland-theme: merge RaveOS-Hyprland into theme-data, bump pkgrel=12

- Remove RaveOS-Hyprland/ directory (configs merged into theme-data/)
- Move gtk-3.0, gtk-4.0, nwg-look, Thunar, xfce4, xsettingsd into theme-data/
- Update PKGBUILD: pkgrel=12, remove RaveOS-Hyprland copy step
- Update apply.sh: handle new theme-data subdirs (gtk, nwg-look, Thunar, xfce4, xsettingsd)
- Sync hyprland.conf, monitors.conf, workspaces.conf, kitty.conf

4 files changed, 355 insertions, 74 deletions

diff --git a/raveos-hyprland-theme/theme-data/hypr/dms/outputs.conf b/raveos-hyprland-theme/theme-data/hypr/dms/outputs.conf
new file mode 100644
index 0000000..022f5c0
--- /dev/null
+++ b/raveos-hyprland-theme/theme-data/hypr/dms/outputs.conf
@@ -0,0 +1,3 @@
+# Auto-generated by DMS - do not edit manually
+
+monitor = HDMI-A-2, 2560x1440@59.951, 0x0, 1.5, vrr, 0
diff --git a/raveos-hyprland-theme/theme-data/hypr/hyprland.conf b/raveos-hyprland-theme/theme-data/hypr/hyprland.conf
index efdfc7d..5898d1e 100644
--- a/raveos-hyprland-theme/theme-data/hypr/hyprland.conf
+++ b/raveos-hyprland-theme/theme-data/hypr/hyprland.conf
@@ -1,123 +1,284 @@
-source = ./dms/colors.conf
 
-# 
-# ALT TAB#
-# 
-bind = SUPER, TAB, exec, hyprswitch gui --mod-key super_l --key tab --close mod-key-release --sort-recent --filter-current-monitor
+# #######################################################################################
+# AUTOGENERATED HYPRLAND CONFIG.
+# EDIT THIS CONFIG ACCORDING TO THE WIKI INSTRUCTIONS.
+# #######################################################################################
 
-# 
-# MONITORS#
-# 
-source = ./monitors.conf
-source = ./workspaces.conf
 
-# 
-# MY PROGRAMS#
-# 
+# This is an example Hyprland config file.
+# Refer to the wiki for more information.
+# https://wiki.hypr.land/Configuring/
+
+# Please note not all available settings / options are set here.
+# For a full list, see the wiki
+
+# You can split this configuration into multiple files
+# Create your files separately and then link them to this file like this:
+# source = ~/.config/hypr/myColors.conf
+
+################
+### ALT TAB  ###
+################
+
+################
+### MONITORS ###
+################
+
+# See https://wiki.hypr.land/Configuring/Monitors/
+monitor=HDMI-A-2, 2560x1440@60, 0x0, 1
+
+###################
+### MY PROGRAMS ###
+###################
+
+# See https://wiki.hypr.land/Configuring/Keywords/
+
+# Set programs that you use
 $terminal = kitty
-$fileManager = Thunar
+$fileManager = dolphin
+$menu = hyprlauncher
+
+
+#################
+### AUTOSTART ###
+#################
+
+# Autostart necessary processes (like notifications daemons, status bars, etc.)
+# Or execute your favorite apps at launch like this:
 
-# 
-# AUTOSTART & ENVIRONMENT#
-# 
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec-once = dbus-update-activation-environment --systemd --all
 exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+exec-once = hyprswitch init --show-title --size-factor 6 --workspaces-per-row 5 &
 exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
 exec-once = bash -c "wl-paste --watch cliphist store &"
-exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-exec-once = sleep 1 && dms run --config ~/.config/dms/
-exec-once = sleep 3 && dms ipc call wallpaper set "/usr/share/backgrounds/raveos/raveos-main-bg.jpeg"
-exec-once = sleep 1 && /usr/lib/pam_kwallet_init
-exec-once = /usr/lib/mate-polkit/polkit-mate-authentication-agent-1
+exec-once = dms run
+#exec-once = hyprshell run
+
+
+#############################
+### ENVIRONMENT VARIABLES ###
+#############################
+
+# See https://wiki.hypr.land/Configuring/Environment-variables/
 
-# Theme & VM Fixes
 env = XCURSOR_SIZE,24
 env = HYPRCURSOR_SIZE,24
-env = WLR_NO_HARDWARE_CURSORS,1
-env = WLR_RENDERER_ALLOW_SOFTWARE,1
+
+# Default env vars.
+env = HOME, /home/$USER/
+env = XDG_CONFIG_HOME, /home/$USER/.config
 env = XDG_CURRENT_DESKTOP,Hyprland
 env = XDG_SESSION_TYPE,wayland
 env = XDG_SESSION_DESKTOP,Hyprland
+env = XDG_MENU_PREFIX,arch-
+
 env = GDK_BACKEND,wayland
 env = QT_QPA_PLATFORM,wayland
 env = QT_QPA_PLATFORMTHEME,qt6ct
 env = QT_AUTO_SCREEN_SCALE_FACTOR,1
 env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
 env = QT_STYLE_OVERRIDE,kvantum
+env = SSH_AUTH_SOCK,$XDG_RUNTIME_DIR/ssh-agent.socket
+
+
+###################
+### PERMISSIONS ###
+###################
+
+# See https://wiki.hypr.land/Configuring/Permissions/
+# Please note permission changes here require a Hyprland restart and are not applied on-the-fly
+# for security reasons
+
+# ecosystem {
+#   enforce_permissions = 1
+# }
 
-# 
-# LOOK AND FEEL#
-# 
+# permission = /usr/(bin|local/bin)/grim, screencopy, allow
+# permission = /usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland, screencopy, allow
+# permission = /usr/(bin|local/bin)/hyprpm, plugin, allow
+
+
+#####################
+### LOOK AND FEEL ###
+#####################
+
+# Refer to https://wiki.hypr.land/Configuring/Variables/
+
+# https://wiki.hypr.land/Configuring/Variables/#general
 general {
     gaps_in = 5
-    gaps_out = 2
+    gaps_out = 20
+
     border_size = 2
-    col.active_border = $primary
-    col.inactive_border = $outline
-    resize_on_border = true
+
+    # https://wiki.hypr.land/Configuring/Variables/#variable-types for info about colors
+    col.active_border = rgba(4ef527cc) rgba(005dcacc) 45deg
+    col.inactive_border = rgba(595959aa)
+
+    # Set to true enable resizing windows by clicking and dragging on borders and gaps
+    resize_on_border = false
+
+    # Please see https://wiki.hypr.land/Configuring/Tearing/ before you turn this on
+    allow_tearing = false
+
     layout = dwindle
 }
 
+# https://wiki.hypr.land/Configuring/Variables/#decoration
 decoration {
-    rounding = 11
+    rounding = 10
+    rounding_power = 2
+
+    # Change transparency of focused and unfocused windows
     active_opacity = 1.0
     inactive_opacity = 1.0
+
     shadow {
-        enabled = false
+        enabled = true
+        range = 4
+        render_power = 3
+        color = rgba(1a1a1aee)
     }
+
+    # https://wiki.hypr.land/Configuring/Variables/#blur
     blur {
         enabled = true
         size = 3
         passes = 1
+
         vibrancy = 0.1696
     }
 }
 
+# https://wiki.hypr.land/Configuring/Variables/#animations
 animations {
-    enabled = yes
-    bezier = easeOutQuint,0.23,1,0.32,1
-    animation = global, 1, 10, default
-    animation = windows, 1, 4.79, easeOutQuint
-    animation = layers, 1, 3.81, easeOutQuint
-    animation = workspaces, 1, 1.94, almostLinear, fade
+    enabled = yes, please :)
+
+    # Default curves, see https://wiki.hypr.land/Configuring/Animations/#curves
+    #        NAME,           X0,   Y0,   X1,   Y1
+    bezier = easeOutQuint,   0.23, 1,    0.32, 1
+    bezier = easeInOutCubic, 0.65, 0.05, 0.36, 1
+    bezier = linear,         0,    0,    1,    1
+    bezier = almostLinear,   0.5,  0.5,  0.75, 1
+    bezier = quick,          0.15, 0,    0.1,  1
+
+    # Default animations, see https://wiki.hypr.land/Configuring/Animations/
+    #           NAME,          ONOFF, SPEED, CURVE,        [STYLE]
+    animation = global,        1,     10,    default
+    animation = border,        1,     5.39,  easeOutQuint
+    animation = windows,       1,     4.79,  easeOutQuint
+    animation = windowsIn,     1,     4.1,   easeOutQuint, popin 87%
+    animation = windowsOut,    1,     1.49,  linear,       popin 87%
+    animation = fadeIn,        1,     1.73,  almostLinear
+    animation = fadeOut,       1,     1.46,  almostLinear
+    animation = fade,          1,     3.03,  quick
+    animation = layers,        1,     3.81,  easeOutQuint
+    animation = layersIn,      1,     4,     easeOutQuint, fade
+    animation = layersOut,     1,     1.5,   linear,       fade
+    animation = fadeLayersIn,  1,     1.79,  almostLinear
+    animation = fadeLayersOut, 1,     1.39,  almostLinear
+    animation = workspaces,    1,     1.94,  almostLinear, fade
+    animation = workspacesIn,  1,     1.21,  almostLinear, fade
+    animation = workspacesOut, 1,     1.94,  almostLinear, fade
+    animation = zoomFactor,    1,     7,     quick
 }
 
+# Ref https://wiki.hypr.land/Configuring/Workspace-Rules/
+# "Smart gaps" / "No gaps when only"
+# uncomment all if you wish to use that.
+# workspace = w[tv1], gapsout:0, gapsin:0
+# workspace = f[1], gapsout:0, gapsin:0
+# windowrule {
+#     name = no-gaps-wtv1
+#     match:float = false
+#     match:workspace = w[tv1]
+#
+#     border_size = 0
+#     rounding = 0
+# }
+#
+# windowrule {
+#     name = no-gaps-f1
+#     match:float = false
+#     match:workspace = f[1]
+#
+#     border_size = 0
+#     rounding = 0
+# }
+
+# See https://wiki.hypr.land/Configuring/Dwindle-Layout/ for more
 dwindle {
-    pseudotile = true
-    preserve_split = true
+    pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    preserve_split = true # You probably want this
 }
 
+# See https://wiki.hypr.land/Configuring/Master-Layout/ for more
 master {
     new_status = master
 }
 
+# https://wiki.hypr.land/Configuring/Variables/#misc
 misc {
-    force_default_wallpaper = 0
-    disable_hyprland_logo = true
+    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
+    disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
 }
 
+
+#############
+### INPUT ###
+#############
+
+# https://wiki.hypr.land/Configuring/Variables/#input
 input {
-    kb_layout = gb
+    kb_layout = 
+    kb_variant = 
+    kb_model =
+    kb_options =
+    kb_rules =
+
     follow_mouse = 1
+
+    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
     numlock_by_default = true
+    accel_profile = flat
+
+    touchpad {
+        natural_scroll = false
+    }
 }
 
-cursor {
-    no_warps = true
+# See https://wiki.hypr.land/Configuring/Gestures
+gesture = 3, horizontal, workspace
+
+# Example per-device config
+# See https://wiki.hypr.land/Configuring/Keywords/#per-device-input-configs for more
+device {
+    name = epic-mouse-v1
+    sensitivity = -0.5
 }
 
-# 
-# KEYBINDINGS#
-# 
-$mainMod = SUPER
+
+###################
+### KEYBINDINGS ###
+###################
+
+# See https://wiki.hypr.land/Configuring/Keywords/
+$mainMod = SUPER # Sets "Windows" key as main modifier
+
+# DMS Shell
+bind = SUPER, SUPER_L, exec, dms ipc call spotlight toggle
+
+# Example binds, see https://wiki.hypr.land/Configuring/Binds/ for more
+bind = CTRL ALT, T, exec, $terminal
 bind = $mainMod, Q, killactive,
-bind = $mainMod, M, exit,
-bind = $mainMod, E, exec, nautilus
+bind = $mainMod, M, exec, command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch exit
+bind = $mainMod, E, exec, $fileManager
 bind = $mainMod, V, togglefloating,
-bind = $mainMod, P, pseudo,
-bind = $mainMod, J, togglesplit,
-bind = $mainMod, Return, exec, $terminal
+bind = $mainMod, R, exec, $menu
+bind = $mainMod, P, pseudo, # dwindle
+bind = $mainMod, J, layoutmsg, togglesplit # dwindle
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, left, movefocus, l
@@ -125,30 +286,154 @@ bind = $mainMod, right, movefocus, r
 bind = $mainMod, up, movefocus, u
 bind = $mainMod, down, movefocus, d
 
-# Switch workspaces with mainMod + [1-9]
+# Switch workspaces with mainMod + [0-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
+bind = $mainMod, 0, workspace, 10
 
 # Move active window to a workspace with mainMod + SHIFT + [0-9]
 bind = $mainMod SHIFT, 1, movetoworkspace, 1
 bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
 
-# Shell Binds
-bind = SUPER, SUPER_L, exec, dms ipc call spotlight toggle
-bind = $mainMod, V, exec, dms ipc call clipboard toggle
-bind = $mainMod, comma, exec, dms ipc call settings toggle
-bind = $mainMod, N, exec, dms ipc call notifications toggle
-bind = $mainMod SHIFT, N, exec, dms ipc call notepad toggle
-bind = $mainMod, Y, exec, dms ipc call wallpaper next
+# Example special workspace (scratchpad)
+bind = $mainMod, S, togglespecialworkspace, magic
+bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+
+# Scroll through existing workspaces with mainMod + scroll
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
 
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
-# Source remaining DMS configs
+# Laptop multimedia keys for volume and LCD brightness
+bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+
+bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+bindel = ,XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+
+bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%-
+
+# Requires playerctl
+bindl = , XF86AudioNext, exec, playerctl next
+bindl = , XF86AudioPause, exec, playerctl play-pause
+bindl = , XF86AudioPlay, exec, playerctl play-pause
+bindl = , XF86AudioPrev, exec, playerctl previous
+
+##############################
+### WINDOWS AND WORKSPACES ###
+##############################
+
+# See https://wiki.hypr.land/Configuring/Window-Rules/ for more
+# See https://wiki.hypr.land/Configuring/Workspace-Rules/ for workspace rules
+
+# Example windowrules that are useful
+
+windowrule {
+    # Ignore maximize requests from all apps. You'll probably like this.
+    name = suppress-maximize-events
+    match:class = .*
+
+    suppress_event = maximize
+}
+
+windowrule {
+  name = windowrule-1
+  float = on
+  match:class = .*
+}
+
+windowrule {
+  name = windowrule-2
+  size = 888 888
+  match:class = org.gnome.gedit
+}
+
+windowrule {
+  name = windowrule-3
+  size = 444 444
+  match:title = Preferences
+}
+
+windowrule {
+  name = windowrule-4
+  size = 1111 666
+  match:class = thunar
+}
+
+windowrule {
+  name = windowrule-5
+  size = 444 111
+  match:title = File Operation Progress
+}
+
+windowrule {
+  name = windowrule-6
+  size = 444 444
+  match:title = ^(.*Properties.*)$
+}
+
+windowrule {
+  name = windowrule-7
+  size = 444 333
+  match:title = Confirm to replace files
+}
+
+windowrule {
+  name = windowrule-8
+  size = 888 888
+  match:class = org.pulseaudio.pavucontrol
+}
+
+windowrule {
+  name = windowrule-9
+  size = 444 111
+  match:title = Create New Folder
+}
+
+windowrule {
+  name = windowrule-10
+  size = 444 111
+  match:title = ^(.*Rename.*)$
+}
+
+windowrule {
+    # Fix some dragging issues with XWayland
+    name = fix-xwayland-drags
+    match:class = ^$
+    match:title = ^$
+    match:xwayland = true
+    match:float = true
+    match:fullscreen = false
+    match:pin = false
+
+    no_focus = true
+}
+
+# Hyprland-run windowrule
+windowrule {
+    name = move-hyprland-run
+
+    match:class = hyprland-run
+
+    move = 20 monitor_h-120
+    float = yes
+}
+
 source = ./dms/cursor.conf
-source = ./dms/layout.conf
-source = ./dms/windowrules.conf
diff --git a/raveos-hyprland-theme/theme-data/hypr/monitors.conf b/raveos-hyprland-theme/theme-data/hypr/monitors.conf
index 12d095a..e69de29 100644
--- a/raveos-hyprland-theme/theme-data/hypr/monitors.conf
+++ b/raveos-hyprland-theme/theme-data/hypr/monitors.conf
@@ -1,5 +0,0 @@
-# Auto-generated by raveos-monitor-setup
-# Run raveos-monitor-setup to reconfigure monitors
-# Format: monitor=NAME, RESxRES@HZ, POSxPOS, SCALE
-
-monitor=,preferred,auto,1
diff --git a/raveos-hyprland-theme/theme-data/hypr/workspaces.conf b/raveos-hyprland-theme/theme-data/hypr/workspaces.conf
index 328ed03..e69de29 100644
--- a/raveos-hyprland-theme/theme-data/hypr/workspaces.conf
+++ b/raveos-hyprland-theme/theme-data/hypr/workspaces.conf
@@ -1,2 +0,0 @@
-# Auto-generated by raveos-monitor-setup
-# Workspace assignments are configured automatically based on connected monitors