From a9d6afe9c3df4ef8bef2dd933b7c302754aca15e Mon Sep 17 00:00:00 2001
From: Preston Pan <ret2pop@gmail.com>
Date: Fri, 10 Jan 2025 01:56:16 -0800
Subject: reformat more things

---
 desktop/home.nix       |  1 +
 desktop/sda-simple.nix | 37 +++++++++++++++++++++++++++++++++++++
 disko/sda-simple.nix   | 37 -------------------------------------
 flake.nix              |  2 +-
 live/iso.nix           |  5 -----
 5 files changed, 39 insertions(+), 43 deletions(-)
 create mode 100644 desktop/sda-simple.nix
 delete mode 100644 disko/sda-simple.nix

diff --git a/desktop/home.nix b/desktop/home.nix
index 594ac44..224e32d 100644
--- a/desktop/home.nix
+++ b/desktop/home.nix
@@ -13,6 +13,7 @@ in
     if [ ! -d "${config.home.homeDirectory}/src/publish-org-roam-ui" ]; then
       mkdir -p ${config.home.homeDirectory}/src
       ${pkgs.git}/bin/git clone https://git.nullring.xyz/publish-org-roam-ui.git ${config.home.homeDirectory}/src/publish-org-roam-ui
+      ${pkgs.git}/bin/git clone https://git.nullring.xyz/toughnix.git ${config.home.homeDirectory}/src/toughnix
     fi
 
     if [ ! -d "${config.home.homeDirectory}/.password-store" ]; then
diff --git a/desktop/sda-simple.nix b/desktop/sda-simple.nix
new file mode 100644
index 0000000..a9c1e8f
--- /dev/null
+++ b/desktop/sda-simple.nix
@@ -0,0 +1,37 @@
+# This will install a simple system with a root and boot partition.
+# Make sure to change the entry device entry to the one that you
+# are installing the configuration to.
+{
+  disko.devices = {
+    disk = {
+      my-disk = {
+        # change this entry
+        device = "/dev/sda";
+        type = "disk";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              type = "EF00";
+              size = "500M";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "umask=0077" ];
+              };
+            };
+            root = {
+              size = "100%";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = "/";
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/disko/sda-simple.nix b/disko/sda-simple.nix
deleted file mode 100644
index a9c1e8f..0000000
--- a/disko/sda-simple.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-# This will install a simple system with a root and boot partition.
-# Make sure to change the entry device entry to the one that you
-# are installing the configuration to.
-{
-  disko.devices = {
-    disk = {
-      my-disk = {
-        # change this entry
-        device = "/dev/sda";
-        type = "disk";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              type = "EF00";
-              size = "500M";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            root = {
-              size = "100%";
-              content = {
-                type = "filesystem";
-                format = "ext4";
-                mountpoint = "/";
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/flake.nix b/flake.nix
index 0f5539c..3eb3724 100644
--- a/flake.nix
+++ b/flake.nix
@@ -55,8 +55,8 @@
               })
           lanzaboote.nixosModules.lanzaboote
           ./desktop/configuration.nix
+          ./desktop/sda-simple.nix
           disko.nixosModules.disko
-          ./disko/sda-simple.nix
           home-manager.nixosModules.home-manager
           {
             home-manager = {
diff --git a/live/iso.nix b/live/iso.nix
index da21878..dd50681 100644
--- a/live/iso.nix
+++ b/live/iso.nix
@@ -131,11 +131,6 @@ if [ "$(id -u)" -eq 0 ]; then
   exit 1
 fi
 
-if [ ! -f "/tmp/secret.key" ]; then
-  echo "ERROR: You must create a passphrase in /tmp/secret.key for full disk encryption."
-  exit 1
-fi
-
 if [ ! -d "$HOME/toughnix/" ]; then
   cd $HOME
   git clone https://git.nullring.xyz/toughnix.git
-- 
cgit