4 files changed, 19 insertions, 29 deletions
diff --git a/systems/alnus/config.nix b/systems/alnus/config.nix
index 8af12fe..a3d1e9a 100644
--- a/systems/alnus/config.nix
+++ b/systems/alnus/config.nix
@@ -1,6 +1,7 @@
 { config, lib, pkgs, ... }: {
   imports = [
     ../../configs/hw/x220.nix
+    ../../configs/earlyoom.nix
     ../../configs/exim-retiolum.nix
     ../../configs/retiolum.nix
   ];
@@ -48,12 +49,6 @@
 
   networking.networkmanager.enable = true;
 
-  services.earlyoom.enable = true;
-  services.earlyoom.freeMemThreshold = 5;
-  systemd.services.earlyoom.environment.EARLYOOM_ARGS = toString [
-    "--prefer '^(Web Content|Privileged Cont)$'" # firefox tabs
-  ];
-
   services.libinput.enable = false;
 
   services.xserver = {
diff --git a/systems/mu/config.nix b/systems/mu/config.nix
index b3d3e99..f9debe4 100644
--- a/systems/mu/config.nix
+++ b/systems/mu/config.nix
@@ -38,8 +38,6 @@
   nixpkgs.config.allowUnfree = true;
   hardware.opengl.driSupport32Bit = true;
 
-  hardware.pulseaudio.enable = true;
-
   hardware.enableRedistributableFirmware = true;
 
   boot.loader.efi.canTouchEfiVariables = true;
@@ -98,6 +96,8 @@
     pkgs.xorg.fontschumachermisc
   ];
 
+  services.pulseaudio.enable = true;
+
   services.xserver.enable = true;
   services.xserver.xkb.layout = "de";
   services.xserver.xkb.options = "eurosign:e";
diff --git a/systems/querel/config.nix b/systems/querel/config.nix
index 08ad71c..f2ce280 100644
--- a/systems/querel/config.nix
+++ b/systems/querel/config.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }: {
   imports = [
-   ../../configs/retiolum.nix
+    ../../configs/retiolum.nix
   ];
 
   krebs.build.host = config.krebs.hosts.querel;
@@ -11,7 +11,6 @@
     allowDiscards = true;
     device = "/dev/sda2";
   };
-  boot.kernelModules = [ "kvm-intel" ];
   boot.loader = {
     efi.canTouchEfiVariables = true;
     systemd-boot.enable = true;
@@ -20,15 +19,9 @@
   environment.systemPackages = [
     pkgs.firefox
     pkgs.gimp
-    pkgs.kate
+    pkgs.kdePackages.kate
     pkgs.libreoffice
-    (pkgs.pidgin.override {
-      plugins = [ pkgs.pidgin-otr ];
-    })
     pkgs.nsxiv
-    pkgs.texlive.combined.scheme-full
-    pkgs.vim
-    pkgs.xsane
     pkgs.zathura
   ];
 
@@ -48,8 +41,8 @@
     };
   };
 
+  hardware.cpu.intel.updateMicrocode = true;
   hardware.enableRedistributableFirmware = true;
-  hardware.pulseaudio.enable = true;
 
   i18n.defaultLocale = "de_DE.UTF-8";
 
@@ -58,19 +51,13 @@
   programs.ssh.startAgent = false;
 
   services.xserver.enable = true;
-  services.xserver.layout = "de";
-  services.xserver.xkbOptions = "eurosign:e";
+  services.xserver.xkb.layout = "de";
+  services.xserver.xkb.options = "eurosign:e";
 
-  services.xserver.libinput.enable = false;
-  services.xserver.synaptics = {
-    enable = true;
-    twoFingerScroll = true;
-  };
-
-  services.xserver.desktopManager.plasma5.enable = true;
+  services.desktopManager.plasma6.enable = true;
 
-  services.xserver.displayManager.autoLogin.enable = true;
-  services.xserver.displayManager.autoLogin.user = "itak";
+  services.displayManager.autoLogin.user = "itak";
+  services.displayManager.defaultSession = "plasma";
 
   users.users.itak = {
     inherit (config.krebs.users.itak) home uid;
@@ -81,4 +68,6 @@
       "networkmanager"
     ];
   };
+
+  system.stateVersion = "25.11";
 }
diff --git a/systems/xu/config.nix b/systems/xu/config.nix
index ee7ae46..abf433c 100644
--- a/systems/xu/config.nix
+++ b/systems/xu/config.nix
@@ -4,6 +4,7 @@
   imports = [
     ../../configs/autotether.nix
     ../../configs/hw/x220.nix
+    ../../configs/earlyoom.nix
     ../../configs/exim-retiolum.nix
     ../../configs/gitconfig.nix
     ../../configs/gitrepos.nix
@@ -140,8 +141,13 @@
     gptfdisk
   ];
 
+  networking.usePredictableInterfaceNames = false;
+
   networking.wireless.enable = true;
 
+  networking.interfaces.eth0.useDHCP = true;
+  networking.interfaces.eth0.wakeOnLan.enable = true;
+
   #services.bitlbee.enable = true;
   #services.tor.client.enable = true;
   #services.tor.enable = true;