From e6002c709e2f29aa2a50285c55bc8b790eb48d83 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Fri, 8 Apr 2022 16:54:37 -0700 Subject: hosts: rename hardware-configuration to hardware --- hosts/tahoe/default.nix | 2 +- hosts/tahoe/hardware-configuration.nix | 63 ---------------------------------- hosts/tahoe/hardware.nix | 63 ++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 hosts/tahoe/hardware-configuration.nix create mode 100644 hosts/tahoe/hardware.nix (limited to 'hosts/tahoe') diff --git a/hosts/tahoe/default.nix b/hosts/tahoe/default.nix index ad48bcc..8a3b4a6 100644 --- a/hosts/tahoe/default.nix +++ b/hosts/tahoe/default.nix @@ -2,7 +2,7 @@ { imports = [ # Include the results of the hardware scan. - ./hardware-configuration.nix + ./hardware.nix ./networking.nix ./home.nix ./services.nix diff --git a/hosts/tahoe/hardware-configuration.nix b/hosts/tahoe/hardware-configuration.nix deleted file mode 100644 index ab08490..0000000 --- a/hosts/tahoe/hardware-configuration.nix +++ /dev/null @@ -1,63 +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, modulesPath, ... }: - -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot.initrd.availableKernelModules = - [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/128c2a5e-48f6-4d94-b196-fb5db500b36d"; - fsType = "btrfs"; - options = [ "subvol=nixos" ]; - }; - - boot.initrd.luks.devices."system".device = - "/dev/disk/by-uuid/0d11e090-d88f-4313-8a41-8ef52eea0870"; - - fileSystems."/home" = { - device = "/dev/disk/by-uuid/128c2a5e-48f6-4d94-b196-fb5db500b36d"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; - - fileSystems."/.snapshots" = { - device = "/dev/disk/by-uuid/128c2a5e-48f6-4d94-b196-fb5db500b36d"; - fsType = "btrfs"; - options = [ "subvol=snapshots" ]; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/CBB9-B788"; - fsType = "vfat"; - }; - - fileSystems."/data/fast" = { - device = "/dev/disk/by-uuid/b9290b55-8ff6-4bd0-843d-a9e6f7a4df59"; - fsType = "btrfs"; - }; - - boot.initrd.luks.devices."raid-fast".device = - "/dev/disk/by-uuid/66c58a92-45fe-4b03-9be0-214ff67c177c"; - - fileSystems."/data/slow" = { - device = "/dev/disk/by-uuid/0f16db51-0ee7-48d8-9e48-653b85ecbf0a"; - fsType = "btrfs"; - }; - - boot.initrd.luks.devices."raid-slow".device = - "/dev/disk/by-uuid/d8b21267-d457-4522-91d9-5481b44dd0a5"; - - swapDevices = - [{ device = "/dev/disk/by-uuid/0f54b5ab-4fca-4c5a-a9eb-622553145163"; }]; - - my.hardware.amd.enable = true; - - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; -} diff --git a/hosts/tahoe/hardware.nix b/hosts/tahoe/hardware.nix new file mode 100644 index 0000000..ab08490 --- /dev/null +++ b/hosts/tahoe/hardware.nix @@ -0,0 +1,63 @@ +# 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") ]; + + boot.initrd.availableKernelModules = + [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/128c2a5e-48f6-4d94-b196-fb5db500b36d"; + fsType = "btrfs"; + options = [ "subvol=nixos" ]; + }; + + boot.initrd.luks.devices."system".device = + "/dev/disk/by-uuid/0d11e090-d88f-4313-8a41-8ef52eea0870"; + + fileSystems."/home" = { + device = "/dev/disk/by-uuid/128c2a5e-48f6-4d94-b196-fb5db500b36d"; + fsType = "btrfs"; + options = [ "subvol=home" ]; + }; + + fileSystems."/.snapshots" = { + device = "/dev/disk/by-uuid/128c2a5e-48f6-4d94-b196-fb5db500b36d"; + fsType = "btrfs"; + options = [ "subvol=snapshots" ]; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/CBB9-B788"; + fsType = "vfat"; + }; + + fileSystems."/data/fast" = { + device = "/dev/disk/by-uuid/b9290b55-8ff6-4bd0-843d-a9e6f7a4df59"; + fsType = "btrfs"; + }; + + boot.initrd.luks.devices."raid-fast".device = + "/dev/disk/by-uuid/66c58a92-45fe-4b03-9be0-214ff67c177c"; + + fileSystems."/data/slow" = { + device = "/dev/disk/by-uuid/0f16db51-0ee7-48d8-9e48-653b85ecbf0a"; + fsType = "btrfs"; + }; + + boot.initrd.luks.devices."raid-slow".device = + "/dev/disk/by-uuid/d8b21267-d457-4522-91d9-5481b44dd0a5"; + + swapDevices = + [{ device = "/dev/disk/by-uuid/0f54b5ab-4fca-4c5a-a9eb-622553145163"; }]; + + my.hardware.amd.enable = true; + + # high-resolution display + hardware.video.hidpi.enable = lib.mkDefault true; +} -- cgit 1.4.1