From 5a4dc3b0c38ce3a1e14ec94a6988fa085297feb4 Mon Sep 17 00:00:00 2001
From: Natalie Marks <nmarks413@gmail.com>
Date: Thu, 30 Oct 2025 16:24:46 -0700
Subject: [PATCH] feat (natalie): enable UWSM to better manage wayland
 utilities via systemd, and add sddm

---
 users/natalie/desktop/configuration.nix   | 13 ++++++++++++-
 users/natalie/home/hyprland/exec-once.nix |  2 +-
 users/natalie/home/hyprland/hyprland.nix  | 13 ++++++++-----
 users/natalie/home/hyprland/monitors.nix  |  4 ++--
 users/natalie/home/waybar/waybar.nix      |  1 +
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/users/natalie/desktop/configuration.nix b/users/natalie/desktop/configuration.nix
index 56bb397fbcb1dfbd91e223216b0940d6a8d8bdc4..4a872b330b4d5d554afffaff5293e37653e2d7c4 100644
--- a/users/natalie/desktop/configuration.nix
+++ b/users/natalie/desktop/configuration.nix
@@ -10,8 +10,19 @@
     ./hardware-configuration.nix
   ];
   documentation.man.generateCaches = false;
+  services.displayManager = {
+    enable = true;
+    sddm = {
+      enable = true;
+      wayland.enable = true;
+    };
+  };
+
   programs = {
-    hyprland.enable = true;
+    hyprland = {
+      enable = true;
+      withUWSM = true;
+    };
     gamemode.enable = true;
 
     _1password.enable = true;
diff --git a/users/natalie/home/hyprland/exec-once.nix b/users/natalie/home/hyprland/exec-once.nix
index 22e44ef6ff1d405e32d2e987a35da4c782183700..947de457ba8c0b7d42dbd3245fb63264244fed9b 100644
--- a/users/natalie/home/hyprland/exec-once.nix
+++ b/users/natalie/home/hyprland/exec-once.nix
@@ -15,7 +15,7 @@
     "${pkgs.networkmanagerapplet}/bin/nm-applet &"
     "${pkgs.wl-clip-persist}/bin/wl-clip-persist --clipboard both &"
     "${pkgs.wl-clipboard}/bin/wl-paste --watch cliphist store &"
-    "${pkgs.waybar}/bin/waybar &"
+    # "${pkgs.waybar}/bin/waybar &"
     "${pkgs.swaynotificationcenter}/bin/swaync &"
     "${inputs.vicinae.packages.${currentSystem}.default}/bin/vicinae server &"
     "${pkgs.udiskie}/bin/udiskie --automount --notify --smart-tray &"
diff --git a/users/natalie/home/hyprland/hyprland.nix b/users/natalie/home/hyprland/hyprland.nix
index 23f8d23415b856bb31cc100bdf1b4ce97917d319..126b41c9993c13303c723b746087b4f547ffe10d 100644
--- a/users/natalie/home/hyprland/hyprland.nix
+++ b/users/natalie/home/hyprland/hyprland.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 {
   home.packages = with pkgs; [
     swww
@@ -18,9 +18,9 @@
     networkmanagerapplet
     hyprpolkitagent
   ];
-  systemd.user.targets.hyprland-session.Unit.Wants = [
-    "xdg-desktop-autostart.target"
-  ];
+  # systemd.user.targets.hyprland-session.Unit.Wants = [
+  #   "xdg-desktop-autostart.target"
+  # ];
   wayland.windowManager.hyprland = {
     enable = true;
     package = null;
@@ -29,6 +29,9 @@
     xwayland = {
       enable = true;
     };
-    systemd.enable = true;
+    systemd.enable = false;
   };
+  # https://wiki.hypr.land/Nix/Hyprland-on-Home-Manager/#nixos-uwsm
+  xdg.configFile."uwsm/env".source =
+    "${config.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh";
 }
diff --git a/users/natalie/home/hyprland/monitors.nix b/users/natalie/home/hyprland/monitors.nix
index fcb3e3309fdd4a159e7d6e66ba3f60ef8e7f798c..1bcaa833b63f4725cab0b124918ea3c64a910156 100644
--- a/users/natalie/home/hyprland/monitors.nix
+++ b/users/natalie/home/hyprland/monitors.nix
@@ -2,8 +2,8 @@
 {
   wayland.windowManager.hyprland = {
     settings.monitor = [
-      "HDMI-A-1, 1980x1080@144, 0x0, auto"
-      "DP-1,2560x1440@144,auto,auto"
+      "HDMI-A-2, 1980x1080@144, 0x0, auto"
+      "DP-2,2560x1440@144,auto,auto"
     ];
 
     # extraConfig = ''
diff --git a/users/natalie/home/waybar/waybar.nix b/users/natalie/home/waybar/waybar.nix
index bd925edcbe22647ff5cf3c9408952311bf628016..67a25fee81417c370526e6a5b6aac1656831148f 100644
--- a/users/natalie/home/waybar/waybar.nix
+++ b/users/natalie/home/waybar/waybar.nix
@@ -2,5 +2,6 @@
 {
   programs.waybar = {
     enable = true;
+    systemd.enable = true;
   };
 }
-- 
2.54.0