nixy: update filesystem hierarchy
This commit is contained in:
		
							parent
							
								
									6984ee4446
								
							
						
					
					
						commit
						f26f27355a
					
				| @ -1,77 +1,44 @@ | |||||||
| # 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 | # and may be overwritten by future invocations.  Please make changes | ||||||
| # to /etc/nixos/configuration.nix instead. | # to /etc/nixos/configuration.nix instead. | ||||||
|  | { config, lib, pkgs, modulesPath, ... }: | ||||||
|  | 
 | ||||||
| { | { | ||||||
|   config, |   imports = | ||||||
|   lib, |     [ (modulesPath + "/installer/scan/not-detected.nix") | ||||||
|   modulesPath, |  | ||||||
|   ... |  | ||||||
| }: { |  | ||||||
|   imports = [ |  | ||||||
|     (modulesPath + "/installer/scan/not-detected.nix") |  | ||||||
|     ]; |     ]; | ||||||
| 
 | 
 | ||||||
|   boot.initrd.availableKernelModules = ["nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; |   boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "uas" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; | ||||||
|   boot.initrd.kernelModules = []; |   boot.initrd.kernelModules = [ "dm-snapshot" ]; | ||||||
|   boot.kernelModules = ["kvm-amd" "amdgpu"]; |   boot.kernelModules = [ "kvm-amd" "amd-gpu" ]; | ||||||
|   boot.extraModulePackages = [ ]; |   boot.extraModulePackages = [ ]; | ||||||
| 
 | 
 | ||||||
|   fileSystems."/" = { |   fileSystems."/" = | ||||||
|     device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933"; |     { device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2"; | ||||||
|     fsType = "btrfs"; |       fsType = "xfs"; | ||||||
|     options = ["subvol=root" "compress=lzo" "noatime"]; |  | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|   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"; | ||||||
|   fileSystems."/home" = { |       fsType = "f2fs"; | ||||||
|     device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933"; |       options = [ "atgc" "gc_merge" "lazytime" ]; | ||||||
|     fsType = "btrfs"; |  | ||||||
|     options = ["subvol=home" "compress=lzo" "noatime"]; |  | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|   fileSystems."/nix" = { |   fileSystems."/home" = | ||||||
|     device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933"; |     { device = "/dev/disk/by-uuid/aeaa71ca-a439-4ef3-9ab8-db7ae8f59376"; | ||||||
|     fsType = "btrfs"; |       fsType = "xfs"; | ||||||
|     options = ["subvol=nix" "compress=lzo" "noatime"]; |  | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|   fileSystems."/persist" = { |   fileSystems."/boot" = | ||||||
|     device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933"; |     { device = "/dev/disk/by-uuid/828E-F3C3"; | ||||||
|     fsType = "btrfs"; |  | ||||||
|     options = ["subvol=persist" "compress=lzo" "noatime"]; |  | ||||||
|   }; |  | ||||||
| 
 |  | ||||||
|   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"; |       fsType = "vfat"; | ||||||
|  |       options = [ "fmask=0022" "dmask=0022" ]; | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|   fileSystems."/opt/xilinx" = { |   swapDevices = [ ]; | ||||||
|     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; |   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; | ||||||
|   nix.settings.max-jobs = lib.mkDefault 8; | 
 | ||||||
| } | } | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user