diff options
author | makefu <github@syntax-fehler.de> | 2023-06-23 22:58:27 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2023-06-23 22:58:27 +0200 |
commit | 903b8639805f31148014a197e9078f1a7b1eb759 (patch) | |
tree | 660c40f2fb22b420664a99df95c45f75374c9fb6 | |
parent | 1c4b5c4174093fe84da9040d101c5d7ce77cc828 (diff) |
fs/disko: disks -> disk
-rw-r--r-- | 1systems/tsp/config.nix | 2 | ||||
-rw-r--r-- | 1systems/x/config.nix | 13 | ||||
-rw-r--r-- | 1systems/x/x13/amdgpu.nix | 1 | ||||
-rw-r--r-- | 1systems/x/x13/default.nix | 2 | ||||
-rw-r--r-- | 2configs/fs/disko/single-disk-encrypted-zfs.nix | 6 |
5 files changed, 13 insertions, 11 deletions
diff --git a/1systems/tsp/config.nix b/1systems/tsp/config.nix index 5e2c6c9c6..86f58ed2c 100644 --- a/1systems/tsp/config.nix +++ b/1systems/tsp/config.nix @@ -14,7 +14,7 @@ ../../2configs/tools/core.nix # ../../2configs/tools/all.nix - ((import ../../2configs/fs/disko/single-disk-encrypted-zfs.nix ) { disks = ["/dev/sda" ]; hostId = "f8b8e0a2"; }) + ((import ../../2configs/fs/disko/single-disk-encrypted-zfs.nix ) { disk = "/dev/sda"; hostId = "f8b8e0a2"; }) # hardware specifics are in here ../../2configs/hw/bluetooth.nix ../../2configs/hw/network-manager.nix diff --git a/1systems/x/config.nix b/1systems/x/config.nix index 2835117c6..18722dc3d 100644 --- a/1systems/x/config.nix +++ b/1systems/x/config.nix @@ -37,11 +37,14 @@ ../../2configs/editor/neovim ../../2configs/tools/all.nix { programs.adb.enable = true; } - { - services.openssh.hostKeys = [ - { bits = 4096; path = (toString <secrets/ssh_host_rsa_key>); type = "rsa";} - ]; - } + + # secrets: now deployed once at host provisioning + { state = [ "/etc/ssh/ssh_host_rsa_key" ]; } + #{ + # services.openssh.hostKeys = [ + # { bits = 4096; path = (toString <secrets/ssh_host_rsa_key>); type = "rsa";} + # ]; + #} #{ # imports = [ # ../../2configs/bureautomation/rhasspy.nix diff --git a/1systems/x/x13/amdgpu.nix b/1systems/x/x13/amdgpu.nix index a6e4286bd..fb7a97fd4 100644 --- a/1systems/x/x13/amdgpu.nix +++ b/1systems/x/x13/amdgpu.nix @@ -1,3 +1,4 @@ +{ pkgs, ... }: { services.xserver.videoDrivers = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ]; diff --git a/1systems/x/x13/default.nix b/1systems/x/x13/default.nix index bd812c341..f5dee3382 100644 --- a/1systems/x/x13/default.nix +++ b/1systems/x/x13/default.nix @@ -4,7 +4,7 @@ imports = [ ./input.nix - ((import ../../../2configs/fs/disko/single-disk-encrypted-zfs.nix ) { disks = ["/dev/nvme0n1" ]; hostId = "f8b8e0a3"; }) + ((import ../../../2configs/fs/disko/single-disk-encrypted-zfs.nix ) { disks ="/dev/nvme0n1"; hostId = "f8b8e0a3"; }) ./battery.nix ./amdgpu.nix ../../../2configs/hw/bluetooth.nix diff --git a/2configs/fs/disko/single-disk-encrypted-zfs.nix b/2configs/fs/disko/single-disk-encrypted-zfs.nix index 9454c9892..dabf4388f 100644 --- a/2configs/fs/disko/single-disk-encrypted-zfs.nix +++ b/2configs/fs/disko/single-disk-encrypted-zfs.nix @@ -1,7 +1,5 @@ -{ disks ? [ "/dev/nvme0n1" ], hostId, ... }: -let - disk = builtins.elemAt disks 0; -in { +{ disk ? "/dev/nvme0n1", hostId, ... }: +{ boot.zfs.requestEncryptionCredentials = true; boot.supportedFilesystems = [ "zfs" ]; boot.loader.efi.canTouchEfiVariables = true; |