qenya/nixfiles
1
0
Fork 0
Code Issues 5 Pull requests Actions Activity

kilgharrah: move all zfs dataset declarations to one place

Browse source
This commit is contained in:
Katherina Walshe-Grey 2024-10-08 10:54:02 +01:00
parent acf451a1c9
commit 8823cd9b36
3 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
hosts/kilgharrah/default.nix
View file

@ -44,17 +44,6 @@
dataDir = "/srv/music"; dataDir = "/srv/music";
}; };
randomcat.services.zfs.datasets = {
"rpool_albion/data" = { mountpoint = "none"; };
"rpool_albion/data/steam" = { mountpoint = "/home/qenya/.local/share/Steam"; };
"rpool_albion/state" = { mountpoint = "none"; };
"rpool_albion/state/jellyfin" = { mountpoint = "/var/lib/jellyfin"; };
"rpool_albion/state/navidrome" = { mountpoint = "/var/lib/navidrome"; };
"rpool_albion/srv" = { mountpoint = "none"; };
"rpool_albion/srv/jellyfin" = { mountpoint = "/srv/jellyfin"; };
"rpool_albion/srv/music" = { mountpoint = "/srv/music"; };
};
system.stateVersion = "24.05"; system.stateVersion = "24.05";
} }

32
hosts/kilgharrah/filesystems.nix
View file

@ -1,16 +1,12 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
# SSD on board
boot.initrd.luks.devices = { boot.initrd.luks.devices = {
"cryptroot".device = "/dev/disk/by-uuid/b414aaba-0a36-4135-a7e1-dc9489286acd"; "cryptroot".device = "/dev/disk/by-uuid/b414aaba-0a36-4135-a7e1-dc9489286acd";
}; };
environment.etc.crypttab.text = ''
albion UUID=acda0e7a-069f-47c7-8e37-ec00e7cdde0f /root/luks-albion.key
'';
boot.supportedFilesystems = [ "ntfs" ]; # for USB drives
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/disk/by-uuid/ad4cbc18-8849-40ed-b0bf-097f8f46346b"; device = "/dev/disk/by-uuid/ad4cbc18-8849-40ed-b0bf-097f8f46346b";
@ -68,4 +64,28 @@
device = "/swap/swapfile"; device = "/swap/swapfile";
size = 32 * 1024; size = 32 * 1024;
}]; }];
# HDD in bay
environment.etc.crypttab.text = ''
albion UUID=acda0e7a-069f-47c7-8e37-ec00e7cdde0f /root/luks-albion.key
'';
randomcat.services.zfs.datasets = {
"rpool_albion/data" = { mountpoint = "none"; };
"rpool_albion/data/steam" = { mountpoint = "/home/qenya/.local/share/Steam"; };
"rpool_albion/state" = { mountpoint = "none"; };
"rpool_albion/state/jellyfin" = { mountpoint = "/var/lib/jellyfin"; };
"rpool_albion/state/navidrome" = { mountpoint = "/var/lib/navidrome"; };
"rpool_albion/srv" = { mountpoint = "none"; };
"rpool_albion/srv/ftp" = { mountpoint = "/srv/ftp"; };
"rpool_albion/srv/jellyfin" = { mountpoint = "/srv/jellyfin"; };
"rpool_albion/srv/music" = { mountpoint = "/srv/music"; };
};
# Other
boot.supportedFilesystems = [ "ntfs" ]; # for USB drives
} }

5
hosts/kilgharrah/ftp.nix
View file

@ -1,11 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
randomcat.services.zfs.datasets = {
"rpool_albion/srv" = { mountpoint = "none"; };
"rpool_albion/srv/ftp" = { mountpoint = "/srv/ftp"; };
};
age.secrets.ftp-userDb-qenya = { age.secrets.ftp-userDb-qenya = {
# To update this, see the nixos docs for services.vsftpd.userDbPath. Note # To update this, see the nixos docs for services.vsftpd.userDbPath. Note
# that the command it gives to create a userDb, if applied to an *existing* # that the command it gives to create a userDb, if applied to an *existing*