Repartition and reinstall alpheratz

hosts/alpheratz/hardware-configuration.nix

@@ -14,38 +14,32 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/ad45b094-608d-4850-b5ba-0f3917947629";
+    { device = "/dev/disk/by-uuid/d724cc9a-df7c-4771-8531-3544056b9aa1";
       fsType = "btrfs";
       options = [ "subvol=root" ];
     };
 
   fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/ad45b094-608d-4850-b5ba-0f3917947629";
+    { device = "/dev/disk/by-uuid/d724cc9a-df7c-4771-8531-3544056b9aa1";
       fsType = "btrfs";
       options = [ "subvol=home" ];
     };
 
   fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/ad45b094-608d-4850-b5ba-0f3917947629";
+    { device = "/dev/disk/by-uuid/d724cc9a-df7c-4771-8531-3544056b9aa1";
       fsType = "btrfs";
       options = [ "subvol=nix" ];
     };
 
-# Remove comments for optical drive in wine
-#  fileSystems."/mnt/drive0" = 
-#    { device = "/dev/sr0";
-#      fsType = "auto"; 
-#      options = [ "ro" "user" "noauto" "unhide" ];
-#    };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/D7C8-96A5";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
 
-  swapDevices = [ ];
-
-  # 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.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/7dc7727f-ebdc-4bd4-8526-193822b78aab"; }
+    ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

hosts/alpheratz/system.nix

@@ -64,7 +64,6 @@
 
     environment.systemPackages = with pkgs; [
         localPackages.x86_64-linux.jhelioviewer
-        bottles
         matlab
         discord
         wine
@@ -85,8 +84,6 @@
 
     # Use the systemd-boot EFI boot loader.
     boot.loader.systemd-boot.enable = true;
-    boot.loader.systemd-boot.xbootldrMountPoint = "/boot";
-    boot.loader.efi.efiSysMountPoint = "/efi";
     boot.loader.efi.canTouchEfiVariables = true;
 
     hardware.bluetooth.enable = true;