From f4867ec09c19c9aba82ddd3a32019c0677d47d0b Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 7 Apr 2025 21:52:39 -0400 Subject: [PATCH] latest --- flake.nix | 12 ++++++------ hosts/hl-minipc1.nix | 2 +- modules/main.nix | 9 ++------- modules/network-drives.nix | 4 ++-- modules/nixos/server/services/scrypted.nix | 2 +- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index 14b77f1..037d75d 100644 --- a/flake.nix +++ b/flake.nix @@ -49,12 +49,12 @@ homeManagerVersion = "24.11"; # Local Services localNixCaches = { - # # urls = [ - # # "http://minipc1.lab.internal:5000" - # # ]; - # # keys = [ - # # "minipc1.lab.internal:eIoib1JgcBEd0YKdW95QlRA2eCKDs+WxNhWhkA1wffc=" - # # ]; + urls = [ + "http://minipc1.lab.internal:5000" + ]; + keys = [ + "minipc1.lab.internal:buUlsyg+xRqkUk0MWACmIyRUtHIOPQQzg7nc4qZCc4E=" + ]; }; localDockerRegistries = [ "minipc1.lab.internal:5001" ]; hlCommonSettings = { diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index 21908c1..d7144d5 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -28,7 +28,7 @@ in # # Nix Stores services.nix-serve = { enable = true; - secretKeyFile = "/home/ari/cache-priv-key.pem"; + secretKeyFile = "/home/ari/cache-keys/minipc1.lab.internal.private"; port = ports.nixServe; }; # firmware updater diff --git a/modules/main.nix b/modules/main.nix index 479fe16..fd7f5a9 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -2,7 +2,6 @@ , homeManagerVersion , systemStateVersion , hostName -, enableNetworkDrives ? false # Desktop Module # os , os ? { @@ -11,7 +10,7 @@ , localNixCaches ? { keys = [ ]; urls = [ ]; } , ... }: -{ pkgs, ... }: { +{ ... }: { imports = [ ./core ./nixos @@ -21,11 +20,7 @@ skyg.user = user; skyg.core.hostName = hostName; skyg.home-manager.version = homeManagerVersion; - # skyg.core.substituters = localNixCaches; + skyg.core.substituters = localNixCaches; skyg.nixos.common.containers = (if os.enable then os.containers else { }); - skyg.nixos.server.k8s = { - masterIP = "10.0.10.6"; - masterHostName = "minipc1.lab.internal"; - }; system.stateVersion = systemStateVersion; } diff --git a/modules/network-drives.nix b/modules/network-drives.nix index 0117674..ab327cc 100644 --- a/modules/network-drives.nix +++ b/modules/network-drives.nix @@ -42,8 +42,8 @@ in options = cfg.options; }; - fileSystems."/mnt/EightTerra/NVR" = { - device = "${cfg.tnasHost}:/mnt/EightTerra/NVR"; + fileSystems."/mnt/OneT/NVR" = { + device = "${cfg.tnasHost}:/mnt/OneT/NVR"; fsType = "nfs"; options = cfg.options; }; diff --git a/modules/nixos/server/services/scrypted.nix b/modules/nixos/server/services/scrypted.nix index 94fd6f7..d578c88 100644 --- a/modules/nixos/server/services/scrypted.nix +++ b/modules/nixos/server/services/scrypted.nix @@ -19,7 +19,7 @@ in --driver local \ --opt type=nfs \ --opt o=addr=tnas1.lab.internal,rw,nfsvers=4.0,nolock,hard,noatime \ - --opt device=:/mnt/EightTerra/NVR \ + --opt device=:/mnt/OneT/NVR \ scrypted-nvr ''; deps = [ ];