imterah/nix-infra
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

fix: Make configuration installable

Browse source
This commit is contained in:
Tera << 8 2025-05-05 21:58:28 -04:00
parent dd929d89d3
commit 8a2f7309ec
Signed by: imterah
GPG key ID: 8FA7DD57BA6CEA37
4 changed files with 44 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

54
system/disko.nix
View file

@ -21,28 +21,38 @@
size = "100%";
name = "NixOS";
content = {
type = "btrfs";
extraArgs = ["-f"];
subvolumes = {
root = {
name = "root";
mountpoint = "/";
};
persist = {
name = "persist";
mountpoint = "/persist";
mountOptions = ["subvol=persist" "noatime"];
};
home = {
name = "home";
mountpoint = "/home";
mountOptions = ["subvol=home" "noatime"];
};
nix = {
name = "nix";
mountpoint = "/nix";
mountOptions = ["compress=zstd" "subvol=nix" "noatime"];
};
type = "lvm_pv";
vg = "root_vg";
};
};
};
};
};
};
lvm_vg = {
root_vg = {
type = "lvm_vg";
lvs = {
root = {
size = "100%FREE";
content = {
type = "btrfs";
extraArgs = ["-f"];
subvolumes = {
"/root" = {
mountpoint = "/";
};
"/persist" = {
mountpoint = "/persist";
mountOptions = ["subvol=persist" "noatime"];
};
"/home" = {
mountpoint = "/home";
mountOptions = ["subvol=home" "noatime"];
};
"/nix" = {
mountpoint = "/nix";
mountOptions = ["subvol=nix" "noatime"];
};
};
};

8
system/sops.nix
View file

@ -9,10 +9,10 @@ in
sops = {
defaultSopsFile = "${secretspath}/secrets.yaml";
age = {
# I'd prefer different OpenSSH keys for different hosts so I'm not 100% screwed if one of my devices get compromised.
# Therefore, we set a custom path for the sops key.
sshKeyPaths = ["/var/lib/sops-nix/ssh_host_ed25519_key"];
keyFile = "/var/lib/sops-nix/key.txt";
# I'd prefer different OpenSSH keys for different hosts so I'm not 100% screwed if one of my devices get compromised (SSH traffic potentially being decrypted and analyzed).
# Therefore, we set a custom path for the sops key & let the SSH key be generated automagically.
sshKeyPaths = ["/persist/var/lib/sops-nix/ssh_host_ed25519_key"];
keyFile = "/persist/var/lib/sops-nix/key.txt";
generateKey = false;
};
secrets = {