europa: switch back to nixos-hw for sleep magic

This commit is contained in:
Aaron Bieber 2023-12-15 07:19:42 -07:00
parent 1552820345
commit e5b79fcffd
No known key found for this signature in database
3 changed files with 23 additions and 2 deletions

View File

@ -139,6 +139,22 @@
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": {
"locked": {
"lastModified": 1702453208,
"narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1670751203, "lastModified": 1670751203,
@ -272,6 +288,7 @@
"gostart": "gostart", "gostart": "gostart",
"gqrss": "gqrss", "gqrss": "gqrss",
"microca": "microca", "microca": "microca",
"nixos-hardware": "nixos-hardware",
"peerix": "peerix", "peerix": "peerix",
"po": "po", "po": "po",
"pots": "pots", "pots": "pots",

View File

@ -30,6 +30,8 @@
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
microca = { microca = {
url = "github:qbit/microca"; url = "github:qbit/microca";
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";
@ -99,6 +101,7 @@
, xin-secrets , xin-secrets
, xintray , xintray
, simple-nixos-mailserver , simple-nixos-mailserver
, nixos-hardware
, ... , ...
} @ inputs: } @ inputs:
let let
@ -207,7 +210,9 @@
devShells.aarch64-darwin.default = xinlib.buildShell darwinPkgs; devShells.aarch64-darwin.default = xinlib.buildShell darwinPkgs;
nixosConfigurations = { nixosConfigurations = {
europa = buildSys "x86_64-linux" unstable [ ] "europa"; europa = buildSys "x86_64-linux" unstable [
nixos-hardware.nixosModules.framework-11th-gen-intel
] "europa";
pwntie = buildSys "x86_64-linux" stable [ ] "pwntie"; pwntie = buildSys "x86_64-linux" stable [ ] "pwntie";
stan = buildSys "x86_64-linux" unstable [ ] "stan"; stan = buildSys "x86_64-linux" unstable [ ] "stan";
weather = buildSys "aarch64-linux" stable [ ] "weather"; weather = buildSys "aarch64-linux" stable [ ] "weather";

View File

@ -117,7 +117,6 @@ in
}; };
kernelParams = [ kernelParams = [
"boot.shell_on_fail" "boot.shell_on_fail"
"acpi_osi=\"!Windows 2020\""
]; ];
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
}; };