From 8949fbea6b9b6c6a10c6a9f1dca0cbbb1460a132 Mon Sep 17 00:00:00 2001
From: imxyy_soope_ <imxyy1soope1@gmail.com>
Date: Sun, 4 May 2025 10:56:31 +0800
Subject: [PATCH] feat: move to sddm

---
 config/hosts/imxyy-nix/home.nix     | 10 ++--------
 modules/desktop/wm/niri/config.nix  |  5 -----
 modules/desktop/wm/niri/default.nix | 27 +++++++++++++--------------
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/config/hosts/imxyy-nix/home.nix b/config/hosts/imxyy-nix/home.nix
index 7fe74fe..4e52d50 100644
--- a/config/hosts/imxyy-nix/home.nix
+++ b/config/hosts/imxyy-nix/home.nix
@@ -43,10 +43,7 @@
         PATH = "/home/${username}/bin:$PATH";
       };
       profileExtra = ''
-        if [ `tty` = "/dev/tty1" -a $XDG_RUNTIME_DIR ]; then
-          echo 'Starting Niri...'
-          exec uwsm start niri-uwsm.desktop
-        elif [ `tty` = "/dev/tty6" ]; then
+        if [ `tty` = "/dev/tty6" ]; then
           clear
         fi
       '';
@@ -94,10 +91,7 @@
     autologin = {
       enable = true;
       user = username;
-      ttys = [
-        1
-        6
-      ];
+      ttys = [ 6 ];
     };
 
     gpg.enable = true;
diff --git a/modules/desktop/wm/niri/config.nix b/modules/desktop/wm/niri/config.nix
index 40fba70..84e83a1 100644
--- a/modules/desktop/wm/niri/config.nix
+++ b/modules/desktop/wm/niri/config.nix
@@ -92,11 +92,6 @@
         "-i"
         (toString ./wallpaper.png)
       ]
-      [
-        "${lib.getExe pkgs.wl-clip-persist}"
-        "--clipboard"
-        "regular"
-      ]
       [
         "wl-paste"
         "--type"
diff --git a/modules/desktop/wm/niri/default.nix b/modules/desktop/wm/niri/default.nix
index 6c3e8f5..d090827 100644
--- a/modules/desktop/wm/niri/default.nix
+++ b/modules/desktop/wm/niri/default.nix
@@ -2,6 +2,7 @@ args@{
   lib,
   config,
   pkgs,
+  username,
   ...
 }:
 let
@@ -40,27 +41,25 @@ in
         xdg-desktop-portal-gnome
       ];
     };
-    programs.uwsm = {
+    programs.niri = {
       enable = true;
-      waylandCompositors = {
-        niri = {
-          prettyName = "niri";
-          comment = "Niri compositor managed by UWSM";
-          binPath = pkgs.writeShellScript "niri-session" ''
-            ${lib.getExe pkg} --session
-          '';
-        };
+      package = pkg;
+    };
+    services.displayManager = {
+      autoLogin = {
+        enable = true;
+        user = username;
+      };
+      sddm = {
+        enable = true;
+        wayland.enable = true;
+        extraPackages = [ pkgs.where-is-my-sddm-theme ];
       };
     };
     my.home = {
-      programs.niri = {
-        enable = true;
-        package = pkg;
-      };
       home.packages = with pkgs; [
         wlr-randr
         wl-clipboard
-        wl-clip-persist
         cliphist
         swaynotificationcenter
         nemo-with-extensions