Mirror/nix-git
Mirror/nix-git
1
0
Fork 0
mirror of https://codeberg.org/privacy1st/nix-git synced 2024-11-21 22:03:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ssh-unlock'

Browse Source
This commit is contained in:
Daniel Langbein 2023-09-07 20:27:21 +02:00
commit 21e1dffba2
2 changed files with 22 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/ssh/known_hosts
View File

@ -1,2 +1,4 @@
# 2023-07 yodaNas with Arch Linux # 2023-07 yodaNas with Arch Linux
[p1st.de]:2222 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIASF7AJeGIkQG0erOJym8bHLBjRClkdPPCDNZAKOZ6S+ [p1st.de]:2222 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIASF7AJeGIkQG0erOJym8bHLBjRClkdPPCDNZAKOZ6S+
# 2023-09 yodaTux NixOS early SSH FDE unlock
[yodaTux.localhost]:22 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII1QKkJg9ekAAxTADCXIvHylrYOc6EdEyKUmKaQhaW3e

56
modules/fde-ssh-unlock.nix
View File

@ -1,46 +1,28 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
# TODO # SSH in initrd
boot.initrd.network.enable = true;
boot.initrd.network.ssh = {
enable = true;
port = 22;
shell = "/bin/cryptsetup-askpass";
authorizedKeys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCpgihAg8Qzu5q+AGXHLR7p+rrS1yB0KlZb/Y/EwZT15EhEtsUMqBMRiY0TdjKQU0broyygZnymccLmCXvihEgk3zk/hP8VEDmN5wmE2tRBPR4lSjo8E1R8N79G+gaFkwi93QYh57MsGfa9k4tvGrJy0yaD7GrPqtQf+IIuvV14WJQAqnikTdbFqRjk5JGearYLU7jSKa+9NmR7JQ9NExoyIPgmQ/pd0Xc2qt8k5UGfz3HM9MAmIVQ30whK6m1iYZ8nxEidHrfreQx8NOa7ujo4zQnV1NYvRUjObr/qyIhPU6DYLT2mVRNupQFKx6LI38O4U13heugUFqJ3zvog3aDsriFiv8jzJAJvWXx7Q3TqKhqiG9VTkwBw1NDbCAOXKiEdMfiCYbdCfpNgdepU75bMloJcSQQVUqoH2tQhSbwKLuRFgOnyaHpvWbieXBRcUnfG8gg4p4jqiwx5laweEeOIOD/i7G1Mjx7Dj2ctnT/ILat/xsf+Y0W4eJr3bc5L9ghgw6wsKbNSqwjFUCFcHcARK3gvSH+hO2/BpgMVoyvZjO5PNuUqfsZ7bIIs5cDdyB/ly3irKuaRz1+3x1x4gPgSiOcji7HxPwogzhPsyfoRLHNt9tJ5X4nF2Iz1M5RTJpbZCi6yEj+9Q85FVjD76BEWuZe18kRrwhuLf/XgKdF9tQ== openpgp:0xA8B75370"
];
hostKeys = [ "/etc/secrets/initrd/ssh_host_ed25519_key" ];
};
# # Kernel # Network in initrd
# # boot.kernelPackages = pkgs.linuxPackages_latest;
# # boot.kernelPackages = pkgs.linuxPackages_hardened;
# #
# # SSH early boot setup # Find out which module is used for network card:
# boot.initrd.network.enable = true; # lspci -v | grep -iA8 'network\|ethernet'
# boot.initrd.network.ssh = { # Or check the "Network" part of:
# enable = true; # inxi -F
# port = 22;
# shell = "/bin/cryptsetup-askpass";
# authorizedKeys = [
# "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCpgihAg8Qzu5q+AGXHLR7p+rrS1yB0KlZb/Y/EwZT15EhEtsUMqBMRiY0TdjKQU0broyygZnymccLmCXvihEgk3zk/hP8VEDmN5wmE2tRBPR4lSjo8E1R8N79G+gaFkwi93QYh57MsGfa9k4tvGrJy0yaD7GrPqtQf+IIuvV14WJQAqnikTdbFqRjk5JGearYLU7jSKa+9NmR7JQ9NExoyIPgmQ/pd0Xc2qt8k5UGfz3HM9MAmIVQ30whK6m1iYZ8nxEidHrfreQx8NOa7ujo4zQnV1NYvRUjObr/qyIhPU6DYLT2mVRNupQFKx6LI38O4U13heugUFqJ3zvog3aDsriFiv8jzJAJvWXx7Q3TqKhqiG9VTkwBw1NDbCAOXKiEdMfiCYbdCfpNgdepU75bMloJcSQQVUqoH2tQhSbwKLuRFgOnyaHpvWbieXBRcUnfG8gg4p4jqiwx5laweEeOIOD/i7G1Mjx7Dj2ctnT/ILat/xsf+Y0W4eJr3bc5L9ghgw6wsKbNSqwjFUCFcHcARK3gvSH+hO2/BpgMVoyvZjO5PNuUqfsZ7bIIs5cDdyB/ly3irKuaRz1+3x1x4gPgSiOcji7HxPwogzhPsyfoRLHNt9tJ5X4nF2Iz1M5RTJpbZCi6yEj+9Q85FVjD76BEWuZe18kRrwhuLf/XgKdF9tQ== openpgp:0xA8B75370"
# ];
# hostKeys = [ "/etc/secrets/initrd/ssh_host_ed25519_key" ];
# };
# # Find out which module is used for network card:
# # lspci -v | grep -iA8 'network\|ethernet'
# # Or check the "Network" part of:
# # inxi -F
# #
## boot.initrd.availableKernelModules = [ "r8152" ];
## boot.extraModulePackages = with config.boot.kernelPackages; [
## r8152
## ];
# boot.initrd.kernelModules = [
# # Arch wiki: Mkinitcpio MODULES: USB 3 hub
# "usbhid"
# "xhci_hcd"
# #
# # Realtek RTL8152/RTL8153 Based USB Ethernet Adapters boot.initrd.availableKernelModules = [ "r8169" ]; # TODO: This value is valid for yodaTux only
# "r8152"
# #
# #"usbcore" # dmesg -> enp0s20f0u1u2: renamed from eth0
# # MII hardware support library
# #"mii"
# # USB HID core driver
# #"usbhid"
# ];
# # dmesg -> enp0s20f0u1u2: renamed from eth0
#boot.kernelParams = [ "ip=:::::eth0:dhcp" ]; #boot.kernelParams = [ "ip=:::::eth0:dhcp" ];
boot.kernelParams = [ "ip=dhcp" ];
} }