Merge branch 'desktop'

2026-09-16 10:00:51 +02:00 · 2026-08-07 00:07:45 +02:00
parent f0adb7feca cc215acf4d
commit 53895de342
60 changed files with 1015 additions and 1357 deletions
--- a/hypr/env.conf
+++ b/hypr/env.conf
@@ -1,23 +0,0 @@
-
-env = XCURSOR_SIZE,24
-
-#env = LIBVA_DRIVER_NAME,nvidia
-#env = XDG_SESSION_TYPE,wayland
-#env = GDM_BACKEND,nvidia-drm
-#env = __GLX_VENDOR_LIBRARY_NAME,nvidia
-#env = WLR_NO_HARDWARE_CURSORS,1
-env = QT_QPA_PLATFORMTHEME,qt6ct
-env = QT_QPA_PLATFORM,wayland;xcb
-
-# GarbageTK
-env = GTK_THEME,adw-gtk3-dark
-
-# moar wayland
-env = SDL_VIDEODRIVER,wayland
-env = CLUTTER_BACKEND,wayland
-
-# Exec
-#env = PATH,/home/kosmx/.local/share/graalvm/bin:$PATH
-
-# XDG
-env = XDG_RUNTIME_DIR,/run/user/1000/
--- a/hypr/exec.conf
+++ b/hypr/exec.conf
@@ -8,30 +8,29 @@
 # exec-once = waybar & hyprpaper & firefox


-exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once = hyprpaper
-exec-once = waybar
-exec-once = swaync
+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP DISPLAY
+#exec-once = uwsm app hyprpaper
+#exec-once = uwsm app waybar
+#exec-once = uwsm app swaync

 # clippy
-exec-once = wl-paste --type text --watch cliphist -max-items 36 store #Stores only text data
-exec-once = wl-paste --type image --watch cliphist -max-items 36 store #Stores only image data
+# exec-once = uwsm app wl-paste --type text --watch cliphist -max-items 36 store #Stores only text data
+# exec-once = uwsm app wl-paste --type image --watch cliphist -max-items 36 store #Stores only image data

 #exec-once = hyprland-per-window-layout

-exec-once = udiskie &
+exec-once = uwsm app udiskie

-exec-once = /usr/libexec/hyprpolkitagent 
-exec-once = hypridle
-exec-once = hyprsunset
+#exec-once = uwsm app /usr/libexec/hyprpolkitagent 
+#exec-once = uwsm app hypridle
+#exec-once = hyprsunset

-#exec-once = /usr/libexec/kdeconnectd # kdeconnect daemon
-exec-once = kdeconnect-indicator
+exec-once = uwsm app kdeconnect-indicator

 # audit (apparmor) logger
 # exec-once = aa-notify -p -s 1 -w 60 -f /var/log/audit/audit.log

-exec-once = gnome-keyring-daemon --start --components=pkcs11,secrets,ssh
+#exec-once = uwsm app gnome-keyring-daemon --start --components=pkcs11,secrets,ssh

 # something keeps changing my cursor. This is my ultimatum.
-exec-once = gsettings set org.gnome.desktop.interface cursor-theme
+exec-once = gsettings set org.gnome.desktop.interface cursor-theme Adwaita
--- a/hypr/hypridle.conf
+++ b/hypr/hypridle.conf
@@ -1,6 +1,6 @@
 # Config yoinked from hyprland website
 general {
-    lock_cmd = pidof hyprlock || hyprlock       # avoid starting multiple hyprlock instances.
+    lock_cmd = pidof hyprlock || uwsm app hyprlock       # avoid starting multiple hyprlock instances.
    before_sleep_cmd = loginctl lock-session    # lock before suspend.
    after_sleep_cmd = hyprctl dispatch dpms on  # to avoid having to press a key twice to turn on the display.
 }
