From 8e60defb303289ce92c46b81f42c346917ee110e Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 8 Sep 2021 16:55:26 -0400 Subject: [PATCH] remove old LUKS scripts --- flake.nix | 4 ---- misc/luks-mirror.sh | 15 --------------- misc/luks-single.sh | 13 ------------- 3 files changed, 32 deletions(-) delete mode 100755 misc/luks-mirror.sh delete mode 100755 misc/luks-single.sh diff --git a/flake.nix b/flake.nix index b2bc73a..d740efa 100644 --- a/flake.nix +++ b/flake.nix @@ -66,13 +66,9 @@ apps = self.lib.forAllSystems (system: with nixpkgs.legacyPackages.${system}; let - binScript = x: writeShellScriptBin "script" "exec ${x}"; jupy = python3.withPackages (p: with p; [ jupyterlab ipython ]); in { - luks-mirror = binScript ./misc/luks-mirror.sh; - luks-single = binScript ./misc/luks-single.sh; - jupyterlab = writeShellScriptBin "jupyterlab" '' exec ${jupy}/bin/python -m jupyterlab "$@" ''; diff --git a/misc/luks-mirror.sh b/misc/luks-mirror.sh deleted file mode 100755 index 8685efc..0000000 --- a/misc/luks-mirror.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -cryptsetup -y -v luksFormat "/dev/disk/by-partlabel/_root1" -cryptsetup -y -v luksFormat "/dev/disk/by-partlabel/_root2" -cryptsetup --allow-discards open "/dev/disk/by-partlabel/_root1" cryptroot1 -cryptsetup --allow-discards open "/dev/disk/by-partlabel/_root2" cryptroot2 - -mkfs.btrfs -f -L_root -mraid1 -draid1 /dev/mapper/cryptroot1 /dev/mapper/cryptroot2 -mount /dev/disk/by-label/_root /mnt -o discard,compress=zstd:1 - -btrfs subvolume create /mnt/home -btrfs subvolume create /mnt/nix -mkdir /mnt/boot diff --git a/misc/luks-single.sh b/misc/luks-single.sh deleted file mode 100755 index b6e6c17..0000000 --- a/misc/luks-single.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -cryptsetup -y -v luksFormat "/dev/disk/by-partlabel/_root" -cryptsetup --allow-discards open "/dev/disk/by-partlabel/_root" cryptroot - -mkfs.btrfs -f -L_root /dev/mapper/cryptroot -mount /dev/disk/by-label/_root /mnt -o discard,compress=zstd:1 - -btrfs subvolume create /mnt/home -btrfs subvolume create /mnt/nix -mkdir /mnt/boot