From 811011d6d648ea473734ee07ae92b59c268c4a0e Mon Sep 17 00:00:00 2001
From: kenji <kenji@hakase>
Date: Wed, 24 Dec 2025 16:19:44 +0000
Subject: [PATCH] fixed some issue and added uwsm support

---
 apps/hyprland/default.nix   | 10 +++++++++-
 apps/hyprland/home.nix      |  1 +
 apps/hyprland/hypr/exec.nix |  2 +-
 apps/waybar/deps.nix        |  3 ++-
 apps/waybar/style.nix       |  5 ++---
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/apps/hyprland/default.nix b/apps/hyprland/default.nix
index a4df8e8..84db65f 100644
--- a/apps/hyprland/default.nix
+++ b/apps/hyprland/default.nix
@@ -7,6 +7,7 @@
     enable = true;
     package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
     portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+    withUWSM = true;
   };
 
   environment.systemPackages = [
@@ -18,7 +19,14 @@
     pkgs.hyprpolkitagent
   ];
 
-    # systemd.user.services.hyprpolkitagent = {
+  xdg.terminal-exec = {
+    enable = true;
+    settings = {
+      default = ["ghostty.desktop"];
+    };
+  };
+
+  # systemd.user.services.hyprpolkitagent = {
   #   description = "Hyprland Polkit Agent";
   #   wantedBy = ["graphical-session.target"];
   #   serviceConfig = {
diff --git a/apps/hyprland/home.nix b/apps/hyprland/home.nix
index 27c95ff..65c4935 100644
--- a/apps/hyprland/home.nix
+++ b/apps/hyprland/home.nix
@@ -5,4 +5,5 @@
     ./hypr/exec.nix
   ];
   wayland.windowManager.hyprland.enable = true;
+  wayland.windowManager.hyprland.systemd.enable = false; # for UWSM support...
 }
diff --git a/apps/hyprland/hypr/exec.nix b/apps/hyprland/hypr/exec.nix
index bd582c0..7171bb9 100644
--- a/apps/hyprland/hypr/exec.nix
+++ b/apps/hyprland/hypr/exec.nix
@@ -1,7 +1,7 @@
 {
   wayland.windowManager.hyprland.settings = {
     exec-once = [
-      "waybar"
+      "uwsm app -- waybar"
     ];
   };
 }
diff --git a/apps/waybar/deps.nix b/apps/waybar/deps.nix
index afb39d6..b08b0de 100644
--- a/apps/waybar/deps.nix
+++ b/apps/waybar/deps.nix
@@ -1,5 +1,6 @@
 {pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
+  home.packages = with pkgs; [
     pamixer
+    wiremix
   ];
 }
diff --git a/apps/waybar/style.nix b/apps/waybar/style.nix
index eadd79b..a20997f 100644
--- a/apps/waybar/style.nix
+++ b/apps/waybar/style.nix
@@ -1,11 +1,10 @@
 {
   programs.waybar = {
     style = ''
-      @import "../omarchy/current/theme/waybar.css";
 
       * {
-        background-color: @background;
-        color: @foreground;
+        background-color: #cdd6f4;
+        color: #181824;
 
         border: none;
         border-radius: 0;