update

[flake_thinkpad] / configuration.nix

diff --git a/configuration.nix b/configuration.nix
index c7c77d1c5dcb272f5f285430bb5e7ff6f9924dd4..ae7d07e82a2d789ef5e8dd09d12dd5a4a7ad6fa3 100644 (file)
--- a/configuration.nix
+++ b/configuration.nix
@@ -53,7 +53,7 @@ in
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   nix.settings.download-buffer-size = 500000000;
-  nix.config.trusted-users = ["root" "ps"];
+  nix.settings.trusted-users = ["root" "ps"];
 
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
@@ -131,6 +131,9 @@ in
     displayManager = {
       defaultSession = "xfce+i3";
     };
+    desktopManager = {
+      plasma6.enable = true;
+    };
     xserver = {
       enable = true;
       
@@ -165,6 +168,7 @@ in
       };
       windowManager.i3.enable = true;
       windowManager.awesome.enable = true;
+      windowManager.herbstluftwm.enable = true;
 
       xkb = {
         layout = "de";
@@ -177,6 +181,19 @@ 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-workspace-x11.after = [ "plasma-i3wm.target" ];
+  systemd.user.services.plasma-kwin_x11.enable = false;
+
   services.autorandr = {
     enable = true;
     matchEdid = true;
@@ -194,7 +211,7 @@ in
     configDir = "/home/ps/.config/syncthing";
   };
   
-  services.auto-cpufreq.enable = true;
+  # services.auto-cpufreq.enable = true;
   services.auto-cpufreq.settings = {
     battery = {
        governor = "powersave";
@@ -279,7 +296,7 @@ in
   # Enable Bluetooth
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = false;
-  services.blueman.enable = true;
+  # services.blueman.enable = true;
 
   # Enable sound with pipewire.
   services.pulseaudio.enable = false;
@@ -342,8 +359,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.
@@ -375,6 +395,7 @@ in
     entr
     asciinema asciinema-agg
     shellify
+    deno
 
     scrcpy
 
@@ -390,7 +411,7 @@ in
     # xfce plugins
     xfce.xfce4-panel
     xfce.xfce4-pulseaudio-plugin
-      # xfce.xfce4-verve-plugin
+    # xfce.xfce4-verve-plugin
     xfce.xfce4-notes-plugin
     # xfce.xfce4-timer-plugin
     # xfce.xfce4-windowck-plugin