Merge pull request 'no-uwsm-desktop' (#1) from no-uwsm-desktop into master

Reviewed-on: https://git.aramjonghu.nl/AramJonghu/hypr/pulls/1

hyprland.conf

@@ -1,3 +1,4 @@
+source = ./modules/env.conf
 source = ./modules/macchiato.conf
 source = ./modules/settings.conf
 source = ./modules/binds.conf

modules/binds.conf

@@ -1,13 +1,13 @@
 bindm = SUPER,mouse:272,movewindow
 bindm = SUPER,mouse:273,resizewindow
 
-bind = SUPER,RETURN,exec, uwsm app -S out -- foot
+bind = SUPER,RETURN,exec,  foot
 bind = SUPER,Q,killactive
 bind = SUPER,M,exit
-bind = SUPER,E,exec, uwsm app -S out -- thunar
+bind = SUPER,E,exec, dolphin
 bind = SUPER,S,togglefloating
 bind = SUPER,P,pseudo
-bind = SUPER,B,exec, uwsm app -S out -- librewolf
+bind = SUPER,B,exec, firefox
 
 bind = SUPER,H,movefocus,l
 bind = SUPER,L,movefocus,r
@@ -44,23 +44,25 @@ bind = SUPER,g,togglegroup
 bind = SUPER,tab,changegroupactive
 
 bind = SUPER, F,fullscreen
-bind = SUPER, D, exec, fuzzel --launch-prefix="uwsm app -- "
-bindel = , XF86AudioRaiseVolume, exec, uwsm-app -S out --  wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
-bindel = , XF86AudioLowerVolume, exec, uwsm-app -S out --  wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
-bindel = , XF86AudioMute, exec, uwsm-app -S out --  wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-bindel = , F14, exec, uwsm-app -S out --  wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
-bindel = , F15, exec, uwsm-app -S out --  wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-bindel = , F17, exec, uwsm-app -S out --  wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%+
-bindel = , F16, exec, uwsm-app -S out --  wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%-
+bind = SUPER, D, exec, fuzzel
+bindel = , XF86AudioRaiseVolume, exec,  wpctl set-volume @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 = , F14, exec,  wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+bindel = , F15, exec,  wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bindel = , F17, exec,  wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%+
+bindel = , F16, exec,  wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%-
 
-bindl = , XF86AudioPlay, exec, uwsm-app -S out --  playerctl play-pause
-bindl = , XF86AudioPrev, exec, uwsm-app -S out --  playerctl previous
-bindl = , XF86AudioNext, exec, uwsm-app -S out --  playerctl next
+bindl = , XF86AudioPlay, exec,  playerctl play-pause
+bindl = , XF86AudioPrev, exec,  playerctl previous
+bindl = , XF86AudioNext, exec,  playerctl next
 
-bind = , PRINT, exec, uwsm-app -S out --  hyprshot -m region -z
+# bind = , PRINT, exec,  hyprshot -m region -z
 
 # zshell
+bind = , PRINT, global, zshell:screenshotFreeze
 bind = SUPER, R, global, zshell:toggle-launcher
 bind = SUPER, A, global, zshell:toggle-nc
 bind = SUPER, V, global, zshell:toggle-drawing
 bind = SUPER, F1, global, zshell:lock
+bind = SUPER, F2, global, zshell:toggle-settings

modules/env.conf

@@ -0,0 +1,32 @@
+env = ZSH,/usr/share/oh-my-zsh/
+env = BROWSER,firefox
+env = TERM,tmux-256color
+env = VISUAL,nvim
+env = EDITOR,nvim
+
+env = HYPRCURSOR_THEME,catppuccin-macchiato-light-cursors
+env = HYPRCURSOR_SIZE,24
+
+ent = ELECTRON_OZONE_PLATFORM_HINT,auto
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+env = QT_QPA_PLATFORM,wayland
+env = QT_QPA_PLATFORMTHEME,qt6ct
+env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
+
+env = XDG_SESSION_DESKTOP,Hyprland
+env = XDG_SESSION_TYPE,wayland
+env = CLUTTER_BACKEND,wayland
+env = GDK_BACKEND,wayland
+env = SDL_VIDEODRIVER,wayland
+
+env = XDG_CONFIG_HOME,$HOME/.config
+env = XDG_CACHE_HOME,$HOME/.cache
+env = XDG_DATA_HOME,$HOME/.local/share
+env = XDG_PICTRES_HOME,$HOME/Pictures
+env = HYPRSHOT_DIR,$HOME/Pictures/Screenshots
+
+env = RUSTICL_ENABLE,radeonsi
+env = AMD_VULKAN_ICD,RADV
+
+env = HSA_OVERRIDE_GFX_VERSION,12.0.1
+env = HCC_AMDGPU_TARGET,gfx1201

modules/executes.conf

@@ -1,13 +1,7 @@
-exec-once = dispwin -d 1 color_profiles/1440p\ monitor.icm
-exec-once = uwsm app -S out -- zshell
-exec-once = uwsm app -S out -- AyuGram
-exec-once = uwsm app -S out -- teams-for-linux
-exec-once = uwsm app -S out -- vesktop
-exec-once = uwsm app -S out -- steam -silent
-exec-once = uwsm app -S out -- thunderbird
-exec-once = uwsm app -S out -- fcitx5
-exec-once = uwsm app -S out -- wl-paste --type text --watch cliphist store
-exec-once = uwsm app -S out -- wl-paste --type image --watch cliphist store
-exec-once = uwsm app -S out -- nextcloud --background
+exec-once = zshell-cli shell start
+exec-once = fcitx5
+exec-once = wl-paste --type text --watch cliphist store
+exec-once = wl-paste --type image --watch cliphist store
+exec-once = nextcloud --background
 exec-once = hyprsunset -i
-exec-once = systemctl --user start hyprpolkitagent.service
+exec-once = nm-applet

modules/monitors.conf

@@ -1,6 +1,8 @@
 monitor= DP-2, 2560x1440@240, 1728x0, 1, bitdepth, 10, cm, srgb
 monitor = DP-3, 3840x2160@60, 0x0, 1.25, bitdepth, 10, transform, 1
 
+#monitor = DP-3, 3840x2160@60, 0x0, 1.25, bitdepth, 10, transform, 1, icc, /home/koyomi/.config/colorprofiles/lg4k.icm
+
 render { 
     cm_auto_hdr = 0
     cm_fs_passthrough = 1

modules/settings.conf

@@ -1,6 +1,6 @@
 input {
     kb_layout = us
-    kb_variant =
+    kb_variant = intl
     kb_model =
     kb_options = fkeys:basic_13-24
     kb_rules =
@@ -44,6 +44,14 @@ decoration {
 
 }
 
+layerrule = blur_popups on, match:namespace ZShell-Bar
+layerrule = ignore_alpha 0.5, match:namespace ZShell-Bar
+layerrule = blur on, match:namespace ZShell-Bar
+
+layerrule = blur_popups on, match:namespace ZShell-Auth
+layerrule = ignore_alpha 0.5, match:namespace ZShell-Auth
+layerrule = blur on, match:namespace ZShell-Auth
+
 animations {
     enabled = 1
     bezier = overshot,0.13,0.99,0.29,1.1
@@ -59,6 +67,7 @@ dwindle {
 }
 
 ecosystem {
+    no_donation_nag = true
     no_update_news = true
 }
 

modules/windowrules.conf

@@ -1,12 +1,44 @@
-windowrule = opacity 0.0 override, class:^(xwaylandvideobridge)$
-windowrule = noanim, class:^(xwaylandvideobridge)$
-windowrule = noinitialfocus, class:^(xwaylandvideobridge)$
-windowrule = maxsize 1 1, class:^(xwaylandvideobridge)$
-windowrule = noblur, class:^(xwaylandvideobridge)$
-windowrule = nofocus, class:^(xwaylandvideobridge)$
+windowrule {
+  name = windowrule-1
+  opacity = 0.0 override
+  no_anim = on
+  no_initial_focus = on
+  max_size = 1 1
+  no_blur = on
+  no_focus = on
+  match:class = ^(xwaylandvideobridge)$
+}
+
+
+windowrule {
+  name = windowrule-2
+  idle_inhibit = fullscreen
+  match:class = .*
+}
+
+windowrule {
+  name = windowrule-3
+  idle_inhibit = always
+  match:content = video
+}
+
+windowrule {
+  name = windowrule-4
+  idle_inhibit = always
+  match:content = game
+}
+
+windowrule {
+  name = windowrule-5
+  idle_inhibit = always
+  match:fullscreen_state_internal = client
+  match:fullscreen_state_client = 2
+}
+
+windowrule {
+  name = windowrule-6
+  idle_inhibit = always
+  match:fullscreen_state_internal = internal
+  match:fullscreen_state_client = 2
+}
 
-windowrulev2 = idleinhibit fullscreen, class:.*
-windowrule = idleinhibit always, content:video
-windowrule = idleinhibit always, content:game
-windowrule = idleinhibit always, fullscreenstate:client 2
-windowrule = idleinhibit always, fullscreenstate:internal 2