X-Git-Url: https://gitweb.ps.run/flake_thinkpad/blobdiff_plain/ac72bd3ed5bd39a5c77b43469a5274dad9a7ef95..0f3e430dea3955609d5bafeffa13370110397007:/configuration.nix

diff --git a/configuration.nix b/configuration.nix
index 4a277d1..a5eda85 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -22,6 +22,7 @@ in
       inputs.home-manager.nixosModules.default
       inputs.extra-container.nixosModules.default
       inputs.microvm.nixosModules.host
+      inputs.fakwin.nixosModules.default
     ];
 
   # Bootloader.
@@ -129,44 +130,38 @@ in
   # Services
   services = {
     displayManager = {
+      sddm.enable = true;
+      sddm.autoLogin.relogin = true;
       defaultSession = "xfce+i3";
     };
+    desktopManager = {
+      plasma6.enable = true;
+    };
     xserver = {
       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 = {
         xterm.enable = false;
+        wallpaper.mode = "center";
         xfce = {
           enable = true;
           noDesktop = true;
           enableXfwm = false;
         };
-	plasma6.enable = true;
       };
       windowManager.i3.enable = true;
-      windowManager.awesome.enable = true;
-      windowManager.herbstluftwm.enable = true;
+      # windowManager.awesome.enable = true;
+      # windowManager.herbstluftwm.enable = true;
 
       xkb = {
         layout = "de";
@@ -179,17 +174,8 @@ in
     };
   };
 
-  systemd.user.services.plasma-i3wm = {
-    wantedBy = [ "plasma-workspace-x11.target" ];
-    description = "Launch Plasma with i3wm.";
-    environment = lib.mkForce {};
-    serviceConfig = {
-      ExecStart = "${pkgs.i3}/bin/i3";
-      Restart = "on-failure";
-    };
-  };
-  systemd.user.services.plasma-workspace-x11.after = [ "plasma-i3wm.target" ];
   systemd.user.services.plasma-kwin_x11.enable = false;
+  services.fakwin.enable = true;
 
   services.autorandr = {
     enable = true;
@@ -356,8 +342,12 @@ in
       inherit wallpaper;
     };
     users = {
-      "ps" = import ./home.nix;
+      "ps" = import ./home-ps.nix;
+      "root" = { home.stateVersion = "24.05"; };
     };
+    sharedModules = [
+      (import ./home-common.nix)
+    ];
   };
 
   # Enable automatic login for the user.
@@ -389,6 +379,10 @@ in
     entr
     asciinema asciinema-agg
     shellify
+    deno
+    typst
+    jdt-language-server
+    google-java-format
 
     scrcpy
 
@@ -417,6 +411,8 @@ in
 
   programs.xfconf.enable = true;
   programs.nix-ld.enable = true;
+  programs.direnv.enable = true;
+  programs.direnv.nix-direnv.enable = true;
 
   services.fwupd.enable = true;