update

[flake_thinkpad] / configuration.nix

diff --git a/configuration.nix b/configuration.nix
index c7c77d1c5dcb272f5f285430bb5e7ff6f9924dd4..5ab6712089182fc66769ae195faa84b4cdaa67e9 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.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/";
 
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";


@@ -129,30 +129,24 @@ in
   # Services
   services = {
     displayManager = {
   # Services
   services = {
     displayManager = {

+      sddm.enable = true;
+      sddm.autoLogin.relogin = true;

       defaultSession = "xfce+i3";
     };
       defaultSession = "xfce+i3";
     };

+    desktopManager = {
+      plasma6.enable = true;
+    };

     xserver = {
       enable = true;
       
       displayManager = {
     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 = {
       };
 
       desktopManager = {


@@ -164,7 +158,8 @@ in
         };
       };
       windowManager.i3.enable = true;
         };
       };
       windowManager.i3.enable = true;

-      windowManager.awesome.enable = true;
+      # windowManager.awesome.enable = true;
+      # windowManager.herbstluftwm.enable = true;

 
       xkb = {
         layout = "de";
 
       xkb = {
         layout = "de";


@@ -177,6 +172,8 @@ in
     };
   };
 
     };
   };
 

+  systemd.user.services.plasma-kwin_x11.enable = false;
+

   services.autorandr = {
     enable = true;
     matchEdid = true;
   services.autorandr = {
     enable = true;
     matchEdid = true;


@@ -194,7 +191,7 @@ in
     configDir = "/home/ps/.config/syncthing";
   };
   
     configDir = "/home/ps/.config/syncthing";
   };
   

-  services.auto-cpufreq.enable = true;
+  # services.auto-cpufreq.enable = true;

   services.auto-cpufreq.settings = {
     battery = {
        governor = "powersave";
   services.auto-cpufreq.settings = {
     battery = {
        governor = "powersave";


@@ -279,7 +276,7 @@ in
   # Enable Bluetooth
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = false;
   # 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;
 
   # Enable sound with pipewire.
   services.pulseaudio.enable = false;


@@ -342,8 +339,12 @@ in
       inherit wallpaper;
     };
     users = {
       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.
   };
 
   # Enable automatic login for the user.


@@ -375,6 +376,9 @@ in
     entr
     asciinema asciinema-agg
     shellify
     entr
     asciinema asciinema-agg
     shellify

+    deno
+    typst
+    jdt-language-server

 
     scrcpy
 
 
     scrcpy
 


@@ -390,7 +394,7 @@ in
     # xfce plugins
     xfce.xfce4-panel
     xfce.xfce4-pulseaudio-plugin
     # 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
     xfce.xfce4-notes-plugin
     # xfce.xfce4-timer-plugin
     # xfce.xfce4-windowck-plugin