(no commit message)

[flake_thinkpad] / configuration.nix

diff --git a/configuration.nix b/configuration.nix
index d857f19b6f9f666eece9ca7ce2861441562a0a70..73a06b4f4f0eac2440db1ca625042d9d103ac753 100644 (file)
--- a/configuration.nix
+++ b/configuration.nix
@@ -131,6 +131,9 @@ in
     displayManager = {
       defaultSession = "xfce+i3";
     };
+    desktopManager = {
+      plasma6.enable = true;
+    };
     xserver = {
       enable = true;
       
@@ -162,7 +165,6 @@ in
           noDesktop = true;
           enableXfwm = false;
         };
-       plasma6.enable = true;
       };
       windowManager.i3.enable = true;
       windowManager.awesome.enable = true;
@@ -181,14 +183,15 @@ in
 
   systemd.user.services.plasma-i3wm = {
     wantedBy = [ "plasma-workspace-x11.target" ];
-    description = "Launch Plasma with i3wm.";
+    before = [ "plasma-workspace-x11.target" ];
+    description = "Launch Plasma with i3";
     environment = lib.mkForce {};
     serviceConfig = {
       ExecStart = "${pkgs.i3}/bin/i3";
-      Restart = "no";
+      Restart = "on-failure";
     };
   };
-  systemd.user.services.plasma-workspace-x11.after = [ "plasma-i3wm.target" ];
+  # systemd.user.services.plasma-workspace-x11.after = [ "plasma-i3wm.target" ];
   systemd.user.services.plasma-kwin_x11.enable = false;
 
   services.autorandr = {
@@ -356,8 +359,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 +396,7 @@ in
     entr
     asciinema asciinema-agg
     shellify
+    deno
 
     scrcpy