Re-add variants and reorganize things

curacao/default.nix

@@ -0,0 +1,12 @@
+{ pkgs, lib, config, ... }:
+{
+  config = {
+    networking.hostName = "curacao";
+  };
+  imports = [
+    ./backup
+    ./disko.nix
+    ./features.nix
+    ./hardware.nix
+  ];
+}

curacao/disko.nix

@@ -1,4 +1,4 @@
-{ passwordFile ? "/should_not_be_needed_in_this_context", ... }:
+{ pkgs, lib, config, ... }:
 # TODO Find a way to use keys in filesystem
 # TODO Not relatime everywhere, thank you
 # TODO Default options
@@ -10,8 +10,10 @@ let
     "space_cache"
   ];
   btrfs_args_ssd = btrfs_args_hdd ++ [ "ssd" ];
+  passwordFile = "/tmp/dotfiles_${config.networking.hostName}_password";
 in
 {
+  boot.loader.efi.efiSysMountPoint = config.disko.devices.disk.razmo.content.partitions.esp.content.mountpoint;
   disko.devices = {
     disk = {
       razmo = {
@@ -32,7 +34,6 @@ in
                 # hibernation image is saved. That's what I'm doing with Arch,
                 # but I'm setting resume=, should test if it actually works?
                 # Untranslated options from /etc/crypttab: swap,cipher=aes-xts-plain64,size=256
-                # Untranslated options from /etc/fstab: defaults,pri=100
               };
             };
             nixosboot = {

curacao/features.nix

@@ -0,0 +1,13 @@
+{ ... }:
+{
+  frogeye = {
+    desktop = {
+      xorg = true;
+    };
+    dev = {
+      docker = true;
+    };
+    extra = true;
+    gaming = true;
+  };
+}

curacao/hardware.nix

@@ -10,4 +10,15 @@
       # TODO Maybe we could? In case the HDD doesn't boot anymore?
     };
   };
+  frogeye.desktop = {
+    x11_screens = [ "HDMI-1-0" "eDP-1" ];
+    maxVideoHeight = 1440;
+    numlock = true;
+    phasesBrightness = {
+      enable = true;
+      jour = "40000";
+      crepuscule = "10000";
+      nuit = "1";
+    };
+  };
 }

curacao/options.nix

@@ -1,22 +0,0 @@
-{ ... }:
-{
-  frogeye = {
-    desktop = {
-      xorg = true;
-      x11_screens = [ "HDMI-1-0" "eDP-1" ];
-      maxVideoHeight = 1440;
-      numlock = true;
-      phasesBrightness = {
-        enable = true;
-        jour = "40000";
-        crepuscule = "10000";
-        nuit = "1";
-      };
-    };
-    dev = {
-      docker = true;
-    };
-    extra = true;
-    gaming = true;
-  };
-}

curacao/os.nix

@@ -1,16 +0,0 @@
-{ pkgs, lib, config, ... }:
-{
-  imports = [
-    ./options.nix
-    ./hardware.nix
-    ./dk.nix
-    ./backup
-  ];
-
-  networking.hostName = "curacao";
-  boot = {
-    loader = {
-      efi.efiSysMountPoint = "/efi";
-    };
-  };
-}

curacao/usb.nix

@@ -0,0 +1,13 @@
+{ pkgs, lib, config, ... }:
+{
+  config = {
+    boot.loader.grub.efiInstallAsRemovable = true;
+    disk."${config.networking.hostName}".device = "/dev/disk/by-id/usb-Kingston_DataTraveler_3.0_E0D55EA57414F510489F0F1A-0:0";
+    networking.hostName = "curacao-usb";
+  };
+  imports = [
+    ../common/disko/single_uefi_btrfs.nix
+    ./features.nix
+    ./hardware.nix
+  ];
+}