...

5 files changed, 11 insertions, 18 deletions

diff --git a/hosts/eostre/default.nix b/hosts/eostre/default.nix
index fd4b15f2..d4113024 100644
--- a/hosts/eostre/default.nix
+++ b/hosts/eostre/default.nix
@@ -37,14 +37,10 @@ with lib;
         powerManagement.enable = true;
       };
 
-      opengl.enable = true;
+      graphics.enable = true;
     };
 
-    environment.etc."machine-id".text = "f457b21333f1491e916521151ff5d468";
-
     networking = {
-      hostId = "f457b213";
-
       domain = "lan.yggdrasil";
       search = [ "lan.yggdrasil" "yggdrasil" ];
 
@@ -83,19 +79,14 @@ with lib;
       ];
     };
 
-
-    services.xserver = {
+    services.displayManager.sddm = {
       enable = true;
-      displayManager.sddm = {
-        enable = true;
-        settings = {
-          Users.HideUsers = "gkleen";
-        };
+      wayland.enable = true;
+      settings = {
+        Users.HideUsers = "gkleen";
       };
-      desktopManager.plasma5.enable = true;
-
-      videoDrivers = [ "nvidia" ];
     };
+    services.desktopManager.plasma6.enable = true;
 
 
     services.openssh = {
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 6214569a..a57c454c 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -60,7 +60,7 @@ in {
 
       plymouth.enable = true;
 
-      kernelPackages = pkgs.linuxPackages_latest;
+      kernel.llvm.kernel = pkgs.linuxKernel.kernels.linux_latest;
       kernelPatches = [
         { name = "edac-config";
           patch = null;
diff --git a/hosts/surtr/default.nix b/hosts/surtr/default.nix
index 9d3101c0..63beece3 100644
--- a/hosts/surtr/default.nix
+++ b/hosts/surtr/default.nix
@@ -22,7 +22,6 @@ with lib;
         device = "/dev/vda";
       };
 
-
       tmp.useTmpfs = true;
 
       zfs.devNodes = "/dev"; # /dev/vda2 does not show up in /dev/disk/by-id
diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix
index c993bb18..58cb76d9 100644
--- a/hosts/surtr/email/default.nix
+++ b/hosts/surtr/email/default.nix
@@ -355,7 +355,10 @@ in {
           maxproc = 0;
           args = [
             "-o" "header_checks=pcre:${pkgs.writeText "header_checks_submission" ''
+              if /^Received: /
+              !/by surtr\.yggdrasil\.li/ STRIP
               /^Received: from [^ ]+ \([^ ]+ [^ ]+\)\s+(.*)$/ REPLACE Received: $1
+              endif
             ''}"
           ];
         };
diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix
index 7da17e6f..547572c6 100644
--- a/hosts/vidhar/default.nix
+++ b/hosts/vidhar/default.nix
@@ -136,7 +136,7 @@ with lib;
       wantedBy = ["basic.target"];
       serviceConfig = {
         ExecStart = pkgs.writeShellScript "limit-pstate-start" ''
-          echo 50 > /sys/devices/system/cpu/intel_pstate/max_perf_pct
+          echo 40 > /sys/devices/system/cpu/intel_pstate/max_perf_pct
         '';
         RemainAfterExit = true;
         ExecStop = pkgs.writeShellScript "limit-pstate-stop" ''