From 65cda6178f68e744147d4e5295d67b07b70ad358 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 14 Nov 2025 02:19:16 -0600 Subject: [PATCH] feat: added ceres samba mount --- systems/mars/config/filesystem.nix | 38 ++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/systems/mars/config/filesystem.nix b/systems/mars/config/filesystem.nix index 73801e0..7b5bbdc 100755 --- a/systems/mars/config/filesystem.nix +++ b/systems/mars/config/filesystem.nix @@ -5,26 +5,28 @@ }: let inherit (flake.config.people) user0; - inherit (flake.config.machines.devices) mars eris; - erisSecrets = config.sops.secrets."network/server".path; + inherit (flake.config.machines.devices) mars eris ceres; + sambaSecrets = config.sops.secrets."network/server".path; in { fileSystems = let - storageDrives = [ "storage0" "storage1" ]; - - sambaDrives = [ + erisDrives = [ "samba0" ]; - - sambaFolders = [ + erisFolders = [ "raid0" ]; - + ceresDrives = [ + "samba0" + ]; + ceresFolders = [ + "storage" + ]; storageMounts = storageDrive: { name = "${mars.${storageDrive}.mount}"; value = { @@ -33,14 +35,23 @@ in options = mars.${storageDrive}.options; }; }; - - sambaMounts = sambaDrive: folder: { + erisMounts = sambaDrive: folder: { name = "${eris.${sambaDrive}.mount}/${folder}"; value = { device = "${eris.${sambaDrive}.device}/${folder}"; fsType = "cifs"; options = eris.${sambaDrive}.options ++ [ - "credentials=${erisSecrets}" + "credentials=${sambaSecrets}" + ]; + }; + }; + ceresMounts = sambaDrive: folder: { + name = "${ceres.${sambaDrive}.mount}/${folder}"; + value = { + device = "${ceres.${sambaDrive}.device}/${folder}"; + fsType = "cifs"; + options = ceres.${sambaDrive}.options ++ [ + "credentials=${sambaSecrets}" ]; }; }; @@ -58,7 +69,10 @@ in } // (builtins.listToAttrs (map storageMounts storageDrives)) // (builtins.listToAttrs ( - builtins.concatMap (drive: map (folder: sambaMounts drive folder) sambaFolders) sambaDrives + builtins.concatMap (drive: map (folder: ceresMounts drive folder) ceresFolders) ceresDrives + )) + // (builtins.listToAttrs ( + builtins.concatMap (drive: map (folder: erisMounts drive folder) erisFolders) erisDrives )); swapDevices = [