hypr: fix XDP black magic

diff --git a/dot-config/hypr/fragments/env.conf b/dot-config/hypr/fragments/env.conf
deleted file mode 100644 (file)
index 3772baa..0000000
--- a/dot-config/hypr/fragments/env.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-# kak: filetype=conf:tabstop=4:indentwidth=4
-# ░█░█░█░█░█▀█░█▀▄░█░░░█▀█░█▀█░█▀▄░░░█▀▀░█▀█░█▀█░█▀▀░▀█▀░█▀▀
-# ░█▀█░░█░░█▀▀░█▀▄░█░░░█▀█░█░█░█░█░░░█░░░█░█░█░█░█▀▀░░█░░█░█
-# ░▀░▀░░▀░░▀░░░▀░▀░▀▀▀░▀░▀░▀░▀░▀▀░░░░▀▀▀░▀▀▀░▀░▀░▀░░░▀▀▀░▀▀▀
-
-# xdg stuff
-env = AMD_VULKAN_ICD=RADV
-
-# prefer wayland
-env = QT_QPA_PLATFORM,wayland;xcb
-env = QT_QPA_PLATFORMTHEME,kde
-# env = QT_QPA_PLATFORMTHEME,hyprqt6engine # experimental
-env = GDK_BACKEND,wayland,x11,*
-env = GTK_USE_PORTAL,1
-env = MOZ_ENABLE_WAYLAND,1
-# env = SDL_VIDEODRIVER,wayland # remove or set to x11 for games providing older versions of SDL
-env = CLUTTER_BACKEND,wayland
-
-# tweak swww
-env = SWWW_TRANSITION_FPS,59
-
-# necessary for hi-dpi displays:
-# env = GDK_SCALE=1 # scaling XWayland clients
-# env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-
-# set cursor
-env = XCURSOR_THEME,Bibata-Original-Ice
-env = XCURSOR_SIZE,40
-env = HYPRCURSOR_THEME,Bibata-Original-Ice
-env = HYPRCURSOR_SIZE,40
-
-# tweak applications/frameworks
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-env = XDG_MENU_PREFIX,plasma-
-
-

diff --git a/dot-config/hypr/fragments/env.lua b/dot-config/hypr/fragments/env.lua
index 8d6db73fcdb1357500a94b87040aff84e70f9f83..abfd7d53f314f3b2dccf1c23bf9340ea04b585fb 100644 (file)
--- a/dot-config/hypr/fragments/env.lua
+++ b/dot-config/hypr/fragments/env.lua
@@ -4,6 +4,11 @@
 -- ░▀░▀░░▀░░▀░░░▀░▀░▀▀▀░▀░▀░▀░▀░▀▀░░░░▀▀▀░▀▀▀░▀░▀░▀░░░▀▀▀░▀▀▀
 
 -- xdg stuff
+hl.env("XDG_SESSION_TYPE", "wayland")
+hl.env("XDG_CURRENT_DESKTOP", "Hyprland")
+hl.env("XDG_SESSION_DESKTOP", "Hyprland")
+
+-- amd stuff
 hl.env("AMD_VULKAN_ICD", "RADV")
 
 -- prefer wayland

diff --git a/dot-config/hypr/hyprland.lua b/dot-config/hypr/hyprland.lua
index 9cdf35dda61898ca7721f04bc7af116ec7e89285..e5bf499f5b9bd0e7fbf1054aca7134a671a66748 100644 (file)
--- a/dot-config/hypr/hyprland.lua
+++ b/dot-config/hypr/hyprland.lua
@@ -37,14 +37,12 @@ local menu        = "qs -c noctalia-shell ipc call launcher toggle"
 -- Or execute your favorite apps at launch like this:
 
 hl.on("hyprland.start", function ()
+  hl.exec_cmd("~/.config/hypr/scripts/hyprinit.sh") -- also runs "openrc -U desktop"
   hl.exec_cmd("hyprpm reload")
-  hl.exec_cmd("/usr/libexec/pam_kwallet_init")
-  hl.exec_cmd("gmenudbusmenuproxy")
-  hl.exec_cmd("env XDG_MENU_PREFIX=plasma- kbuildsycoca6 --noincremental")
-  hl.exec_cmd("openrc -U desktop")
-  -- hl.exec_cmd("~/.local/bin/run_after_noctalia.sh")
+  -- hl.exec_cmd("/usr/libexec/pam_kwallet_init")
+  -- hl.exec_cmd("gmenudbusmenuproxy")
+  hl.exec_cmd("env XDG_MENU_PREFIX=plasma- /usr/bin/kbuildsycoca6 --noincremental")
   hl.exec_cmd("/usr/bin/noctalia")
-  -- hl.exec_cmd("hyprctl plugin load /usr/lib/hyprland-plugins/dynamic-cursors.so")
 end)
 
 hl.on("hyprland.shutdown", function()

diff --git a/dot-config/hypr/scripts/hyprinit.sh b/dot-config/hypr/scripts/hyprinit.sh
new file mode 100755 (executable)
index 0000000..ffa1fa0
--- /dev/null
+++ b/dot-config/hypr/scripts/hyprinit.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+dbus-update-activation-environment \
+    XDG_CURRENT_DESKTOP \
+    XDG_SESSION_DESKTOP \
+    XDG_SESSION_TYPE \
+    WAYLAND_DISPLAY \
+    XDG_MENU_PREFIX
+
+openrc -U desktop
+