removed darling erasure
This commit is contained in:
parent
49e6959ac2
commit
fc8e725a20
4 changed files with 1 additions and 110 deletions
|
|
@ -68,10 +68,6 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
hosts.nixos-laptop.modules = [ ./hosts/nixos-laptop ];
|
hosts.nixos-laptop.modules = [ ./hosts/nixos-laptop ];
|
||||||
hosts.nixos-desktop.modules = [
|
hosts.nixos-desktop.modules = [ ./hosts/nixos-desktop ./modules/gaming ];
|
||||||
./hosts/nixos-desktop
|
|
||||||
./modules/gaming
|
|
||||||
./modules/darling-erasure
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,70 +0,0 @@
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
environment.etc = {
|
|
||||||
nixos.source = "/persist/etc/nixos";
|
|
||||||
"NetworkManager/system-connections".source =
|
|
||||||
"/persist/etc/NetworkManager/system-connections";
|
|
||||||
adjtime.source = "/persist/etc/adjtime";
|
|
||||||
NIXOS.source = "/persist/etc/NIXOS";
|
|
||||||
machine-id.source = "/persist/etc/machine-id";
|
|
||||||
"ssh/ssh_host_ed25519_key".source = "/persist/etc/ssh/ssh_host_ed25519_key";
|
|
||||||
"ssh/ssh_host_ed25519_key.pub".source =
|
|
||||||
"/persist/etc/ssh/ssh_host_ed25519_key.pub";
|
|
||||||
"ssh/ssh_host_rsa_key".source = "/persist/etc/ssh/ssh_host_rsa_key";
|
|
||||||
"ssh/ssh_host_rsa_key.pub".source = "/persist/etc/ssh/ssh_host_rsa_key.pub";
|
|
||||||
shadow.source = "/persist/etc/shadow";
|
|
||||||
};
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"L /var/lib/NetworkManager/secret_key - - - - /persist/var/lib/NetworkManager/secret_key"
|
|
||||||
"L /var/lib/NetworkManager/seen-bssids - - - - /persist/var/lib/NetworkManager/seen-bssids"
|
|
||||||
"L /var/lib/NetworkManager/timestamps - - - - /persist/var/lib/NetworkManager/timestamps"
|
|
||||||
];
|
|
||||||
security.sudo.extraConfig = ''
|
|
||||||
# rollback results in sudo lectures after each reboot
|
|
||||||
Defaults lecture = never
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Note `lib.mkBefore` is used instead of `lib.mkAfter` here.
|
|
||||||
boot.initrd.postDeviceCommands = pkgs.lib.mkBefore ''
|
|
||||||
mkdir -p /mnt
|
|
||||||
|
|
||||||
# We first mount the btrfs root to /mnt
|
|
||||||
# so we can manipulate btrfs subvolumes.
|
|
||||||
mount -o subvol=/ /dev/mapper/enc /mnt
|
|
||||||
|
|
||||||
# While we're tempted to just delete /root and create
|
|
||||||
# a new snapshot from /root-blank, /root is already
|
|
||||||
# populated at this point with a number of subvolumes,
|
|
||||||
# which makes `btrfs subvolume delete` fail.
|
|
||||||
# So, we remove them first.
|
|
||||||
#
|
|
||||||
# /root contains subvolumes:
|
|
||||||
# - /root/var/lib/portables
|
|
||||||
# - /root/var/lib/machines
|
|
||||||
#
|
|
||||||
# I suspect these are related to systemd-nspawn, but
|
|
||||||
# since I don't use it I'm not 100% sure.
|
|
||||||
# Anyhow, deleting these subvolumes hasn't resulted
|
|
||||||
# in any issues so far, except for fairly
|
|
||||||
# benign-looking errors from systemd-tmpfiles.
|
|
||||||
btrfs subvolume list -o /mnt/root |
|
|
||||||
cut -f9 -d' ' |
|
|
||||||
while read subvolume; do
|
|
||||||
echo "deleting /$subvolume subvolume..."
|
|
||||||
btrfs subvolume delete "/mnt/$subvolume"
|
|
||||||
done &&
|
|
||||||
echo "deleting /root subvolume..." &&
|
|
||||||
btrfs subvolume delete /mnt/root
|
|
||||||
|
|
||||||
echo "restoring blank /root subvolume..."
|
|
||||||
btrfs subvolume snapshot /mnt/root-blank /mnt/root
|
|
||||||
|
|
||||||
# Once we're done rolling back to a blank snapshot,
|
|
||||||
# we can unmount /mnt and continue on the boot process.
|
|
||||||
umount /mnt
|
|
||||||
'';
|
|
||||||
|
|
||||||
# In case one forgets to move /etc/shadow to /persist
|
|
||||||
users.users.moritz.initialPassword = "password";
|
|
||||||
}
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# fs-diff.sh
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
OLD_TRANSID=$(sudo btrfs subvolume find-new /mnt/root-blank 9999999)
|
|
||||||
OLD_TRANSID=${OLD_TRANSID#transid marker was }
|
|
||||||
|
|
||||||
sudo btrfs subvolume find-new "/mnt/root" "$OLD_TRANSID" |
|
|
||||||
sed '$d' |
|
|
||||||
cut -f17- -d' ' |
|
|
||||||
sort |
|
|
||||||
uniq |
|
|
||||||
while read path; do
|
|
||||||
path="/$path"
|
|
||||||
if [ -L "$path" ]; then
|
|
||||||
: # The path is a symbolic link, so is probably handled by NixOS already
|
|
||||||
elif [ -d "$path" ]; then
|
|
||||||
: # The path is a directory, ignore
|
|
||||||
else
|
|
||||||
echo "$path"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
sudo mkdir -p /persist/etc/NetworkManager
|
|
||||||
sudo cp -r {,/persist}/etc/NetworkManager/system-connections
|
|
||||||
sudo mkdir -p /persist/var/lib/NetworkManager
|
|
||||||
sudo cp /var/lib/NetworkManager/{secret_key,seen-bssids,timestamps} /persist/var/lib/NetworkManager/
|
|
||||||
|
|
||||||
sudo cp -r {,/persist}/etc/nixos
|
|
||||||
sudo cp {,/persist}/etc/adjtime
|
|
||||||
sudo cp {,/persist}/etc/NIXOS
|
|
||||||
|
|
||||||
sudo cp {,/persist}/etc/ssh/ssh_host_*
|
|
||||||
sudo cp {,/persist}/etc/shadow
|
|
||||||
Loading…
Reference in a new issue