diff --git a/system/kernighan/kernighan-hardware.nix b/system/kernighan/kernighan-hardware.nix index d493d49..faf72c0 100644 --- a/system/kernighan/kernighan-hardware.nix +++ b/system/kernighan/kernighan-hardware.nix @@ -1,24 +1,38 @@ +# 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, ... }: { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" "virtio_scsi" "usbhid" "sr_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-label/NIXOS_SD"; - fsType = "ext4"; + { device = "/dev/disk/by-label/nixos"; + fsType = "btrfs"; }; - swapDevices = [ ]; + fileSystems."/boot" = + { device = "/dev/disk/by-label/boot"; + fsType = "vfat"; + }; + swapDevices = + [ { device = "/dev/disk/by-label/swap"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; } diff --git a/system/kernighan/kernighan.nix b/system/kernighan/kernighan.nix index 21c747a..b42159f 100644 --- a/system/kernighan/kernighan.nix +++ b/system/kernighan/kernighan.nix @@ -17,18 +17,6 @@ }; }; - systemd.network.enable = true; - systemd.network.networks."10-wan" = { - matchConfig.Name = "ens3"; # either ens3 (amd64) or enp1s0 (arm64) - networkConfig.DHCP = "ipv4"; - address = [ - "2a01:4f9:c012:72e3::/64" - ]; - routes = [ - { routeConfig.Gateway = "fe80::1"; } - ]; - }; - boot = { loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true;