From d6f68400730ba7c3fead87920bcdc9d6eded1f4f Mon Sep 17 00:00:00 2001 From: Grigory Shipunov Date: Fri, 15 Jul 2022 05:05:04 +0200 Subject: update hardware --- hosts/microwave/hardware-configuration.nix | 52 +++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'hosts/microwave/hardware-configuration.nix') diff --git a/hosts/microwave/hardware-configuration.nix b/hosts/microwave/hardware-configuration.nix index 0870699..7b2be8b 100644 --- a/hosts/microwave/hardware-configuration.nix +++ b/hosts/microwave/hardware-configuration.nix @@ -16,47 +16,47 @@ fileSystems."/" = { - device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa"; - fsType = "btrfs"; - options = [ "subvol=root" "noatime" "compress=zstd" ]; + device = "rpool/nixos"; + fsType = "zfs"; + options = [ "zfsutil" ]; }; - boot.initrd.luks.devices."nixos-crypt".device = "/dev/disk/by-uuid/dbee4082-85ae-40f0-9c80-034f3574688f"; - - fileSystems."/boot" = + fileSystems."/nix" = { - device = "/dev/disk/by-uuid/4B02-CE16"; - fsType = "vfat"; + device = "rpool/nixos/nix"; + fsType = "zfs"; + options = [ "zfsutil" ]; }; fileSystems."/home" = { - device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa"; - fsType = "btrfs"; - options = [ "subvol=home" "noatime" "compress=zstd" ]; - }; - - fileSystems."/nix" = - { - device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa"; - fsType = "btrfs"; - options = [ "subvol=nix" "noatime" "compress=zstd" ]; + device = "rpool/userdata/home"; + fsType = "zfs"; + options = [ "zfsutil" ]; }; - fileSystems."/tmp" = + fileSystems."/boot" = { - device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa"; - fsType = "btrfs"; - options = [ "subvol=tmp" "noatime" "compress=zstd" ]; + device = "/dev/disk/by-uuid/A8AA-1CC4"; + fsType = "vfat"; + options = [ "X-mount.mkdir" ]; }; - # The global useDHCP flag is deprecated, therefore explicitly set to false here. - # Per-interface useDHCP will be mandatory in the future, so this generated config - # replicates the default behaviour. - networking.useDHCP = lib.mkDefault false; + swapDevices = + [{ + device = "/dev/disk/by-partuuid/f9712640-96a5-46e1-b07d-53b0cba19057"; + randomEncryption = true; + }]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; networking.interfaces.enp53s0.useDHCP = lib.mkDefault true; networking.interfaces.wlp54s0.useDHCP = lib.mkDefault true; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } -- cgit v1.3.1