update

[flake_thinkpad] / configuration.nix

diff --git a/configuration.nix b/configuration.nix
index 21a6ccf9c70731f583baff18a1bea9a5d9fc0c7c..5ab6712089182fc66769ae195faa84b4cdaa67e9 100644 (file)
--- a/configuration.nix
+++ b/configuration.nix
@@ -129,6 +129,8 @@ in
   # Services
   services = {
     displayManager = {
+      sddm.enable = true;
+      sddm.autoLogin.relogin = true;
       defaultSession = "xfce+i3";
     };
     desktopManager = {
@@ -138,24 +140,13 @@ in
       enable = true;
       
       displayManager = {
-        lightdm = {
-          enable = true;
-          greeters.gtk = {
-            theme = {
-              name = "Qogir-Dark";
-              package = pkgs.qogir-theme;
-            };
-            iconTheme = {
-              name = "Qogir-dark";
-              package = pkgs.qogir-icon-theme;
-            };
-            cursorTheme = {
-              name = "volantes_light_cursors";
-              package = pkgs.volantes-cursors;
-            };
-          };
-          background = "${wallpaper}";
-        };
+        session = [
+          {
+            manage = "desktop";
+            name = "plasma-i3wm";
+            start = "KDEWM=${pkgs.i3}/bin/i3 /run/current-system/sw/bin/startplasma-x11";
+          }
+        ];
       };
 
       desktopManager = {
@@ -167,8 +158,8 @@ in
         };
       };
       windowManager.i3.enable = true;
-      windowManager.awesome.enable = true;
-      windowManager.herbstluftwm.enable = true;
+      # windowManager.awesome.enable = true;
+      # windowManager.herbstluftwm.enable = true;
 
       xkb = {
         layout = "de";
@@ -181,16 +172,6 @@ in
     };
   };
 
-  systemd.user.services.plasma-i3wm = {
-    wantedBy = [ "plasma-workspace-x11.target" ];
-    description = "Launch Plasma with i3";
-    before = [ "plasma-workspace-x11.target" ];
-    environment = lib.mkForce {};
-    serviceConfig = {
-      ExecStart = "${pkgs.i3}/bin/i3";
-      Restart = "on-failure";
-    };
-  };
   systemd.user.services.plasma-kwin_x11.enable = false;
 
   services.autorandr = {
@@ -359,6 +340,7 @@ in
     };
     users = {
       "ps" = import ./home-ps.nix;
+      "root" = { home.stateVersion = "24.05"; };
     };
     sharedModules = [
       (import ./home-common.nix)
@@ -395,6 +377,8 @@ in
     asciinema asciinema-agg
     shellify
     deno
+    typst
+    jdt-language-server
 
     scrcpy