@@ -19,17 +19,17 @@ listener {
 # }

 listener {
-    timeout = 300                                 # 5min
+    timeout = 1800                                # 30 min
    on-timeout = loginctl lock-session            # lock screen when timeout has passed
 }

 listener {
-    timeout = 330                                 # 5.5min
+    timeout = 1800                                # 30 min
    on-timeout = hyprctl dispatch dpms off        # screen off when timeout has passed
    on-resume = hyprctl dispatch dpms on          # screen on when activity is detected after timeout has fired.
 }

-listener {
-    timeout = 1800                                # 30min
-    on-timeout = systemctl suspend                # suspend pc
-}
+#listener {
+#    timeout = 1800                                # 30min
+#    on-timeout = systemctl suspend                # suspend pc
+#}
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -18,8 +18,6 @@ monitor=,preferred,auto,auto
 # Source a file (multi-file configs)
 # source = ~/.config/hypr/myColors.conf

-source=./env.conf
-
 # Exec stuffs

 source=./exec.conf
@@ -29,8 +27,12 @@ source=./macchiato.conf

 # Window rules

-windowrulev2 = center, class:^(Rofi)$
-windowrulev2 = stayfocused, class:^(Rofi)$
+windowrule {
+  name = windowrule-1
+  center = on
+  stay_focused = on
+  match:class = ^(Rofi)$
+}

 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
@@ -52,9 +54,9 @@ input {
 general {
    # See https://wiki.hyprland.org/Configuring/Variables/ for more

-    gaps_in = 1
-    gaps_out = 2
-    border_size = 1
+    gaps_in = 2
+    gaps_out = 4
+    border_size = 2
    col.active_border = $blue
    col.inactive_border = $overlay0

@@ -100,7 +102,7 @@ animations {

 dwindle {
    # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
-    pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    #pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
    preserve_split = yes # you probably want this
 }

@@ -111,9 +113,9 @@ master {

 gestures {
    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    workspace_swipe = on
-    workspace_swipe_fingers = 3
-    workspace_swipe_invert = false
+    # workspace_swipe = on
+    # workspace_swipe_fingers = 3
+    # workspace_swipe_invert = false
 }

 xwayland {
@@ -128,18 +130,6 @@ misc {
    #force_hypr_chan = true # there is suddenly an anime girl on the background :D
 }

-# Example per-device config
-# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
-# device:epic-mouse-v1 {
-#     sensitivity = -0.5
-# }
-
-# Example windowrule v1
-# windowrule = float, ^(kitty)$
-# Example windowrule v2
-# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-

 source=./keybinds.conf
 debug:disable_logs = false
--- a/hypr/hyprlock.conf
+++ b/hypr/hyprlock.conf
@@ -58,7 +58,7 @@ label {
 # INPUT FIELD
 input-field {
    monitor =
-    size = 300, 60
+    size = 900, 60
    outline_thickness = 4
    dots_size = 0.2
    dots_spacing = 0.2
--- a/hypr/hyprpaper.conf
+++ b/hypr/hyprpaper.conf
@@ -1,6 +1,7 @@
-preload = /home/ha5pls/.local/share/backgrounds/eKxlw8.jpg
-
-wallpaper = ,/home/ha5pls/.local/share/backgrounds/eKxlw8.jpg
+wallpaper {
+    monitor = 
+    path = /home/ha5pls/.local/share/backgrounds/eKxlw8.jpg
+}

 splash = false

--- a/hypr/keybinds.conf
+++ b/hypr/keybinds.conf
@@ -4,28 +4,28 @@
 $mainMod = SUPER

 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, T, exec, kitty
-bind = $mainMod, W, exec, flatpak run io.gitlab.librewolf-community
 bind = $mainMod, BACKSPACE, killactive,
-bind = $mainMod CTRL ALT, BACKSPACE, exit,
-bind = $mainMod CTRL, BACKSPACE, exec, sh ~/.config/swaylock.sh
+bind = $mainMod CTRL ALT, BACKSPACE, exec, uwsm stop
+bind = $mainMod CTRL, BACKSPACE, exec, /usr/bin/hyprlock
 #bind = $mainMod, PAUSE, killactive,
-bind = $mainMod, F, exec, nautilus
 bind = $mainMod, Y, togglefloating,
 bind = $mainMod SHIFT, Y, workspaceopt, allfloat
 bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod SHIFT, P, pin,
-bind = $mainMod SHIFT, P, workspaceopt, allpseudo,
-bind = $mainMod, O, togglesplit, # dwindle
+bind = $mainMod SHIFT, P, pin
+bind = $mainMod SHIFT, P, workspaceopt, allpseudo
+#bind = $mainMod, O, togglesplit, # dwindle
 bind = $mainMod, E, fullscreen, 1
 bind = $mainMod SHIFT, E, fullscreen, 0
-# bind = $mainMod CTRL, E, fakefullscreen,
-bind = $mainMod SHIFT, PERIOD, pin,
+# bind = $mainMod CTRL, E, fakefullscreen
+bind = $mainMod SHIFT, PERIOD, pin
 binde = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
 binde = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
 binde = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
 binde = , XF86MonBrightnessUp, exec, brightnessctl set '12.75+'
 binde = , XF86MonBrightnessDown, exec, brightnessctl set '12.75-'
+binde = , XF86AudioPlay, exec, playerctl play-pause
+binde = , XF86AudioNext, exec, playerctl next
+binde = , XF86AudioPrev, exec, playerctl previous

 #bind = $mainMod ALT, SPACE, exec, hyprctl switchxkblayout

@@ -46,10 +46,10 @@ bind = $mainMod SHIFT, right, movewindow, r
 bind = $mainMod SHIFT, up, movewindow, u
 bind = $mainMod SHIFT, down, movewindow, d

-bind = $mainMod SHIFT, H, movetoworkspace, l
+bind = $mainMod SHIFT, H, movewindow, l
 bind = $mainMod SHIFT, J, movetoworkspace, r+1
 bind = $mainMod SHIFT, K, movetoworkspace, r-1
-bind = $mainMod SHIFT, L, movetoworkspace, r
+bind = $mainMod SHIFT, L, movewindow, r


 # Resize commands
@@ -104,7 +104,7 @@ bind = $mainMod, mouse:274, movetoworkspacesilent, special
 bind = $mainMod, C, movetoworkspacesilent, special
 bind = $mainMod SHIFT, mouse:274, movetoworkspace, special
 bind = $mainMod SHIFT, C, movetoworkspace, special
-bind = $mainMod, TAB, togglespecialworkspace,
+bind = $mainMod, TAB, togglespecialworkspace
 bind = $mainMod CTRL, END, workspace, empty
 bind = $mainMod SHIFT, END, movetoworkspace, empty
 bind = $mainMod CTRL, HOME, workspace, 1
@@ -115,14 +115,18 @@ bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 bindm = $mainMod SHIFT, mouse:272, resizewindow

+# Applications
+bind = $mainMod, F, exec, uwsm app nautilus
+bind = $mainMod, T, exec, uwsm app kitty
+bind = $mainMod, W, exec, uwsm app io.gitlab.librewolf-community.desktop

 # Tools (launcher/etc)
 bind = $mainMod, SPACE, exec, ~/.config/rofi/launchers/type-1/launcher.sh
-bind = $mainMod SHIFT, V, exec, cliphist list | rofi -theme ~/.config/rofi/launchers/type-1/style-5.rasi -dmenu | cliphist decode | wl-copy && wl-paste
+bind = $mainMod SHIFT, V, exec, cliphist list | rofi -theme ~/.config/rofi/launchers/type-1/style-5.rasi -dmenu | cliphist decode | wl-copy
 bind = $mainMod SHIFT CTRL, V, exec, cliphist list | rofi -theme ~/.config/rofi/launchers/type-1/style-5.rasi -dmenu | cliphist delete
 bind = $mainMod, minus, exec, rofi -theme ~/.config/rofi/launchers/type-1/style-5.rasi -show calc -modi calc -no-show-match -no-sort -no-persist-history -calc-command "echo -n '{result}' | wl-copy"
-bind = $mainMod, B, exec, pkill waybar || waybar
-bind = $mainMod SHIFT, ESCAPE, exec, plasma-systemmonitor # TODO add my own monitor
+bind = $mainMod, B, exec, pkill waybar || uwsm app waybar
+bind = $mainMod SHIFT, ESCAPE, exec, uwsm app plasma-systemmonitor # TODO add my own monitor
 bind = $mainMod, N, exec, swaync-client -t -sw

 bind = $mainMod SHIFT, S, exec, sh -c "slurp | grim -g - - | wl-copy && wl-paste > $(xdg-user-dir PICTURES)/screenshots/$(date +'%Y-%m-%d-%H%M%S_grim.png')"