chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move boot configuration to hardware.nix

Browse source
This commit is contained in:
Charlotte Van Petegem 2020-05-23 10:20:55 +02:00
parent a11a25e38c
commit 8f69deca1e
4 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
machines/kholinar/default.nix
View file

@ -11,14 +11,6 @@
../../profiles/graphical/default.nix ../../profiles/graphical/default.nix
]; ];
# Use the systemd-boot EFI boot loader.
boot = {
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
};
networking = { networking = {
hostId = "3cc1a4b2"; hostId = "3cc1a4b2";
hostName = "kholinar"; hostName = "kholinar";

20
machines/kholinar/hardware.nix
View file

@ -1,15 +1,21 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; boot = {
boot.initrd.kernelModules = [ "i915" ]; # Use the systemd-boot EFI boot loader.
boot.kernelModules = [ "kvm-intel" ]; loader = {
boot.extraModulePackages = [ ]; systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
initrd = {
availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
kernelModules = ["i915"];
};
kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ];
};
fileSystems."/" = { fileSystems."/" = {
device = "rpool/local/root"; device = "rpool/local/root";

5
machines/oldtown/default.nix
View file

@ -11,11 +11,6 @@
../../profiles/graphical/default.nix ../../profiles/graphical/default.nix
]; ];
boot.loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
networking.hostName = "oldtown"; networking.hostName = "oldtown";
time.timeZone = "Europe/Brussels"; time.timeZone = "Europe/Brussels";

16
machines/oldtown/hardware.nix
View file

@ -3,10 +3,18 @@
{ {
imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ]; imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot = {
boot.initrd.kernelModules = [ "i915" ]; loader = {
boot.kernelModules = [ "kvm-intel" ]; systemd-boot.enable = true;
boot.extraModulePackages = [ ]; efi.canTouchEfiVariables = true;
};
initrd = {
availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
kernelModules = [ "i915" ];
};
kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ];
};
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/e4b7eae2-546d-412b-9258-389315f4b835"; device = "/dev/disk/by-uuid/e4b7eae2-546d-412b-9258-389315f4b835";