From f19f298f7e1decc0409d017e7c932553ee0ab80e Mon Sep 17 00:00:00 2001
From: cnst <adam@cnst.dev>
Date: Sat, 5 Jul 2025 10:46:03 +0200
Subject: [PATCH] hypr: fix startup things

---
 modules/nixos/programs/hyprland/startup.nix | 42 ++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/modules/nixos/programs/hyprland/startup.nix b/modules/nixos/programs/hyprland/startup.nix
index 7bb9a166..c46e9a7a 100644
--- a/modules/nixos/programs/hyprland/startup.nix
+++ b/modules/nixos/programs/hyprland/startup.nix
@@ -6,6 +6,13 @@
   inherit (lib) mkIf mkEnableOption mkMerge;
   cfg = config.nixos.programs.hyprland;
   host = config.networking.hostName;
+
+  commonExecOnce = [
+    "pamixer --set-volume 50"
+    "uwsm app -- blueman-applet"
+    "uwsm app -- keepassxc"
+    "uwsm app -- nm-applet --indicator"
+  ];
 in {
   options = {
     nixos.programs.hyprland.startup.enable = mkEnableOption "Enables startup settings in Hyprland";
@@ -14,7 +21,7 @@ in {
   config = mkIf cfg.startup.enable (mkMerge [
     {
       programs.hyprland.settings = {
-        exec-once = [
+        execr-once = [
           "uwsm finalize"
           "hyprlock"
         ];
@@ -22,32 +29,25 @@ in {
     }
 
     (mkIf (host == "cnixtop") {
-      programs.hyprland.settings.exec-once = [
-        "uwsm app -- mullvad-vpn"
-        "uwsm app -- blueman-applet"
-        "uwsm app -- keepassxc"
-        "uwsm app -- pamixer --set-volume 50"
-        "uwsm app -- solaar -w hide -b regular"
-        "uwsm app -- nm-applet --indicator"
-      ];
+      programs.hyprland.settings.exec-once =
+        [
+          "uwsm app -- mullvad-vpn"
+          "uwsm app -- solaar -w hide -b regular"
+        ]
+        ++ commonExecOnce;
     })
 
     (mkIf (host == "cnixpad") {
-      programs.hyprland.settings.exec-once = [
-        "uwsm app -- blueman-applet"
-        "uwsm app -- keepassxc"
-        "uwsm app -- pamixer --set-volume 50"
-        "uwsm app -- nm-applet --indicator"
-      ];
+      programs.hyprland.settings.exec-once = commonExecOnce;
     })
 
     (mkIf (host == "toothpc") {
-      programs.hyprland.settings.exec-once = [
-        "uwsm app -- mullvad-vpn"
-        "uwsm app -- keepassxc"
-        "uwsm app -- solaar -w hide -b regular"
-        "uwsm app -- nm-applet --indicator"
-      ];
+      programs.hyprland.settings.exec-once =
+        [
+          "uwsm app -- mullvad-vpn"
+          "uwsm app -- solaar -w hide -b regular"
+        ]
+        ++ commonExecOnce;
     })
   ]);
 }