From 3bfe90e7ef1a965d7b2b974242437517f2582489 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 17 Aug 2024 21:25:06 -0400 Subject: [PATCH] Partially migrated over network drives --- modules/main.nix | 3 ++- modules/network-drives.nix | 44 ++++++++++++++++++++++++++------------ 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/modules/main.nix b/modules/main.nix index a284429..eb62ea9 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -19,6 +19,7 @@ imports = [ (import ./skyg) (import ./nixos) + (import ./network-drives.nix) ] ++ (if os.enable then [ (import ./os ({ @@ -28,13 +29,13 @@ ] else [ ]) - ++ (if enableNetworkDrives then [ (import ./network-drives.nix) ] else [ ]) ; # Share defaults skyg.user = user; skyg.core.hostName = hostName; skyg.home-manager.version = homeManagerVersion; skyg.core.substituters = localNixCaches; + skyg.networkDrives.enabled = enableNetworkDrives; system.stateVersion = systemStateVersion; nixpkgs.config.allowUnfree = true; nix = { diff --git a/modules/network-drives.nix b/modules/network-drives.nix index 09ac2c9..9cc4fdb 100644 --- a/modules/network-drives.nix +++ b/modules/network-drives.nix @@ -1,19 +1,35 @@ -{ ... }: { - fileSystems."/mnt/EightTerra/DownloadedTorrents" = { - device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents"; - fsType = "nfs"; - options = [ "x-systemd.automount" "noauto" ]; +{ lib +, config +, ... +}: +with lib; +let + cfg = config.skyg.networkDrives; +in +{ + options = { + skyg.networkDrives = { + enabled = mkEnableOption + "Network Drives"; + }; }; + config = mkIf cfg.enabled { + fileSystems."/mnt/EightTerra/DownloadedTorrents" = { + device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents"; + fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" ]; + }; - fileSystems."/mnt/EightTerra/k3s-cluster" = { - device = "tnas1.lab.internal:/mnt/EightTerra/k3s-cluster"; - fsType = "nfs"; - options = [ "x-systemd.automount" "noauto" ]; - }; + fileSystems."/mnt/EightTerra/k3s-cluster" = { + device = "tnas1.lab.internal:/mnt/EightTerra/k3s-cluster"; + fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" ]; + }; - fileSystems."/mnt/EightTerra/NVR" = { - device = "tnas1.lab.internal:/mnt/EightTerra/NVR"; - fsType = "nfs"; - options = [ "x-systemd.automount" "noauto" ]; + fileSystems."/mnt/EightTerra/NVR" = { + device = "tnas1.lab.internal:/mnt/EightTerra/NVR"; + fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" ]; + }; }; }