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/carmel/default.nix | 2 +- hosts/carmel/hardware-configuration.nix | 46 --------------------------------- hosts/carmel/hardware.nix | 46 +++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 hosts/carmel/hardware-configuration.nix create mode 100644 hosts/carmel/hardware.nix (limited to 'hosts/carmel') diff --git a/hosts/carmel/default.nix b/hosts/carmel/default.nix index 71980f7..d3b7cf3 100644 --- a/hosts/carmel/default.nix +++ b/hosts/carmel/default.nix @@ -2,7 +2,7 @@ { imports = [ # Include the results of the hardware scan. - ./hardware-configuration.nix + ./hardware.nix ./boot.nix ./sound.nix ./networking.nix diff --git a/hosts/carmel/hardware-configuration.nix b/hosts/carmel/hardware-configuration.nix deleted file mode 100644 index aa86049..0000000 --- a/hosts/carmel/hardware-configuration.nix +++ /dev/null @@ -1,46 +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 = - [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/7d4e07d8-1104-4ab8-8ead-8ca28da2d344"; - fsType = "btrfs"; - options = [ "subvol=nixos" ]; - }; - - boot.initrd.luks.devices."system".device = - "/dev/disk/by-uuid/dd1b3673-ece0-49f8-bf71-8cc4e1a06634"; - - fileSystems."/home" = { - device = "/dev/disk/by-uuid/7d4e07d8-1104-4ab8-8ead-8ca28da2d344"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; - - fileSystems."/.snapshots" = { - device = "/dev/disk/by-uuid/7d4e07d8-1104-4ab8-8ead-8ca28da2d344"; - fsType = "btrfs"; - options = [ "subvol=snapshots" ]; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/7430-1C58"; - fsType = "vfat"; - }; - - swapDevices = - [{ device = "/dev/disk/by-uuid/ebcb04f3-4227-4ec3-af52-bd775ef38027"; }]; - - my.hardware.amd.enable = true; - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; -} diff --git a/hosts/carmel/hardware.nix b/hosts/carmel/hardware.nix new file mode 100644 index 0000000..aa86049 --- /dev/null +++ b/hosts/carmel/hardware.nix @@ -0,0 +1,46 @@ +# 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 = + [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/7d4e07d8-1104-4ab8-8ead-8ca28da2d344"; + fsType = "btrfs"; + options = [ "subvol=nixos" ]; + }; + + boot.initrd.luks.devices."system".device = + "/dev/disk/by-uuid/dd1b3673-ece0-49f8-bf71-8cc4e1a06634"; + + fileSystems."/home" = { + device = "/dev/disk/by-uuid/7d4e07d8-1104-4ab8-8ead-8ca28da2d344"; + fsType = "btrfs"; + options = [ "subvol=home" ]; + }; + + fileSystems."/.snapshots" = { + device = "/dev/disk/by-uuid/7d4e07d8-1104-4ab8-8ead-8ca28da2d344"; + fsType = "btrfs"; + options = [ "subvol=snapshots" ]; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/7430-1C58"; + fsType = "vfat"; + }; + + swapDevices = + [{ device = "/dev/disk/by-uuid/ebcb04f3-4227-4ec3-af52-bd775ef38027"; }]; + + my.hardware.amd.enable = true; + # high-resolution display + hardware.video.hidpi.enable = lib.mkDefault true; +} -- cgit v1.2.3