This commit is contained in:
ari committed 2025-04-07 21:52:39 -04:00
1 parent 231f14a9b8
commit f4867ec09c
5 files changed
+12 -17

No files matched your search

+6 -6
View File
@@ -49,12 +49,12 @@
homeManagerVersion = "24.11"; homeManagerVersion = "24.11";
# Local Services # Local Services
localNixCaches = { localNixCaches = {
# # urls = [ urls = [
# # "http://minipc1.lab.internal:5000" "http://minipc1.lab.internal:5000"
# # ]; ];
# # keys = [ keys = [
# # "minipc1.lab.internal:eIoib1JgcBEd0YKdW95QlRA2eCKDs+WxNhWhkA1wffc=" "minipc1.lab.internal:buUlsyg+xRqkUk0MWACmIyRUtHIOPQQzg7nc4qZCc4E="
# # ]; ];
}; };
localDockerRegistries = [ "minipc1.lab.internal:5001" ]; localDockerRegistries = [ "minipc1.lab.internal:5001" ];
hlCommonSettings = { hlCommonSettings = {
+1 -1
View File
@@ -28,7 +28,7 @@ in
# # Nix Stores # # Nix Stores
services.nix-serve = { services.nix-serve = {
enable = true; enable = true;
secretKeyFile = "/home/ari/cache-priv-key.pem"; secretKeyFile = "/home/ari/cache-keys/minipc1.lab.internal.private";
port = ports.nixServe; port = ports.nixServe;
}; };
# firmware updater # firmware updater
+2 -7
View File
@@ -2,7 +2,6 @@
, homeManagerVersion , homeManagerVersion
, systemStateVersion , systemStateVersion
, hostName , hostName
, enableNetworkDrives ? false
# Desktop Module # Desktop Module
# os # os
, os ? { , os ? {
@@ -11,7 +10,7 @@
, localNixCaches ? { keys = [ ]; urls = [ ]; } , localNixCaches ? { keys = [ ]; urls = [ ]; }
, ... , ...
}: }:
{ pkgs, ... }: { { ... }: {
imports = [ imports = [
./core ./core
./nixos ./nixos
@@ -21,11 +20,7 @@
skyg.user = user; skyg.user = user;
skyg.core.hostName = hostName; skyg.core.hostName = hostName;
skyg.home-manager.version = homeManagerVersion; 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.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; system.stateVersion = systemStateVersion;
} }
+2 -2
View File
@@ -42,8 +42,8 @@ in
options = cfg.options; options = cfg.options;
}; };
fileSystems."/mnt/EightTerra/NVR" = { fileSystems."/mnt/OneT/NVR" = {
device = "${cfg.tnasHost}:/mnt/EightTerra/NVR"; device = "${cfg.tnasHost}:/mnt/OneT/NVR";
fsType = "nfs"; fsType = "nfs";
options = cfg.options; options = cfg.options;
}; };
+1 -1
View File
@@ -19,7 +19,7 @@ in
--driver local \ --driver local \
--opt type=nfs \ --opt type=nfs \
--opt o=addr=tnas1.lab.internal,rw,nfsvers=4.0,nolock,hard,noatime \ --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 scrypted-nvr
''; '';
deps = [ ]; deps = [ ];