1
 2
 3
 4
 5
 6
 7
 8
 9
10

diff --git a/apps/de/default.nix b/apps/de/default.nix
index d5ce532f61d6f008683fba3031c410c49978c57b..2901424a24a04399e82b967901bdea5441f85451 100644
--- a/apps/de/default.nix
+++ b/apps/de/default.nix
@@ -24,5 +24,4 @@         monospace-font-name = "MonaspiceAr Nerd Font Regular 10";
         color-scheme = "prefer-dark";
       };
     };
-
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49

diff --git a/machines/common/gui/default.nix b/machines/common/gui/default.nix
index 907b59f29e089434d6f24f1494ed9b0eeb4546c4..2249c1b171c40ae91d898342e13e897e640a886c 100644
--- a/machines/common/gui/default.nix
+++ b/machines/common/gui/default.nix
@@ -4,6 +4,8 @@   imports = [ ../nogui ];
 
   security = {
     rtkit.enable = true;
+    polkit.enable = true;
+    pam.services.swaylock = { };
   };
   services = {
     pipewire = {
@@ -12,15 +14,15 @@       pulse.enable = true;
       alsa.enable = true;
     };
     pulseaudio.enable = false;
-    xserver = {
+    displayManager.sddm = {
       enable = true;
-      displayManager.lightdm.enable = true;
-      desktopManager.cinnamon.enable = true;
-      xkb = {
-        layout = "us";
-        variant = "";
-      };
+      wayland.enable = true;
     };
+    gnome.gnome-keyring.enable = true;
+  };
+  programs = {
+    niri.enable = true;
+    waybar.enable = true;
   };
   fonts.packages = with pkgs.nerd-fonts; [
     hack
@@ -28,5 +30,11 @@     iosevka
     jetbrains-mono
     monaspace
   ];
-  environment.systemPackages = [ pkgs.tailscale-systray ];
+  environment.systemPackages = with pkgs; [
+    tailscale-systray
+    fuzzel
+    swaylock
+    mako
+    swayidle
+  ];
 }