ringofstorms/dotfiles
ringofstorms/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert will try again

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2025-12-16 13:22:33 -06:00
parent 48946c2a1e
commit 55fe33f0b4
1 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
hosts/i001/hardware-mounts.nix
View file

@ -138,21 +138,21 @@ lib.mkMerge [
# Make this part of the root-fs chain, not just initrd.target # Make this part of the root-fs chain, not just initrd.target
wantedBy = [ wantedBy = [
# "initrd.target" # "initrd.target"
"sysroot.mount" # "sysroot.mount"
"initrd-root-fs.target" # "initrd-root-fs.target"
]; ];
before = [ before = [
"sysroot.mount" "sysroot.mount"
"initrd-root-fs.target" "initrd-root-fs.target"
]; ];
requires = [
primaryDeviceUnit
];
after = [ after = [
# "usb_key.mount" # "usb_key.mount"
primaryDeviceUnit # "initrd-root-device.target"
];
requires = [
"initrd-root-device.target" "initrd-root-device.target"
primaryDeviceUnit
]; ];
# unitConfig = { # unitConfig = {
@ -225,7 +225,7 @@ lib.mkMerge [
# TODO rotate root # TODO rotate root
} }
# Reset root for erase your darlings/impermanence/preservation # Reset root for erase your darlings/impermanence/preservation
(lib.mkIf true { (lib.mkIf false {
boot.initrd.systemd.services.bcachefs-reset-root = { boot.initrd.systemd.services.bcachefs-reset-root = {
description = "Reset bcachefs root subvolume before pivot"; description = "Reset bcachefs root subvolume before pivot";
@ -242,8 +242,16 @@ lib.mkMerge [
"sysroot.mount" "sysroot.mount"
]; ];
requires = [ primaryDeviceUnit ]; requires = [
wantedBy = [ "initrd.target" ]; primaryDeviceUnit
"unlock-bcachefs-custom.service"
];
wantedBy = [
"initrd-root-fs.target"
"sysroot.mount"
"initrd.target"
];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";