Generalize nfs path
This commit is contained in:
parent
58e165ad1d
commit
b3310802cb
12 changed files with 15 additions and 34 deletions
|
@ -15,7 +15,7 @@
|
|||
|
||||
# Network mounts
|
||||
"/home/${config.sysusers.main}/KittyNFS" = {
|
||||
device = "10.100.0.1:/export/KittyNFS";
|
||||
device = "10.100.0.1:/storage";
|
||||
fsType = "nfs4";
|
||||
options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
|
||||
};
|
||||
|
|
|
@ -1,21 +1,16 @@
|
|||
{ lib, ... }:
|
||||
{
|
||||
imports = [
|
||||
./filesystems
|
||||
./hardware
|
||||
./users
|
||||
../../modules/system
|
||||
];
|
||||
|
||||
networking = {
|
||||
hostName = "extern";
|
||||
wg-quick.interfaces.wgc.address = [ "10.100.0.21/24" ];
|
||||
};
|
||||
networking.hostName = "iso";
|
||||
|
||||
system = {
|
||||
desktop.enable = true;
|
||||
wireless.enable = true;
|
||||
wireguard.client.enable = true;
|
||||
video.nvidia.enable = true;
|
||||
libvirtd.enable = true;
|
||||
stateVersion = "24.11";
|
||||
|
|
|
@ -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" ];
|
||||
};
|
||||
};
|
||||
}
|
|
@ -6,5 +6,4 @@
|
|||
neededForBoot = true;
|
||||
options = [ "subvol=persist" "compress=zstd" "noatime" ];
|
||||
};
|
||||
environment.persistence."/persist".directories = [ "/export/KittyNFS" ];
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
fileSystems = {
|
||||
# Network mounts
|
||||
"/home/${config.sysusers.main}/KittyNFS" = {
|
||||
device = "${config.ips.server}:/export/KittyNFS";
|
||||
device = "${config.ips.server}:/storage";
|
||||
fsType = "nfs4";
|
||||
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
|
||||
};
|
||||
|
|
|
@ -1,11 +1,8 @@
|
|||
{ ... }:
|
||||
{
|
||||
fileSystems = {
|
||||
# Misc bulk storage
|
||||
"/export/Bulk" = {
|
||||
device = "/dev/disk/by-uuid/ef465845-cc56-4db5-9260-8ae515eb025e";
|
||||
fsType = "btrfs";
|
||||
noCheck = true;
|
||||
};
|
||||
fileSystems."/persist/storage" = {
|
||||
device = "/dev/disk/by-uuid/ef465845-cc56-4db5-9260-8ae515eb025e";
|
||||
fsType = "btrfs";
|
||||
noCheck = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
options = [ "nosuid" "nodev" ];
|
||||
};
|
||||
"/home/${config.sysusers.main}/KittyNFS" = {
|
||||
device = "10.100.0.1:/export/KittyNFS";
|
||||
device = "10.100.0.1:/storage";
|
||||
fsType = "nfs4";
|
||||
options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
|
||||
};
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
# Network mounts
|
||||
"/home/${config.sysusers.main}/KittyNFS" = {
|
||||
device = "${config.ips.server}:/export/KittyNFS";
|
||||
device = "${config.ips.server}:/storage";
|
||||
fsType = "nfs4";
|
||||
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
|
||||
};
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
environment.persistence."/persist" = {
|
||||
hideMounts = true;
|
||||
directories = [
|
||||
"/storage"
|
||||
"/etc/nixos"
|
||||
"/var/lib/nixos"
|
||||
{ directory = "/etc/secureboot"; mode = "0700"; }
|
||||
|
|
|
@ -3,9 +3,9 @@
|
|||
services.nfs.server = {
|
||||
enable = config.system.fileserver.enable;
|
||||
exports = ''
|
||||
/export/KittyNFS/Files *(rw,sync,no_subtree_check)
|
||||
/export/KittyNFS/Media *(rw,sync,no_subtree_check)
|
||||
/export/KittyNFS/Music *(rw,sync,no_subtree_check)
|
||||
/storage/Files *(rw,sync,no_subtree_check)
|
||||
/storage/Media *(rw,sync,no_subtree_check)
|
||||
/storage/Music *(rw,sync,no_subtree_check)
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
settings.init.allow_root.set(true)
|
||||
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])
|
||||
|
||||
output.icecast(
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
settings.init.allow_root.set(true)
|
||||
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])
|
||||
|
||||
output.icecast(
|
||||
|
|
Loading…
Add table
Reference in a new issue