From fe766367751b00e5c2f5f2f3b1995e8d6bad6387 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Mon, 4 Jan 2021 10:55:36 +0100
Subject: [PATCH] fixup! support unencrypted disk provisioning

---
 nix/os/devices/default.nix                   | 27 ++++++++++++--------
 nix/os/devices/steveej-rmvbl-sdep0/hw.nix    |  6 ++---
 nix/os/devices/steveej-t14/configuration.nix |  2 +-
 nix/os/devices/steveej-t14/hw.nix            |  2 +-
 nix/os/profiles/removable-medium/hw.nix      |  3 +--
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/nix/os/devices/default.nix b/nix/os/devices/default.nix
index 92a0bc2..3ac1419 100644
--- a/nix/os/devices/default.nix
+++ b/nix/os/devices/default.nix
@@ -4,17 +4,17 @@
 , gitRoot ? "$(git rev-parse --show-toplevel)"
 
 # FIXME: why do these need explicit mentioning?
-, moreargs ? null
-, rebuildarg ? ""
+# , moreargs ? ""
+# , rebuildarg ? ""
 , ...
 } @ args :
 
 let
   rebuildargsSudo = [ "switch" "boot" ];
   rebuild = {
-    rebuildarg
-    , gitRoot
-    , moreargs ? null
+    gitRoot
+    , rebuildarg ? "dry-activate"
+    , moreargs ? ""
 
     , ...
   }: pkgs.writeScript "script" ''
@@ -27,11 +27,11 @@ let
     [[ -e "''${NIXOS_CONFIG}" ]]
 
     ${if (builtins.elem rebuildarg rebuildargsSudo)
-          && builtins.match ".*--target-host.*" moreargs == null
-    then
-      "sudo -E \\"
-    else
-      ""
+          && (builtins.match ".*--target-host.*" moreargs) == null
+      then
+        "sudo -E \\"
+      else
+        ""
     }
     nixos-rebuild --show-trace -I nixos-config=''${NIXOS_CONFIG} ${rebuildarg} ${moreargs}
     if test -L result; then
@@ -42,7 +42,12 @@ let
 
 in {
   recipes = {
-    rebuild = rebuild { inherit gitRoot; inherit (args) rebuildarg moreargs; };
+    rebuild = rebuild {
+      inherit gitRoot;
+    }
+      # // pkgs.lib.attrsets.optionalAttrs (moreargs != "") { inherit moreargs; }
+      # // pkgs.lib.attrsets.optionalAttrs (rebuildarg != "") { inherit rebuildarg; }
+      ;
   } // (import ./disk.nix (args // { inherit pkgs ownLib gitRoot; }))
   ;
 }
diff --git a/nix/os/devices/steveej-rmvbl-sdep0/hw.nix b/nix/os/devices/steveej-rmvbl-sdep0/hw.nix
index 34dd81c..d105279 100644
--- a/nix/os/devices/steveej-rmvbl-sdep0/hw.nix
+++ b/nix/os/devices/steveej-rmvbl-sdep0/hw.nix
@@ -2,8 +2,6 @@
 
 {
   # TASK: new device
-  hardware.encryptedDisk = {
-    enable = true;
-    diskId = "usb-SanDisk_Extreme_Pro_12345978EC62-0:0";
-  };
+  hardware.opinionatedDisk.diskId = "usb-SanDisk_Extreme_Pro_12345978EC62-0:0";
+  hardware.opinionatedDisk.encrypted = true;
 }
diff --git a/nix/os/devices/steveej-t14/configuration.nix b/nix/os/devices/steveej-t14/configuration.nix
index 021be3d..b78c268 100644
--- a/nix/os/devices/steveej-t14/configuration.nix
+++ b/nix/os/devices/steveej-t14/configuration.nix
@@ -4,7 +4,7 @@
   imports = [
     ../../profiles/common/configuration.nix
     ../../profiles/graphical/configuration.nix
-    ../../modules/opnionatedDisk.nix
+    ../../modules/opinionatedDisk.nix
 
     ./system.nix
     ./hw.nix
diff --git a/nix/os/devices/steveej-t14/hw.nix b/nix/os/devices/steveej-t14/hw.nix
index ad63d6c..4438fda 100644
--- a/nix/os/devices/steveej-t14/hw.nix
+++ b/nix/os/devices/steveej-t14/hw.nix
@@ -18,7 +18,7 @@ let
 in
 {
   # TASK: new device
-  hardware.encryptedDisk = {
+  hardware.opinionatedDisk = {
     enable = true;
     encrypted = true;
     diskId = "nvme-SKHynix_HFS001TD9TNI-L2B0B_CJ0AN89731030AV3Q";
diff --git a/nix/os/profiles/removable-medium/hw.nix b/nix/os/profiles/removable-medium/hw.nix
index b463622..6121e79 100644
--- a/nix/os/profiles/removable-medium/hw.nix
+++ b/nix/os/profiles/removable-medium/hw.nix
@@ -1,7 +1,6 @@
 { ... }:
 
 {
-  hardware.opnionatedDisk.enable = true;
-  hardware.opnionatedDisk.encrypted = true;
+  hardware.opinionatedDisk.enable = true;
   hardware.enableAllFirmware = true;
 }