Switch kernel from xanmod to latest

4 files changed, 14 insertions, 12 deletions

diff --git a/configuration.nix b/configuration.nix
index 5598154..ed8faf8 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -44,7 +44,6 @@
   services.blueman.enable = false;
 
   # Enable sound.
-  # sound.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
@@ -59,7 +58,7 @@
     hostName = "smartfridge";
     firewall = {
       enable = true;
-      allowedTCPPorts = [ 3000 3001 ];
+      allowedTCPPorts = [ 3000 3001 8081 ];
       allowedUDPPorts = [ 41641 ];
     };
     nameservers = [ "100.100.100.100" "8.8.8.8" "1.1.1.1" ];
@@ -70,10 +69,6 @@
       127.0.0.1       field.shape-e2e.com
     '';
   };
-  services.tailscale = {
-    enable = true;
-    openFirewall = true;
-  };
 
   services.atd.enable = true;
 
diff --git a/hardware/thinkpad-e14/default.nix b/hardware/thinkpad-e14/default.nix
index a3def9d..4dd4846 100644
--- a/hardware/thinkpad-e14/default.nix
+++ b/hardware/thinkpad-e14/default.nix
@@ -4,10 +4,9 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  services.fwupd.enable = true;
+  # services.fwupd.enable = true;
 
-  # boot.kernelPackages = pkgs.linuxPackages_6_9;
-  boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.initrd = {
     availableKernelModules = [
       "xhci_pci"
@@ -42,6 +41,10 @@
     "acpi_backlight=native"
     "i915.enable_dpcd_backlight=0"
     "i915.enable_guc=2"
+    "i915.enable_psr=0"
+    "i915.enable_dc=0"
+    # "nomodeset"
+    # "i915.modeset=0"
     # "acpi_backlight=vendor"
     # "acpi_backlight=intel_backlight"
     # "i915.force_probe=46a8"
@@ -97,14 +100,13 @@
       libvdpau-va-gl
       intel-gmmlib
       vulkan-tools
-      mesa.drivers
+      mesa
     ];
   };
   environment.variables = {
     VDPAU_DRIVER = "va_gl";
     LIBVA_DRIVER_NAME = "iHD";
   };
-  # services.xserver.videoDrivers = [ "intel" ];
 
   # Bootloader
   boot.loader = {
diff --git a/modules/secfix/default.nix b/modules/secfix/default.nix
index 0fef70a..21d3d10 100644
--- a/modules/secfix/default.nix
+++ b/modules/secfix/default.nix
@@ -1,4 +1,4 @@
-{ config , lib , pkgs , ... }:
+{ config, lib, pkgs, ... }:
 let
   secfix-agent = pkgs.stdenv.mkDerivation {
     pname = "secfix-agent";
diff --git a/modules/work.nix b/modules/work.nix
index 4a3468c..6e542df 100644
--- a/modules/work.nix
+++ b/modules/work.nix
@@ -4,5 +4,10 @@
     ./secfix/default.nix
   ];
 
+  services.tailscale = {
+    enable = true;
+    openFirewall = true;
+  };
+
   services.secfix.enable = true;
 }