From 229a1f8b3fa1bed02cdb8bebde28fc166b7e5047 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 14 Nov 2025 02:19:06 -0600 Subject: [PATCH 1/3] feat: changed phobos workers --- modules/nixos/guests/midnight/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/guests/midnight/default.nix b/modules/nixos/guests/midnight/default.nix index f17ba98..5133f31 100755 --- a/modules/nixos/guests/midnight/default.nix +++ b/modules/nixos/guests/midnight/default.nix @@ -41,7 +41,7 @@ in config = let macAddress = "02:00:00:00:00:${macOctet}"; - workers = deviceLogic 45 4 18 6 4; + workers = deviceLogic 45 4 18 6 6; in { environment.systemPackages = [ From 65cda6178f68e744147d4e5295d67b07b70ad358 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 14 Nov 2025 02:19:16 -0600 Subject: [PATCH 2/3] 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 = [ From 60a8eaa37427077bcc4f06ebe422076afb6861e9 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 14 Nov 2025 03:58:21 -0600 Subject: [PATCH 3/3] fix: samba unfucked --- modules/config/devices/config/lamdagibson.nix | 0 modules/nixos/guests/jellyfin/default.nix | 10 +++++----- .../nixos/services/samba/sambaCeres/default.nix | 17 +++++++++++------ 3 files changed, 16 insertions(+), 11 deletions(-) mode change 100644 => 100755 modules/config/devices/config/lamdagibson.nix diff --git a/modules/config/devices/config/lamdagibson.nix b/modules/config/devices/config/lamdagibson.nix old mode 100644 new mode 100755 diff --git a/modules/nixos/guests/jellyfin/default.nix b/modules/nixos/guests/jellyfin/default.nix index af191a6..7ece0b7 100755 --- a/modules/nixos/guests/jellyfin/default.nix +++ b/modules/nixos/guests/jellyfin/default.nix @@ -75,7 +75,7 @@ in "Z ${serviceCfg.varPaths.path0} 0755 ${serviceCfg.name} ${serviceCfg.name} -" "Z ${serviceCfg.varPaths.path2} 0755 ${serviceCfg.name} ${serviceCfg.name} -" "d ${serviceCfg.varPaths.path1} 0755 ${serviceCfg.name} ${serviceCfg.name} -" - "Z ${serviceCfg.varPaths.path2} 0755 ${serviceCfg.name} ${serviceCfg.name} -" + "Z ${serviceCfg.varPaths.path2} 0775 ${serviceCfg.name} ${serviceCfg.name} -" ]; }; @@ -161,9 +161,9 @@ in users.users.caddy.extraGroups = [ "acme" ]; systemd.tmpfiles.rules = [ - "d ${serviceCfg.mntPaths.path0} 0751 microvm wheel - -" - "d ${serviceCfg.mntPaths.path0}/data 0751 microvm wheel - -" - "d ${serviceCfg.mntPaths.path0}/cache 0751 microvm wheel - -" - "d ${serviceCfg.mntPaths.path0}/media 0751 microvm wheel - -" + "d ${serviceCfg.mntPaths.path0} 0755 microvm wheel - -" + "d ${serviceCfg.mntPaths.path0}/data 0755 microvm wheel - -" + "d ${serviceCfg.mntPaths.path0}/cache 0755 microvm wheel - -" + "d ${serviceCfg.mntPaths.path0}/media 0775 microvm wheel - -" ]; } diff --git a/modules/nixos/services/samba/sambaCeres/default.nix b/modules/nixos/services/samba/sambaCeres/default.nix index ac42d8a..65c86f2 100755 --- a/modules/nixos/services/samba/sambaCeres/default.nix +++ b/modules/nixos/services/samba/sambaCeres/default.nix @@ -1,12 +1,9 @@ { - pkgs, flake, ... }: let - inherit (flake.config.services) - instances - ; + inherit (flake.config.services) instances; service = instances.samba; in { @@ -19,8 +16,16 @@ in openFirewall = true; settings = { "storage" = { - path = "/mnt/storage"; - writable = "true"; + path = "/mnt/storage/${instances.jellyfin.name}/media"; + browseable = "yes"; + writeable = "yes"; + "guest ok" = "no"; + "create mask" = "0664"; + "directory mask" = "0775"; + "force user" = "microvm"; + "force group" = "wheel"; + "force create mode" = "0664"; + "force directory mode" = "0775"; }; }; };