Make the two servers work together better and move things around

This commit is contained in:
Bun 2025-04-04 01:43:08 -04:00
parent dbecb3e57e
commit dad0e0deb4
5 changed files with 23 additions and 15 deletions

View file

@ -7,7 +7,7 @@
options = [ "nosuid" "nodev" "nofail" "x-gvfs-show" ]; options = [ "nosuid" "nodev" "nofail" "x-gvfs-show" ];
}; };
"/home/${config.sysusers.main}/Midas" = { "/home/${config.sysusers.main}/Midas" = {
device = "10.2.0.1:/"; device = "10.2.0.1:/storage";
fsType = "nfs4"; fsType = "nfs4";
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ]; options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
}; };

View file

@ -1,9 +1,16 @@
{ ... }: { ... }:
{ {
fileSystems."/persist" = { fileSystems = {
device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; "/persist" = {
fsType = "btrfs"; device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
neededForBoot = true; fsType = "btrfs";
options = [ "subvol=persist" "compress=zstd" "noatime" ]; neededForBoot = true;
options = [ "subvol=persist" "compress=zstd" "noatime" ];
};
"/kitty" = {
device = "10.2.0.2:/storage/BunStore";
fsType = "nfs4";
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
};
}; };
} }

View file

@ -31,13 +31,13 @@
}; };
# Network mounts # Network mounts
"/home/${config.sysusers.main}/Midas" = { "/home/${config.sysusers.main}/Network/Midas" = {
device = "10.2.0.1:/"; device = "10.2.0.1:/storage";
fsType = "nfs4"; fsType = "nfs4";
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ]; options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
}; };
"/home/${config.sysusers.main}/Kitty" = { "/home/${config.sysusers.main}/Network/Kitty" = {
device = "10.2.0.2:/"; device = "10.2.0.2:/storage/BunStore";
fsType = "nfs4"; fsType = "nfs4";
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ]; options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
}; };

View file

@ -107,10 +107,11 @@
n:/etc/nixos n:/etc/nixos
# Remote files # Remote files
H:/home/${config.home.username}/Midas/storage H:/home/${config.home.username}/Network/Midas/
K:/home/${config.home.username}/Midas/storage/Files K:/home/${config.home.username}/Network/Midas/Files
V:/home/${config.home.username}/Midas/storage/Media M:/home/${config.home.username}/Network/Midas/Music
M:/home/${config.home.username}/Midas/storage/Music V:/home/${config.home.username}/Network/Midas/Videos
V:/home/${config.home.username}/Network/Midas/Photos
''; '';
}; };
packages = with pkgs; [ packages = with pkgs; [

View file

@ -4,7 +4,7 @@
mpd = { mpd = {
enable = true; enable = true;
network.startWhenNeeded = true; network.startWhenNeeded = true;
musicDirectory = "${config.home.homeDirectory}/Midas/storage/Music/NixBops"; musicDirectory = "${config.home.homeDirectory}/Network/Midas/Music/NixBops";
playlistDirectory = "${config.services.mpd.musicDirectory}/Playlists"; playlistDirectory = "${config.services.mpd.musicDirectory}/Playlists";
extraConfig = '' extraConfig = ''
audio_output { audio_output {