diff options
author | Kenny Ballou <kballou@devnulllabs.io> | 2019-10-30 22:11:58 -0600 |
---|---|---|
committer | Kenny Ballou <kballou@devnulllabs.io> | 2019-10-30 22:11:58 -0600 |
commit | 62cde3fae7fd261c9d0f3d942dec28a8b9e045d4 (patch) | |
tree | a9a9f94dd34e067124793a5e1abc0fe1f85e8336 /eligos | |
parent | 0d54b9630142daf6daa024205f0be46dcb0d8e08 (diff) | |
download | cfg.nix-62cde3fae7fd261c9d0f3d942dec28a8b9e045d4.tar.gz cfg.nix-62cde3fae7fd261c9d0f3d942dec28a8b9e045d4.tar.xz |
eligos: use generated hardware-configuration
Similar to f54116d ("phenex: use generated hardware-configuration", Wed
Oct 30 09:15:40 2019 -0600), we want to use the generated configuration
file instead of the currently saved one.
Signed-off-by: Kenny Ballou <kballou@devnulllabs.io>
Diffstat (limited to 'eligos')
-rw-r--r-- | eligos/configuration.nix | 2 | ||||
-rw-r--r-- | eligos/hardware-configuration.nix | 60 |
2 files changed, 1 insertions, 61 deletions
diff --git a/eligos/configuration.nix b/eligos/configuration.nix index eae7442..1dfe541 100644 --- a/eligos/configuration.nix +++ b/eligos/configuration.nix @@ -6,7 +6,7 @@ { imports = - [ ./hardware-configuration.nix + [ ../hardware-configuration.nix ../secrets.nix ../overlays.nix ../services/clamav.nix diff --git a/eligos/hardware-configuration.nix b/eligos/hardware-configuration.nix deleted file mode 100644 index 739e8cf..0000000 --- a/eligos/hardware-configuration.nix +++ /dev/null @@ -1,60 +0,0 @@ -# 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, ... }: - -{ - imports = - [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/b9019bd0-f3e9-4ca7-b4ce-6501bb9375ca"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/F1C8-D159"; - fsType = "vfat"; - }; - - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/cae6ee5b-7018-4b5a-bd1d-f1e332bf716a"; - fsType = "xfs"; - }; - - fileSystems."/guix" = - { device = "/dev/disk/by-uuid/af35eb7e-4cb0-474b-b484-ced68d1a3376"; - fsType = "xfs"; - }; - - fileSystems."/opt" = - { device = "/dev/disk/by-uuid/0a128753-562f-49bb-a777-a652b40df00e"; - fsType = "ext4"; - }; - - fileSystems."/var" = - { device = "/dev/disk/by-uuid/e3cee56f-f7cc-4057-97da-d87aee15e013"; - fsType = "ext4"; - }; - - fileSystems."/var/lib/docker" = - { device = "/dev/disk/by-uuid/a3f59b43-08d0-40dc-be35-a459644843d6"; - fsType = "btrfs"; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/ab6dfc76-2a9c-4ba5-937c-9a76659d5113"; - fsType = "xfs"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/3aa22856-74ad-49a2-a606-9a1562fc9ffc"; } - ]; - - nix.maxJobs = lib.mkDefault 32; -} |