Merge branch 'main' of cgit:/srv/git/NixOS-config

1 files changed, 19 insertions, 7 deletions

diff --git a/hosts/herra/hardware-configuration.nix b/hosts/herra/hardware-configuration.nix
index 0dc8341..578ae01 100755..100644
--- a/hosts/herra/hardware-configuration.nix
+++ b/hosts/herra/hardware-configuration.nix
@@ -1,29 +1,41 @@
-# Do not modify this file!  It was generated by 'nixos-generate-config'
+# 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")
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/f62daee8-ba51-478c-97db-c8b96c12043e";
-      fsType = "ext4";
+    { device = "/dev/disk/by-uuid/229a13d8-159e-40b6-915a-606c32e3ca79";
+      fsType = "btrfs";
+      options = [ "subvol=@" ];
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/229a13d8-159e-40b6-915a-606c32e3ca79";
+      fsType = "btrfs";
+      options = [ "subvol=@home" ];
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/22BE-C329";
+    { device = "/dev/disk/by-uuid/03F6-F782";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-uuid/28fb6b6d-fb64-4a42-80af-88ce7b081258";
+      fsType = "btrfs";
+    };
+
   swapDevices = [ ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";