aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPreston Pan <ret2pop@gmail.com>2025-01-10 01:56:16 -0800
committerPreston Pan <ret2pop@gmail.com>2025-01-10 01:56:16 -0800
commita9d6afe9c3df4ef8bef2dd933b7c302754aca15e (patch)
tree28c18d02f6f8d129cfb60265df5669140c3b3015
parent2779b842702d6565d73288adc72683f362db310e (diff)
reformat more things
-rw-r--r--desktop/home.nix1
-rw-r--r--desktop/sda-simple.nix (renamed from disko/sda-simple.nix)0
-rw-r--r--flake.nix2
-rw-r--r--live/iso.nix5
4 files changed, 2 insertions, 6 deletions
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/disko/sda-simple.nix b/desktop/sda-simple.nix
index a9c1e8f..a9c1e8f 100644
--- a/disko/sda-simple.nix
+++ b/desktop/sda-simple.nix
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