diff --git a/flake.lock b/flake.lock index cb0b14a..494163d 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1656933710, - "narHash": "sha256-SVG8EqY1OTJWBRY4hpct2ZR2Rk0L8hCFkug3m0ABoZE=", + "lastModified": 1662714967, + "narHash": "sha256-IOTq5tAGGmBFj7tQbkcyLE261JUeTUucEE3p0WLZ4qM=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "3bf48d3587d3f34f745a19ebc968b002ef5b5c5a", + "rev": "1fec8fda86dac5701146c77d5f8a414b14ed1ff6", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660842467, - "narHash": "sha256-lSer61lI5X61/3zjMu4OSUqdKSCW2jM1rU6B3WLBOj4=", + "lastModified": 1662874738, + "narHash": "sha256-kG29aU9f5UTWhPf/QEh5LanDmqqbbcErWYAcPptC/Cg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b9f4bb4e1125a2b9734b05a4c35ff388cabec05", + "rev": "dd1f4d982445a7d1b1869baa42f8f0f9bc606714", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1660819943, - "narHash": "sha256-TRZV/mlW1eYuojqDC3ueYWj7jsTKXJCtyMLNYX/Ybtw=", + "lastModified": 1662821606, + "narHash": "sha256-Z9z9iSH+tgJ0iyRcBfEQRwELgjnhpVXsktiWiFe3SuY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8ea014acc33da95ea56c902229957d8225005163", + "rev": "93a0067a9c85c17764f7755947e6ecf52dc47d8a", "type": "github" }, "original": { diff --git a/system/rainbowdash/boot-config.nix b/system/rainbowdash/boot-config.nix index 5e0b1dd..34b9c3e 100644 --- a/system/rainbowdash/boot-config.nix +++ b/system/rainbowdash/boot-config.nix @@ -3,7 +3,6 @@ { boot = { kernelPackages = pkgs.linuxPackages_latest; - kernelParams = [ "mem_sleep_default=deep" ]; kernel.sysctl."vm.swappiness" = 5; cleanTmpDir = true; blacklistedKernelModules = [ "psmouse" ]; diff --git a/system/rainbowdash/default.nix b/system/rainbowdash/default.nix index 314b731..0569282 100644 --- a/system/rainbowdash/default.nix +++ b/system/rainbowdash/default.nix @@ -12,7 +12,9 @@ ../../sets/1password.nix ../../sets/workstation.nix ../../sets/krb5.nix - inputs.nixos-hardware.nixosModules.dell-xps-13-9380 + inputs.nixos-hardware.nixosModules.common-cpu-intel + inputs.nixos-hardware.nixosModules.common-pc-laptop + inputs.nixos-hardware.nixosModules.common-pc-laptop-acpi_call ]; boot.supportedFilesystems = [ "nfs4" ]; @@ -39,6 +41,7 @@ ''; }; + boot.blacklistedKernelModules = [ "psmouse" ]; services.thermald.enable = true; networking.domain = "manehattan.artem.ist";