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

update a few things, fix hardware mount order of services

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2026-01-01 12:55:39 -06:00
parent 76758fb24a
commit b8bc9d96f4
3 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

58
hosts/juni/flake.lock generated
View file

@ -31,11 +31,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/beszel", "dir": "flakes/beszel",
"lastModified": 1767107690, "lastModified": 1767112386,
"narHash": "sha256-Y1VmRMaPXgEVusn2e9uOeVe40i5+uUdNMZTOnB7CQsU=", "narHash": "sha256-83/88MzCPe2ukEcPHpH/sLgUDeKBcYIt0BWmn4afQQ4=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "b51768f26b9e9fa7858f3f373f27fe5f87a24bfb", "rev": "76758fb24a9a0e30e5ffe1a1b940c94b6f8f0f3c",
"revCount": 1005, "revCount": 1009,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -64,11 +64,11 @@
"common": { "common": {
"locked": { "locked": {
"dir": "flakes/common", "dir": "flakes/common",
"lastModified": 1767107690, "lastModified": 1767112386,
"narHash": "sha256-Y1VmRMaPXgEVusn2e9uOeVe40i5+uUdNMZTOnB7CQsU=", "narHash": "sha256-83/88MzCPe2ukEcPHpH/sLgUDeKBcYIt0BWmn4afQQ4=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "b51768f26b9e9fa7858f3f373f27fe5f87a24bfb", "rev": "76758fb24a9a0e30e5ffe1a1b940c94b6f8f0f3c",
"revCount": 1005, "revCount": 1009,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -123,11 +123,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/de_plasma", "dir": "flakes/de_plasma",
"lastModified": 1767107690, "lastModified": 1767112386,
"narHash": "sha256-Y1VmRMaPXgEVusn2e9uOeVe40i5+uUdNMZTOnB7CQsU=", "narHash": "sha256-83/88MzCPe2ukEcPHpH/sLgUDeKBcYIt0BWmn4afQQ4=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "b51768f26b9e9fa7858f3f373f27fe5f87a24bfb", "rev": "76758fb24a9a0e30e5ffe1a1b940c94b6f8f0f3c",
"revCount": 1005, "revCount": 1009,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -161,11 +161,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/flatpaks", "dir": "flakes/flatpaks",
"lastModified": 1767107690, "lastModified": 1767112386,
"narHash": "sha256-Y1VmRMaPXgEVusn2e9uOeVe40i5+uUdNMZTOnB7CQsU=", "narHash": "sha256-83/88MzCPe2ukEcPHpH/sLgUDeKBcYIt0BWmn4afQQ4=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "b51768f26b9e9fa7858f3f373f27fe5f87a24bfb", "rev": "76758fb24a9a0e30e5ffe1a1b940c94b6f8f0f3c",
"revCount": 1005, "revCount": 1009,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -1268,11 +1268,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/opencode", "dir": "flakes/opencode",
"lastModified": 1767107690, "lastModified": 1767112386,
"narHash": "sha256-Y1VmRMaPXgEVusn2e9uOeVe40i5+uUdNMZTOnB7CQsU=", "narHash": "sha256-83/88MzCPe2ukEcPHpH/sLgUDeKBcYIt0BWmn4afQQ4=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "b51768f26b9e9fa7858f3f373f27fe5f87a24bfb", "rev": "76758fb24a9a0e30e5ffe1a1b940c94b6f8f0f3c",
"revCount": 1005, "revCount": 1009,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -1478,20 +1478,14 @@
"ragenix": "ragenix" "ragenix": "ragenix"
}, },
"locked": { "locked": {
"dir": "flakes/secrets", "path": "../../flakes/secrets",
"lastModified": 1767107690, "type": "path"
"narHash": "sha256-Y1VmRMaPXgEVusn2e9uOeVe40i5+uUdNMZTOnB7CQsU=",
"ref": "refs/heads/master",
"rev": "b51768f26b9e9fa7858f3f373f27fe5f87a24bfb",
"revCount": 1005,
"type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
"original": { "original": {
"dir": "flakes/secrets", "path": "../../flakes/secrets",
"type": "git", "type": "path"
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" },
} "parent": []
}, },
"systems": { "systems": {
"locked": { "locked": {

17
hosts/juni/hardware-mounts.nix
View file

@ -98,12 +98,16 @@ lib.mkMerge [
# Impermanence fix for working with custom unlock and reset with root bcache # Impermanence fix for working with custom unlock and reset with root bcache
boot.initrd.systemd.services.create-needed-for-boot-dirs = lib.mkIf ENCRYPTED { boot.initrd.systemd.services.create-needed-for-boot-dirs = lib.mkIf ENCRYPTED {
after = [ after = [
"unlock-bcachefs-custom.service"
"bcachefs-reset-root.service" "bcachefs-reset-root.service"
]
++ lib.optionals (USB_KEY != null) [
"unlock-bcachefs-custom.service"
]; ];
requires = [ requires = [
"unlock-bcachefs-custom.service"
"bcachefs-reset-root.service" "bcachefs-reset-root.service"
]
++ lib.optionals (USB_KEY != null) [
"unlock-bcachefs-custom.service"
]; ];
serviceConfig.KeyringMode = "shared"; serviceConfig.KeyringMode = "shared";
}; };
@ -114,10 +118,15 @@ lib.mkMerge [
after = [ after = [
"initrd-root-device.target" "initrd-root-device.target"
"cryptsetup.target" "cryptsetup.target"
]
++ lib.optionals (USB_KEY != null) [
"unlock-bcachefs-custom.service" "unlock-bcachefs-custom.service"
]; ];
requires = [ requires = [
primaryDeviceUnit primaryDeviceUnit
]
++ lib.optionals (USB_KEY != null) [
"unlock-bcachefs-custom.service" "unlock-bcachefs-custom.service"
]; ];
@ -126,8 +135,6 @@ lib.mkMerge [
]; ];
wantedBy = [ wantedBy = [
"initrd-root-fs.target" "initrd-root-fs.target"
"sysroot.mount"
"initrd.target"
]; ];
serviceConfig = { serviceConfig = {
@ -172,7 +179,6 @@ lib.mkMerge [
''; '';
}; };
}) })
# If you mess up decruption password this reboots for retry instead of getting stuck # If you mess up decruption password this reboots for retry instead of getting stuck
(lib.mkIf ENCRYPTED { (lib.mkIf ENCRYPTED {
boot.kernelParams = [ boot.kernelParams = [
@ -258,5 +264,4 @@ lib.mkMerge [
''; '';
}; };
}) })
] ]

1
hosts/juni/impermanence.nix
View file

@ -12,6 +12,7 @@
"/etc/nixos" "/etc/nixos"
"/etc/ssh" "/etc/ssh"
"/etc/shadow" # keep passwords
"/etc/NetworkManager/system-connections" "/etc/NetworkManager/system-connections"
"/var/lib/bluetooth" "/var/lib/bluetooth"