diff options
| -rw-r--r-- | flake.nix | 13 | ||||
| -rw-r--r-- | machines/dragon.nix | 17 |
2 files changed, 27 insertions, 3 deletions
@@ -5,22 +5,29 @@ outputs = { self, nixpkgs, nixpkgs_unstable }: { nixosConfigurations = let - mkConfig = { hostName, module }: { + mkConfig = { hostName, module ? (./. + "/machines/${hostName}.nix") }: { name = hostName; value = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = - [ module - ({...}: { + [ + module + ({config, pkgs, ...}: { # Let 'nixos-version --json' know about the Git revision # of this flake. system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; + + # Add unstable packages. + nixpkgs.overlays = [ + (final: prev: { unstable = nixpkgs_unstable.legacyPackages."x86_64-linux"; }) + ]; }) ]; }; }; myMachines = [ { hostName = "pincer"; module = ./machines/x1-pincer.nix; } + { hostName = "dragon"; } ]; in builtins.listToAttrs (map mkConfig myMachines); diff --git a/machines/dragon.nix b/machines/dragon.nix index b613998..0baccad 100644 --- a/machines/dragon.nix +++ b/machines/dragon.nix @@ -131,4 +131,21 @@ in }; system.stateVersion = lib.mkForce "17.09"; + + # hardware-configuration.nix + boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "uhci_hcd" "xhci_pci" "usb_storage" "sd_mod" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKEXU9X-part3"; + fsType = "btrfs"; + options = [ "subvol=system/dragon-nixos,device=/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKHV0LS-part3,device=/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKEXU9X-part3,degraded" ]; + }; + + swapDevices = [ ]; + + nix.maxJobs = lib.mkDefault 8; + powerManagement.cpuFreqGovernor = "ondemand"; + hardware.enableRedistributableFirmware = lib.mkDefault true; } |