From 98abace7820db507d7d15e81d50893ba03dbab38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vili=20Sinerv=C3=A4?= <vili.m.sinerva@gmail.com>
Date: Sun, 16 Feb 2025 22:58:44 +0200
Subject: [PATCH] Lithium sway conf

---
 desktop-sway.nix              | 25 +++++++++++--------------
 program-config-files/sway.nix |  3 +--
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/desktop-sway.nix b/desktop-sway.nix
index e0cddc1..33587b2 100644
--- a/desktop-sway.nix
+++ b/desktop-sway.nix
@@ -36,13 +36,19 @@
   ];
 
   services = {
-    displayManager = {
-      sddm = {
-        enable = true;
-        wayland.enable = true;
+    greetd = {
+      enable = true;
+      settings = {
+        initial_session = {
+          command = "${pkgs.sway}/bin/sway";
+          user = "vili";
+        };
+        default_session = {
+          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway";
+          user = "greeter";
+        };
       };
     };
-
     printing.enable = true;
     avahi = {
       enable = true;
@@ -51,15 +57,6 @@
     };
   };
 
-  programs.uwsm = {
-    enable = true;
-    waylandCompositors.sway = {
-      prettyName = "Sway";
-      comment = "Sway compositor managed by UWSM";
-      binPath = "/run/current-system/sw/bin/sway";
-    };
-  };
-
   # rtkit is optional but recommended
   security.rtkit.enable = true;
   services.pipewire = {
diff --git a/program-config-files/sway.nix b/program-config-files/sway.nix
index ab75e13..82ed68e 100644
--- a/program-config-files/sway.nix
+++ b/program-config-files/sway.nix
@@ -114,14 +114,13 @@ let
     bindsym $mod+Return exec "alacritty --config-file ${alacritty-conf}"
     bindsym $mod+d exec --no-startup-id "rofi -theme 'Arc-Dark' -show combi -combi-modes 'run' -modes combi"
 
-    set $mode_system "(l)ock, (e)xit, (s)uspend, (h)ibernate, (r)eboot, (S)hutdown"
+    set $mode_system "(l)ock, (s)uspend, (h)ibernate, (r)eboot, (S)hutdown"
     bindsym $mod+Shift+p mode $mode_system
     mode $mode_system {
             bindsym l exec --no-startup-id swaylock, mode "default"
             bindsym s exec --no-startup-id "swaylock; systemctl suspend", mode "default"
             bindsym h exec --no-startup-id systemctl hibernate, mode "default"
             bindsym r exec --no-startup-id systemctl reboot, mode "default"
-            bindsym e exec --no-startup-id loginctl terminate-session self, mode "default"
             bindsym Shift+s exec --no-startup-id systemctl poweroff, mode "default"
             bindsym Return mode "default"
             bindsym Escape mode "default"