1 files changed, 5 insertions, 13 deletions
diff --git a/makefu/1systems/iso/justdoit.nix b/makefu/1systems/iso/justdoit.nix
index 7947953f9..0ce90494b 100644
--- a/makefu/1systems/iso/justdoit.nix
+++ b/makefu/1systems/iso/justdoit.nix
@@ -67,29 +67,22 @@ in {
       unit: sectors
       ${lib.optionalString (cfg.bootType != "zfs") "1 : size=${toString (2048 * cfg.bootSize)}, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4"}
       ${lib.optionalString (! cfg.uefi) "4 : size=4096, type=21686148-6449-6E6F-744E-656564454649"}
-      2 : size=${toString (2048 * cfg.swapSize)}, type=0657FD6D-A4AB-43C4-84E5-0933C84B4F4F
-      3 : type=0FC63DAF-8483-4772-8E79-3D69D8477DE4
+      2 : type=0FC63DAF-8483-4772-8E79-3D69D8477DE4
       EOF
       ${if cfg.luksEncrypt then ''
         cryptsetup luksFormat ${cfg.rootDevice}${x}2
-        cryptsetup open --type luks ${cfg.rootDevice}${x}2 swap
-        cryptsetup luksFormat ${cfg.rootDevice}${x}3
-        cryptsetup open --type luks ${cfg.rootDevice}${x}3 root
+        cryptsetup open --type luks ${cfg.rootDevice}${x}2 root
         export ROOT_DEVICE=/dev/mapper/root
-        export SWAP_DEVICE=/dev/mapper/swap
       '' else ''
-        export ROOT_DEVICE=${cfg.rootDevice}${x}3
-        export SWAP_DEVICE=${cfg.rootDevice}${x}2
+        export ROOT_DEVICE=${cfg.rootDevice}${x}2
       ''}
       ${lib.optionalString (cfg.bootType != "zfs") "export NIXOS_BOOT=${cfg.rootDevice}${x}1"}
       mkdir -p /mnt
       ${mkBootTable.${cfg.bootType}}
-      mkswap $SWAP_DEVICE -L NIXOS_SWAP
       zpool create -o ashift=12 -o altroot=/mnt ${cfg.poolName} $ROOT_DEVICE
       zfs create -o mountpoint=legacy ${cfg.poolName}/root
       zfs create -o mountpoint=legacy ${cfg.poolName}/home
       zfs create -o mountpoint=legacy ${cfg.poolName}/nix
-      swapon $SWAP_DEVICE
       mount -t zfs ${cfg.poolName}/root /mnt/
       mkdir /mnt/{home,nix,boot}
       mount -t zfs ${cfg.poolName}/home /mnt/home/
@@ -111,8 +104,7 @@ in {
         networking.hostId = "$hostId"; # required for zfs use
       ${lib.optionalString cfg.luksEncrypt ''
         boot.initrd.luks.devices = [
-          { name = "swap"; device = "${cfg.rootDevice}${x}2"; preLVM = true; }
-          { name = "root"; device = "${cfg.rootDevice}${x}3"; preLVM = true; }
+          { name = "root"; device = "${cfg.rootDevice}${x}2"; preLVM = true; }
         ];
       ''}
       }
@@ -120,9 +112,9 @@ in {
       nixos-install
       umount /mnt/home /mnt/nix ${lib.optionalString (cfg.bootType != "zfs") "/mnt/boot"} /mnt
       zpool export ${cfg.poolName}
-      swapoff $SWAP_DEVICE
     '';
     environment.systemPackages = [ config.system.build.justdoit ];
     boot.supportedFilesystems = [ "zfs" ];
+    users.users.root.openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl3RTOHd5DLiVeUbUr/GSiKoRWknXQnbkIf+uNiFO+XxiqZVojPlumQUVhasY8UzDzj9tSDruUKXpjut50FhIO5UFAgsBeMJyoZbgY/+R+QKU00Q19+IiUtxeFol/9dCO+F4o937MC0OpAC10LbOXN/9SYIXueYk3pJxIycXwUqhYmyEqtDdVh9Rx32LBVqlBoXRHpNGPLiswV2qNe0b5p919IGcslzf1XoUzfE3a3yjk/XbWh/59xnl4V7Oe7+iQheFxOT6rFA30WYwEygs5As//ZYtxvnn0gA02gOnXJsNjOW9irlxOUeP7IOU6Ye3WRKFRR0+7PS+w8IJLag2xb" ];
   };
 }