From dad0e0deb47c1f9bc0d21e899c62e6e39ba36cdd Mon Sep 17 00:00:00 2001 From: Bun Date: Fri, 4 Apr 2025 01:43:08 -0400 Subject: [PATCH] Make the two servers work together better and move things around --- hosts/kitty/filesystems/default.nix | 2 +- hosts/midas/filesystems/default.nix | 17 ++++++++++++----- hosts/tower/filesystems/default.nix | 8 ++++---- .../home/programs/terminal/ranger/default.nix | 9 +++++---- modules/home/services/mpd/default.nix | 2 +- 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/hosts/kitty/filesystems/default.nix b/hosts/kitty/filesystems/default.nix index 729cf9f6..6ffba79a 100644 --- a/hosts/kitty/filesystems/default.nix +++ b/hosts/kitty/filesystems/default.nix @@ -7,7 +7,7 @@ options = [ "nosuid" "nodev" "nofail" "x-gvfs-show" ]; }; "/home/${config.sysusers.main}/Midas" = { - device = "10.2.0.1:/"; + device = "10.2.0.1:/storage"; fsType = "nfs4"; options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ]; }; diff --git a/hosts/midas/filesystems/default.nix b/hosts/midas/filesystems/default.nix index b3918e85..4a622e7e 100644 --- a/hosts/midas/filesystems/default.nix +++ b/hosts/midas/filesystems/default.nix @@ -1,9 +1,16 @@ { ... }: { - fileSystems."/persist" = { - device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; - fsType = "btrfs"; - neededForBoot = true; - options = [ "subvol=persist" "compress=zstd" "noatime" ]; + fileSystems = { + "/persist" = { + device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; + fsType = "btrfs"; + 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" ]; + }; }; } diff --git a/hosts/tower/filesystems/default.nix b/hosts/tower/filesystems/default.nix index 8d118819..0d604689 100644 --- a/hosts/tower/filesystems/default.nix +++ b/hosts/tower/filesystems/default.nix @@ -31,13 +31,13 @@ }; # Network mounts - "/home/${config.sysusers.main}/Midas" = { - device = "10.2.0.1:/"; + "/home/${config.sysusers.main}/Network/Midas" = { + device = "10.2.0.1:/storage"; fsType = "nfs4"; options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ]; }; - "/home/${config.sysusers.main}/Kitty" = { - device = "10.2.0.2:/"; + "/home/${config.sysusers.main}/Network/Kitty" = { + device = "10.2.0.2:/storage/BunStore"; fsType = "nfs4"; options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ]; }; diff --git a/modules/home/programs/terminal/ranger/default.nix b/modules/home/programs/terminal/ranger/default.nix index 2a679e18..a90a871a 100644 --- a/modules/home/programs/terminal/ranger/default.nix +++ b/modules/home/programs/terminal/ranger/default.nix @@ -107,10 +107,11 @@ n:/etc/nixos # Remote files - H:/home/${config.home.username}/Midas/storage - K:/home/${config.home.username}/Midas/storage/Files - V:/home/${config.home.username}/Midas/storage/Media - M:/home/${config.home.username}/Midas/storage/Music + H:/home/${config.home.username}/Network/Midas/ + K:/home/${config.home.username}/Network/Midas/Files + M:/home/${config.home.username}/Network/Midas/Music + V:/home/${config.home.username}/Network/Midas/Videos + V:/home/${config.home.username}/Network/Midas/Photos ''; }; packages = with pkgs; [ diff --git a/modules/home/services/mpd/default.nix b/modules/home/services/mpd/default.nix index fce2cd27..8b1a328a 100644 --- a/modules/home/services/mpd/default.nix +++ b/modules/home/services/mpd/default.nix @@ -4,7 +4,7 @@ mpd = { enable = 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"; extraConfig = '' audio_output {