From f26f27355ab74e3e32d111dde3363b3c404fbbfa Mon Sep 17 00:00:00 2001 From: Asmir A Date: Thu, 30 May 2024 22:43:23 +0200 Subject: [PATCH] nixy: update filesystem hierarchy --- nixy/hardware-configuration.nix | 93 +++++++++++---------------------- 1 file changed, 30 insertions(+), 63 deletions(-) diff --git a/nixy/hardware-configuration.nix b/nixy/hardware-configuration.nix index b637bdd..666ad93 100644 --- a/nixy/hardware-configuration.nix +++ b/nixy/hardware-configuration.nix @@ -1,77 +1,44 @@ # 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, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = ["nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-amd" "amdgpu"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "uas" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.kernelModules = [ "kvm-amd" "amd-gpu" ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933"; - fsType = "btrfs"; - options = ["subvol=root" "compress=lzo" "noatime"]; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2"; + fsType = "xfs"; + }; - boot.initrd.luks.devices."sys_enc".device = "/dev/disk/by-uuid/682d030d-189e-4b47-a60a-62cf1f3729d3"; + fileSystems."/nix" = + { device = "/dev/disk/by-uuid/e7dc8aad-3c9e-4190-a576-28ac230560bf"; + fsType = "f2fs"; + options = [ "atgc" "gc_merge" "lazytime" ]; + }; - fileSystems."/home" = { - device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933"; - fsType = "btrfs"; - options = ["subvol=home" "compress=lzo" "noatime"]; - }; + fileSystems."/home" = + { device = "/dev/disk/by-uuid/aeaa71ca-a439-4ef3-9ab8-db7ae8f59376"; + fsType = "xfs"; + }; - fileSystems."/nix" = { - device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933"; - fsType = "btrfs"; - options = ["subvol=nix" "compress=lzo" "noatime"]; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/828E-F3C3"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; - fileSystems."/persist" = { - device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933"; - fsType = "btrfs"; - options = ["subvol=persist" "compress=lzo" "noatime"]; - }; + swapDevices = [ ]; - fileSystems."/var/log" = { - device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933"; - fsType = "btrfs"; - options = ["subvol=log" "compress=lzo" "noatime"]; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/3F3E-9833"; - fsType = "vfat"; - }; - - fileSystems."/opt/xilinx" = { - device = "/dev/disk/by-uuid/f5c27ef2-8053-4d96-9f8f-c6a50d6193b9"; - fsType = "erofs"; - }; - - swapDevices = [ - /* - { - device = "/dev/disk/by-uuid/ee1792c9-098b-40c1-b760-20def16ba67f"; - encrypted = { - enable = true; - keyFile = "/mnt-root/swap.key"; - label = "swap_encr"; - blkDev = "/dev/disk/by-uuid/aee12e27-b45a-4291-be78-db0a903071b3"; - }; - } - */ - ]; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - nix.settings.max-jobs = lib.mkDefault 8; + }