diff --git a/hosts/i001/flake.lock b/hosts/i001/flake.lock index e6b7c226..e47a215c 100644 --- a/hosts/i001/flake.lock +++ b/hosts/i001/flake.lock @@ -3,11 +3,11 @@ "common": { "locked": { "dir": "flakes/common", - "lastModified": 1765659968, - "narHash": "sha256-5/qgjgTwTkaIZIoIrlfzf6VcED99f8oyleodbxI2UGM=", + "lastModified": 1765663391, + "narHash": "sha256-qQAJr60fHl82EOroaazNh94Jy54Hz8Q6a52aZ+gcA5w=", "ref": "refs/heads/master", - "rev": "f6d01063b2192fcf4f4b4b1b03bbeeeb084beb4a", - "revCount": 884, + "rev": "d08b8f6f7218844096edb7f31e56d280c338721d", + "revCount": 889, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -23,11 +23,11 @@ }, "locked": { "dir": "flakes/de_plasma", - "lastModified": 1765663367, - "narHash": "sha256-JICeLQ1od4dnHfA0cH5d4A6Je3Qso9aQ4gHhHKMTcjc=", + "lastModified": 1765663391, + "narHash": "sha256-qQAJr60fHl82EOroaazNh94Jy54Hz8Q6a52aZ+gcA5w=", "ref": "refs/heads/master", - "rev": "dc89a7bbe37b3b14cdd8cf8d78fcb0c2c9395ead", - "revCount": 888, + "rev": "d08b8f6f7218844096edb7f31e56d280c338721d", + "revCount": 889, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, diff --git a/hosts/i001/flake.nix b/hosts/i001/flake.nix index f2c7aa00..0cbfc5ab 100644 --- a/hosts/i001/flake.nix +++ b/hosts/i001/flake.nix @@ -121,8 +121,12 @@ "networkmanager" ]; openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH2KFSRkViT+asBTjCgA7LNP3SHnfNCW+jHbV08VUuIi nix2nix" ]; }; + root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH2KFSRkViT+asBTjCgA7LNP3SHnfNCW+jHbV08VUuIi nix2nix" + ]; }; # Specifics for this machine diff --git a/hosts/i001/hardware-mounts.nix b/hosts/i001/hardware-mounts.nix index 5888133f..6451bf9d 100644 --- a/hosts/i001/hardware-mounts.nix +++ b/hosts/i001/hardware-mounts.nix @@ -74,8 +74,9 @@ in copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs ''; + # Method 1, prompt user for password on boot boot.initrd.preDeviceCommands = '' - ${pkgs.bcachefs-tools}/bin/bcachefs unlock /dev/disk/by-uuid/XXXX + ${pkgs.bcachefs-tools}/bin/bcachefs unlock ${PRIMARY} ''; # # Run unlock before devices are scanned/mounted