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

I can not get the ordering to work appropraitely

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2025-12-16 00:37:09 -06:00
parent 8882eaa3ab
commit 4fab3305f1
1 changed files with 110 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,68 +84,133 @@ lib.mkMerge [
]; ];
} }
# Disable bcachefs built in password prompts for all mounts (which asks for every single subdir mount above # Disable bcachefs built in password prompts for all mounts (which asks for every single subdir mount above
(
let
disableFs = fs: {
name = "unlock-bcachefs-${utils.escapeSystemdPath fs.mountPoint}";
value = {
enable = false;
};
};
in
{ {
boot.initrd.systemd.enable = true; boot.initrd.systemd.enable = true;
# https://github.com/NixOS/nixpkgs/blob/6cdf2f456a57164282ede1c97fc5532d9dba1ee0/nixos/modules/tasks/filesystems/bcachefs.nix#L254-L259 # https://github.com/NixOS/nixpkgs/blob/6cdf2f456a57164282ede1c97fc5532d9dba1ee0/nixos/modules/tasks/filesystems/bcachefs.nix#L254-L259
systemd.services = systemd.services =
# let let
# isSystemdNonBootBcache = v: (v.fsType == "bcachefs") && (!utils.fsNeededForBoot v); isSystemdNonBootBcache = fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs);
# bcacheNonBoots = lib.filterAttrs (k: v: isSystemdNonBootBcache v) config.fileSystems; bcacheNonBoots = lib.filterAttrs (k: fs: isSystemdNonBootBcache fs) config.fileSystems;
# in in
# (lib.mapAttrs (k: v: { enable = false; }) bcacheNonBoots); (lib.mapAttrs' (k: disableFs) bcacheNonBoots);
{ # The above auto generates these...
# NOTE that neededForBoot fs's dont end up in this list # {
"unlock-bcachefs-${escapeSystemdPath "/.old_roots"}".enable = false; # "unlock-bcachefs-${escapeSystemdPath "/.old_roots"}".enable = false;
"unlock-bcachefs-${escapeSystemdPath "/.snapshots"}".enable = false; # "unlock-bcachefs-${escapeSystemdPath "/.snapshots"}".enable = false;
"unlock-bcachefs-${escapeSystemdPath "/.swap"}".enable = false; # "unlock-bcachefs-${escapeSystemdPath "/.swap"}".enable = false;
"unlock-bcachefs-${escapeSystemdPath "/persist"}".enable = false; # "unlock-bcachefs-${escapeSystemdPath "/persist"}".enable = false;
}; # };
# https://github.com/NixOS/nixpkgs/blob/6cdf2f456a57164282ede1c97fc5532d9dba1ee0/nixos/modules/tasks/filesystems/bcachefs.nix#L291 # https://github.com/NixOS/nixpkgs/blob/6cdf2f456a57164282ede1c97fc5532d9dba1ee0/nixos/modules/tasks/filesystems/bcachefs.nix#L291
boot.initrd.systemd.services = boot.initrd.systemd.services =
# let let
# isSystemdBootBcache = v: (v.fsType == "bcachefs") && (utils.fsNeededForBoot v); isSystemdBootBcache = fs: (fs.fsType == "bcachefs") && (utils.fsNeededForBoot fs);
# bcacheBoots = lib.filterAttrs (k: v: isSystemdBootBcache v) config.fileSystems; bcacheBoots = lib.filterAttrs (k: fs: isSystemdBootBcache fs) config.fileSystems;
# in in
# (lib.mapAttrs (k: v: { enable = false; }) bcacheBoots); (lib.mapAttrs' (k: disableFs) bcacheBoots);
{ # same with that above
"unlock-bcachefs-${escapeSystemdPath "/sysroot"}".enable = false; # {
"unlock-bcachefs-${escapeSystemdPath "/"}".enable = false; # "unlock-bcachefs-${escapeSystemdPath "/sysroot"}".enable = false;
"unlock-bcachefs-${escapeSystemdPath "/nix"}".enable = false; # "unlock-bcachefs-${escapeSystemdPath "/"}".enable = false;
}; # "unlock-bcachefs-${escapeSystemdPath "/nix"}".enable = false;
# };
} }
)
# Bcachefs auto decryption # Bcachefs auto decryption
{ {
boot.supportedFilesystems = [ boot.supportedFilesystems = [
"bcachefs" "bcachefs"
]; ];
# boot.initrd.systemd.mounts = [ boot.initrd.systemd.mounts = [
# { {
# what = USB_KEY; what = USB_KEY;
# type = "bcachefs"; type = "bcachefs";
# where = "/usb_key"; where = "/usb_key";
# options = "ro"; options = "ro";
# description = "key"; description = "key";
# wantedBy = [ wantedBy = [
# "initrd.target" "initrd.target"
# ]; "initrd-root-fs.target"
# } ];
# ]; }
];
boot.initrd.systemd.services."sysroot.mount" = {
unitConfig = {
Requires = [ "unlock-bcachefs-custom.service" ];
After = [ "unlock-bcachefs-custom.service" ];
};
};
boot.initrd.systemd.services.unlock-bcachefs-custom = { boot.initrd.systemd.services.unlock-bcachefs-custom = {
description = "Custom single bcachefs unlock for all subvolumes"; description = "Custom single bcachefs unlock for all subvolumes";
wantedBy = [ "initrd.target" ]; # Make this part of the root-fs chain, not just initrd.target
before = [ "sysroot.mount" ]; wantedBy = [
# "initrd.target"
"sysroot.mount"
"initrd-root-fs.target"
];
# Stronger than wantedBy if you want it absolutely required:
requiredBy = [
"sysroot.mount"
"initrd-root-fs.target"
];
before = [
"sysroot.mount"
"initrd-root-fs.target"
];
requires = [
"usb_key.mount"
primaryDeviceUnit
];
after = [
"usb_key.mount"
primaryDeviceUnit
"initrd-root-device.target"
];
# script = ''
# echo "Using test password..."
#
# mkdir -p /usb_key
# # Wait for USB device (optional, to handle slow init)
# for i in $(seq 1 50); do
# if [ -b "${USB_KEY}" ]; then
# break
# fi
# echo "Waiting for USB key ${USB_KEY}..."
# sleep 0.2
# done
#
# if [ ! -b "${USB_KEY}" ]; then
# echo "USB key device ${USB_KEY} not present in initrd"
# exit 1
# fi
#
# # Mount the key
# mount -t bcachefs -o ro "${USB_KEY}" /usb_key
#
# echo "test" | ${pkgs.bcachefs-tools}/bin/bcachefs unlock "${PRIMARY}"
# echo "bcachefs unlock successful for ${PRIMARY}"
# '';
requires = [ primaryDeviceUnit ];
after = [ primaryDeviceUnit ];
script = '' script = ''
echo "Using test password..." echo "Using test password..."
echo "test" | ${pkgs.bcachefs-tools}/bin/bcachefs unlock "${PRIMARY}" echo "test" | ${pkgs.bcachefs-tools}/bin/bcachefs unlock "${PRIMARY}"
echo "bcachefs unlock successful for ${PRIMARY}" echo "bcachefs unlock successful for ${PRIMARY}"
''; '';
# script = '' # script = ''
# echo "Using USB key for bcachefs unlock: ${USB_KEY}" # echo "Using USB key for bcachefs unlock: ${USB_KEY}"
# #