cleanining up coral tpu location

This commit is contained in:
ari committed 2024-12-26 15:55:42 -05:00
1 parent bf62802ffd
commit 71efa635fc
6 files changed
+57 -18

No files matched your search

+16
View File
@@ -24,14 +24,30 @@
common.hardware = { common.hardware = {
nvidia.enable = true; nvidia.enable = true;
amdgpu.enable = true; amdgpu.enable = true;
udevrules.coraltpu.enable = true;
}; };
server.services = { server.services = {
ai.enable = true; ai.enable = true;
jellyfin.enable = false; jellyfin.enable = false;
dockge = {
enable = true;
openFirewall = true;
volumes = {
stacks = {
nfsServer = "terra1.lab.internal";
share = "/mnt/Data/apps/bigbox/dockge/stacks";
};
data = {
nfsServer = "terra1.lab.internal";
share = "/mnt/Data/apps/bigbox/dockge/data";
};
};
};
}; };
}; };
networkDrives.enable = true; networkDrives.enable = true;
}; };
users.users.ari.extraGroups = [ "input" ]; users.users.ari.extraGroups = [ "input" ];
# firmware updater # firmware updater
services.fwupd.enable = true; services.fwupd.enable = true;
+10 -3
View File
@@ -19,8 +19,6 @@
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
# Disable firewall # Disable firewall
networking.firewall.enable = false; networking.firewall.enable = false;
# Special udev rule for google's coral tpu
skyg.nixos.server.udevrules.coraltpu.enable = true;
# Services # Services
skyg.nixos.server.services = { skyg.nixos.server.services = {
@@ -28,7 +26,16 @@
dockge = { dockge = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
port = 5002; volumes = {
stacks = {
nfsServer = "terra1.lab.internal";
share = "/mnt/Data/apps/arrs/dockge/stacks";
};
data = {
nfsServer = "terra1.lab.internal";
share = "/mnt/Data/apps/arrs/dockge/data";
};
};
}; };
}; };
} }
@@ -1,9 +1,9 @@
{ config, lib, ... }: { config, lib, ... }:
with lib; with lib;
let cfg = config.skyg.nixos.server.udevrules.coraltpu; let cfg = config.skyg.nixos.common.hardware.udevrules.coraltpu;
in { in {
options = { options = {
skyg.nixos.server.udevrules.coraltpu = { skyg.nixos.common.hardware.udevrules.coraltpu = {
enable = mkEnableOption enable = mkEnableOption
"Enable Coral TPU Udev rules"; "Enable Coral TPU Udev rules";
symlinkName = mkOption { symlinkName = mkOption {
@@ -7,6 +7,7 @@
./laptop-power.nix ./laptop-power.nix
./nvidia.nix ./nvidia.nix
./amdgpu.nix ./amdgpu.nix
./coral-tpu-udev.nix
]; ];
# Firmware Updater # Firmware Updater
services.fwupd.enable = true; services.fwupd.enable = true;
-1
View File
@@ -1,7 +1,6 @@
{ ... }: { ... }:
{ {
imports = [ imports = [
./coral-tpu-udev.nix
./exporters.nix ./exporters.nix
./admin.nix ./admin.nix
./arrs ./arrs
+28 -12
View File
@@ -2,22 +2,38 @@
let let
cfg = config.skyg.nixos.server.services.dockge; cfg = config.skyg.nixos.server.services.dockge;
volumeOptions = with lib; types.submodule {
options = {
nfsServer = mkOption {
type = types.str;
};
share = mkOption {
type = types.str;
};
};
};
in in
{ {
options = { options = {
skyg.nixos.server.services.dockge = { skyg.nixos.server.services.dockge = with lib; {
enable = lib.mkEnableOption enable = mkEnableOption
"Enable Dockge"; "Enable Dockge";
openFirewall = lib.mkOption { openFirewall = mkOption {
description = description =
"Open ports in the firewall for the Audiobookshelf web interface."; "Open ports in the firewall for the dockge web interface.";
default = false; default = false;
type = lib.types.bool; type = types.bool;
}; };
port = lib.mkOption { port = mkOption {
description = "The TCP port Audiobookshelf will listen on."; description = "The TCP port dockge will listen on.";
default = 5001; default = 5001;
type = lib.types.port; type = types.port;
};
volumes = types.submodule {
options = {
stacks = volumeOptions;
data = volumeOptions;
};
}; };
}; };
}; };
@@ -34,8 +50,8 @@ in
${pkgs.docker}/bin/docker volume create \ ${pkgs.docker}/bin/docker volume create \
--driver local \ --driver local \
--opt type=nfs \ --opt type=nfs \
--opt o=addr=terra1.lab.internal,rw,nfsvers=4.0,nolock,hard,noatime \ --opt o=addr=${cfg.volume.stacks.nfsServer},rw,nfsvers=4.0,nolock,hard,noatime \
--opt device=:/mnt/Data/apps/arrs/dockge/stacks \ --opt device=:${cfg.volume.stacks.share} \
dockge-stacks dockge-stacks
''; '';
deps = [ ]; deps = [ ];
@@ -45,8 +61,8 @@ in
${pkgs.docker}/bin/docker volume create \ ${pkgs.docker}/bin/docker volume create \
--driver local \ --driver local \
--opt type=nfs \ --opt type=nfs \
--opt o=addr=terra1.lab.internal,rw,nfsvers=4.0,nolock,hard,noatime \ --opt o=addr=${cfg.volume.data.nfsServer},rw,nfsvers=4.0,nolock,hard,noatime \
--opt device=:/mnt/Data/apps/arrs/dockge/data \ --opt device=:${cfg.volume.data.share} \
dockge-data dockge-data
''; '';
deps = [ ]; deps = [ ];