makefu/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fs/disko: disks -> disk

Browse source
This commit is contained in:
makefu 2023-06-23 22:58:27 +02:00
parent 1c4b5c4174
commit 903b863980
5 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
1systems/tsp/config.nix
View file

@ -14,7 +14,7 @@
../../2configs/tools/core.nix ../../2configs/tools/core.nix
# ../../2configs/tools/all.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 # hardware specifics are in here
../../2configs/hw/bluetooth.nix ../../2configs/hw/bluetooth.nix
../../2configs/hw/network-manager.nix ../../2configs/hw/network-manager.nix

13
1systems/x/config.nix
View file

@ -37,11 +37,14 @@
../../2configs/editor/neovim ../../2configs/editor/neovim
../../2configs/tools/all.nix ../../2configs/tools/all.nix
{ programs.adb.enable = true; } { programs.adb.enable = true; }
{
services.openssh.hostKeys = [ # secrets: now deployed once at host provisioning
{ bits = 4096; path = (toString <secrets/ssh_host_rsa_key>); type = "rsa";} { state = [ "/etc/ssh/ssh_host_rsa_key" ]; }
]; #{
} # services.openssh.hostKeys = [
# { bits = 4096; path = (toString <secrets/ssh_host_rsa_key>); type = "rsa";}
# ];
#}
#{ #{
# imports = [ # imports = [
# ../../2configs/bureautomation/rhasspy.nix # ../../2configs/bureautomation/rhasspy.nix

1
1systems/x/x13/amdgpu.nix
View file

@ -1,3 +1,4 @@
{ pkgs, ... }:
{ {
services.xserver.videoDrivers = [ "amdgpu" ]; services.xserver.videoDrivers = [ "amdgpu" ];
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];

2
1systems/x/x13/default.nix
View file

@ -4,7 +4,7 @@
imports = [ imports = [
./input.nix ./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 ./battery.nix
./amdgpu.nix ./amdgpu.nix
../../../2configs/hw/bluetooth.nix ../../../2configs/hw/bluetooth.nix

6
2configs/fs/disko/single-disk-encrypted-zfs.nix
View file

@ -1,7 +1,5 @@
{ disks ? [ "/dev/nvme0n1" ], hostId, ... }: { disk ? "/dev/nvme0n1", hostId, ... }:
let {
disk = builtins.elemAt disks 0;
in {
boot.zfs.requestEncryptionCredentials = true; boot.zfs.requestEncryptionCredentials = true;
boot.supportedFilesystems = [ "zfs" ]; boot.supportedFilesystems = [ "zfs" ];
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;