about summary refs log tree commit diff
path: root/users/tazjin/nixos/tverskoy/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'users/tazjin/nixos/tverskoy/default.nix')
-rw-r--r--users/tazjin/nixos/tverskoy/default.nix14
1 files changed, 3 insertions, 11 deletions
diff --git a/users/tazjin/nixos/tverskoy/default.nix b/users/tazjin/nixos/tverskoy/default.nix
index c074fd9c5d70..006a27f9f20f 100644
--- a/users/tazjin/nixos/tverskoy/default.nix
+++ b/users/tazjin/nixos/tverskoy/default.nix
@@ -28,7 +28,7 @@ lib.fix (self: {
 
   tvl.cache.enable = true;
 
-  boot = rec {
+  boot = {
     initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
     initrd.kernelModules = [ ];
 
@@ -38,10 +38,9 @@ lib.fix (self: {
     '';
 
     # Install thinkpad modules for TLP
-    extraModulePackages = [ kernelPackages.acpi_call ];
+    extraModulePackages = [ pkgs.linuxPackages.acpi_call ];
 
-    kernelModules = [ "kvm-amd" "i2c_dev" ];
-    kernelPackages = pkgs.zfsUnstable.latestCompatibleLinuxPackages;
+    kernelModules = [ "acpi_call" "kvm-amd" "i2c_dev" ];
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;
   };
@@ -164,12 +163,5 @@ lib.fix (self: {
   # android stuff for hacking on Awful.apk
   programs.adb.enable = true;
 
-  # systemd-oomd seems to have been enabled by default around ~
-  # December 2022, and it's really into killing my X session as soon
-  # as I do anything stressful to the machine
-  systemd.services.systemd-oomd.enable = lib.mkForce false;
-
-  environment.systemPackages = [ pkgs.vulkan-tools ];
-
   system.stateVersion = "20.09";
 })