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

diff --git a/configuration.nix b/configuration.nix
index 4a277d1..21a6ccf 100644
--- 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,14 @@ in
 
   systemd.user.services.plasma-i3wm = {
     wantedBy = [ "plasma-workspace-x11.target" ];
-    description = "Launch Plasma with i3wm.";
+    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-workspace-x11.after = [ "plasma-i3wm.target" ];
   systemd.user.services.plasma-kwin_x11.enable = false;
 
   services.autorandr = {
@@ -356,8 +358,11 @@ in
       inherit wallpaper;
     };
     users = {
-      "ps" = import ./home.nix;
+      "ps" = import ./home-ps.nix;
     };
+    sharedModules = [
+      (import ./home-common.nix)
+    ];
   };
 
   # Enable automatic login for the user.
@@ -389,6 +394,7 @@ in
     entr
     asciinema asciinema-agg
     shellify
+    deno
 
     scrcpy