qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flake: remove nixos-hardware

Browse Source
This commit is contained in:
Aaron Bieber 2023-11-15 07:26:57 -07:00
parent a287a58652
commit a96d6669db
No known key found for this signature in database
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock generated
View File

@ -109,18 +109,16 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1699701045, "lastModified": 1699997707,
"narHash": "sha256-mDzUXK7jNO/utInWpSWEX1NgEEunVIpJg+LyPsDTfy0=", "narHash": "sha256-ugb+1TGoOqqiy3axyEZpfF6T4DQUGjfWZ3Htry1EfvI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b689465d0c5d88e158e7d76094fca08cc0223aad", "rev": "5689f3ebf899f644a1aabe8774d4f37eb2f6c2f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "id": "nixos-hardware",
"ref": "master", "type": "indirect"
"repo": "nixos-hardware",
"type": "github"
} }
}, },
"peerix": { "peerix": {

8
flake.nix
View File

@ -19,8 +19,6 @@
inputs.sops-nix.follows = "sops-nix"; inputs.sops-nix.follows = "sops-nix";
}; };
nixos-hardware = { url = "github:NixOS/nixos-hardware/master"; };
#emacs-overlay = { #emacs-overlay = {
# url = "github:nix-community/emacs-overlay/d54a1521619daa37c9aa8c9e3362abb34e676007"; # url = "github:nix-community/emacs-overlay/d54a1521619daa37c9aa8c9e3362abb34e676007";
# inputs.nixpkgs.follows = "stable"; # inputs.nixpkgs.follows = "stable";
@ -203,9 +201,7 @@
devShells.aarch64-darwin.default = xinlib.buildShell darwinPkgs; devShells.aarch64-darwin.default = xinlib.buildShell darwinPkgs;
nixosConfigurations = { nixosConfigurations = {
europa = buildSys "x86_64-linux" unstable [ europa = buildSys "x86_64-linux" unstable [ ] "europa";
nixos-hardware.nixosModules.framework
] "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";
@ -213,8 +209,6 @@
faf = buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "faf"; faf = buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "faf";
box = buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "box"; box = buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "box";
#luna = buildSys "x86_64-linux" stable
# [ "${nixos-hardware}/common/cpu/intel" ] "luna";
h = buildSys "x86_64-linux" stable [ h = buildSys "x86_64-linux" stable [
./configs/hardened.nix ./configs/hardened.nix
gostart.nixosModule gostart.nixosModule

1
hosts/europa/default.nix
View File

@ -195,6 +195,7 @@ in
services.xinCA = { enable = false; }; services.xinCA = { enable = false; };
services = { services = {
fprintd.enable = true;
avahi = { avahi = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;

3
hosts/europa/hardware-configuration.nix
View File

@ -39,9 +39,10 @@
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware = { hardware = {
acpilight.enable = true;
bluetooth.enable = true;
cpu.intel.updateMicrocode = cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware; lib.mkDefault config.hardware.enableRedistributableFirmware;
bluetooth.enable = true;
rtl-sdr.enable = true; rtl-sdr.enable = true;
}; };
} }