Generalize nfs path

This commit is contained in:
Bun 2025-03-08 02:44:09 -05:00
parent 58e165ad1d
commit b3310802cb
12 changed files with 15 additions and 34 deletions

View file

@ -15,7 +15,7 @@
# Network mounts # Network mounts
"/home/${config.sysusers.main}/KittyNFS" = { "/home/${config.sysusers.main}/KittyNFS" = {
device = "10.100.0.1:/export/KittyNFS"; device = "10.100.0.1:/storage";
fsType = "nfs4"; fsType = "nfs4";
options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ]; options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
}; };

View file

@ -1,21 +1,16 @@
{ lib, ... }: { lib, ... }:
{ {
imports = [ imports = [
./filesystems
./hardware ./hardware
./users ./users
../../modules/system ../../modules/system
]; ];
networking = { networking.hostName = "iso";
hostName = "extern";
wg-quick.interfaces.wgc.address = [ "10.100.0.21/24" ];
};
system = { system = {
desktop.enable = true; desktop.enable = true;
wireless.enable = true; wireless.enable = true;
wireguard.client.enable = true;
video.nvidia.enable = true; video.nvidia.enable = true;
libvirtd.enable = true; libvirtd.enable = true;
stateVersion = "24.11"; stateVersion = "24.11";

View file

@ -1,11 +0,0 @@
{ config, ... }:
{
fileSystems = {
# Network mounts
"/home/${config.sysusers.main}/KittyNFS" = {
device = "10.100.0.1:/export/KittyNFS";
fsType = "nfs4";
options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
};
};
}

View file

@ -6,5 +6,4 @@
neededForBoot = true; neededForBoot = true;
options = [ "subvol=persist" "compress=zstd" "noatime" ]; options = [ "subvol=persist" "compress=zstd" "noatime" ];
}; };
environment.persistence."/persist".directories = [ "/export/KittyNFS" ];
} }

View file

@ -3,7 +3,7 @@
fileSystems = { fileSystems = {
# Network mounts # Network mounts
"/home/${config.sysusers.main}/KittyNFS" = { "/home/${config.sysusers.main}/KittyNFS" = {
device = "${config.ips.server}:/export/KittyNFS"; device = "${config.ips.server}:/storage";
fsType = "nfs4"; fsType = "nfs4";
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ]; options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
}; };

View file

@ -1,11 +1,8 @@
{ ... }: { ... }:
{ {
fileSystems = { fileSystems."/persist/storage" = {
# Misc bulk storage device = "/dev/disk/by-uuid/ef465845-cc56-4db5-9260-8ae515eb025e";
"/export/Bulk" = { fsType = "btrfs";
device = "/dev/disk/by-uuid/ef465845-cc56-4db5-9260-8ae515eb025e"; noCheck = true;
fsType = "btrfs";
noCheck = true;
};
}; };
} }

View file

@ -6,7 +6,7 @@
options = [ "nosuid" "nodev" ]; options = [ "nosuid" "nodev" ];
}; };
"/home/${config.sysusers.main}/KittyNFS" = { "/home/${config.sysusers.main}/KittyNFS" = {
device = "10.100.0.1:/export/KittyNFS"; device = "10.100.0.1:/storage";
fsType = "nfs4"; fsType = "nfs4";
options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ]; options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
}; };

View file

@ -40,7 +40,7 @@
# Network mounts # Network mounts
"/home/${config.sysusers.main}/KittyNFS" = { "/home/${config.sysusers.main}/KittyNFS" = {
device = "${config.ips.server}:/export/KittyNFS"; device = "${config.ips.server}:/storage";
fsType = "nfs4"; fsType = "nfs4";
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ]; options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
}; };

View file

@ -3,6 +3,7 @@
environment.persistence."/persist" = { environment.persistence."/persist" = {
hideMounts = true; hideMounts = true;
directories = [ directories = [
"/storage"
"/etc/nixos" "/etc/nixos"
"/var/lib/nixos" "/var/lib/nixos"
{ directory = "/etc/secureboot"; mode = "0700"; } { directory = "/etc/secureboot"; mode = "0700"; }

View file

@ -3,9 +3,9 @@
services.nfs.server = { services.nfs.server = {
enable = config.system.fileserver.enable; enable = config.system.fileserver.enable;
exports = '' exports = ''
/export/KittyNFS/Files *(rw,sync,no_subtree_check) /storage/Files *(rw,sync,no_subtree_check)
/export/KittyNFS/Media *(rw,sync,no_subtree_check) /storage/Media *(rw,sync,no_subtree_check)
/export/KittyNFS/Music *(rw,sync,no_subtree_check) /storage/Music *(rw,sync,no_subtree_check)
''; '';
}; };
} }

View file

@ -7,7 +7,7 @@
settings.init.allow_root.set(true) settings.init.allow_root.set(true)
settings.scheduler.fast_queues.set(2) settings.scheduler.fast_queues.set(2)
stream = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/KittyNFS/Music/NixBops")) stream = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/storage/Music/NixBops"))
stream_fallback = fallback([stream, stream]) stream_fallback = fallback([stream, stream])
output.icecast( output.icecast(

View file

@ -7,7 +7,7 @@
settings.init.allow_root.set(true) settings.init.allow_root.set(true)
settings.scheduler.fast_queues.set(2) settings.scheduler.fast_queues.set(2)
stream = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/KittyNFS/Music/Scrap")) stream = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/storage/Music/Scrap"))
stream_fallback = fallback([stream, stream]) stream_fallback = fallback([stream, stream])
output.icecast( output.icecast(