diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 1633bb8..9a338bb 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,66 +1,61 @@ # 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, - ... -}: +{ config, lib, pkgs, modulesPath, ... }: { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ - "nvme" - "xhci_pci" - "ahci" - "usb_storage" - "usbhid" - "sd_mod" - ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/65e4c115-aff0-4c0e-8799-7309a25ecab6"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/1f7083ba-4271-486e-a85c-8386f6287b0a"; + fsType = "btrfs"; + options = [ "subvol=root" ]; + }; - fileSystems."/mnt/extra" = { - device = "/dev/disk/by-uuid/0d4ef3e0-7e7a-4a70-bbbc-040fe7aa7c2a"; - fsType = "ext4"; - options = [ "nofail" ]; - }; + fileSystems."/nix" = + { device = "/dev/disk/by-uuid/1f7083ba-4271-486e-a85c-8386f6287b0a"; + fsType = "btrfs"; + options = [ "subvol=nix" ]; + }; - fileSystems."/mnt/ssd" = { - device = "/dev/disk/by-uuid/f27f2224-d351-46fd-89f5-991de36166ad"; - fsType = "ext4"; - options = [ "nofail" ]; - }; + fileSystems."/home" = + { device = "/dev/disk/by-uuid/1f7083ba-4271-486e-a85c-8386f6287b0a"; + fsType = "btrfs"; + options = [ "subvol=home" ]; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/2EFE-3A26"; - fsType = "vfat"; - options = [ - "fmask=0022" - "dmask=0022" - ]; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/D4D7-CD5F"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; - fileSystems."/mnt/media" = { - device = "/dev/disk/by-uuid/52c17b8b-46c1-4870-b86c-c3b9f4bd4434"; - fsType = "ext4"; - options = [ "nofail" ]; - }; + fileSystems."/mnt/internal" = + { device = "/dev/disk/by-uuid/b8541c0d-9146-4388-b217-431f196957cc"; + fsType = "ext4"; + }; - fileSystems."/mnt/internal" = { - device = "/dev/disk/by-uuid/b8541c0d-9146-4388-b217-431f196957cc"; - fsType = "ext4"; - options = [ "nofail" ]; - }; + fileSystems."/mnt/ssd" = + { device = "/dev/disk/by-uuid/f27f2224-d351-46fd-89f5-991de36166ad"; + fsType = "ext4"; + }; + + fileSystems."/mnt/extra" = + { device = "/dev/disk/by-uuid/0d4ef3e0-7e7a-4a70-bbbc-040fe7aa7c2a"; + fsType = "ext4"; + }; + + fileSystems."/mnt/media" = + { device = "/dev/disk/by-uuid/52c17b8b-46c1-4870-b86c-c3b9f4bd4434"; + fsType = "ext4"; + }; swapDevices = [ ]; diff --git a/nixos.nix b/nixos.nix index a2fad9b..3d5580e 100644 --- a/nixos.nix +++ b/nixos.nix @@ -73,6 +73,27 @@ efi.canTouchEfiVariables = true; }; + # Configure options for mounted volumes. + fileSystems = { + "/".options = [ "compress=zstd" ]; + "/home".options = [ "compress=zstd" ]; + "/nix".options = [ + "compress=zstd" + "noatime" + ]; + "/mnt/extra".options = [ "nofail" ]; + "/mnt/internal".options = [ "nofail" ]; + "/mnt/media".options = [ "nofail" ]; + "/mnt/ssd".options = [ "nofail" ]; + }; + + # Enable btrf's auto scrubbing of volumes. + services.btrfs.autoScrub = { + enable = true; + interval = "weekly"; + fileSystems = [ "/" ]; + }; + networking.hostName = "nixos"; # Define your hostname. # Enable networking @@ -320,6 +341,7 @@ ## Tools # Utilities bat + btrfs-progs duf lm_sensors tree