From 71efa635fc9e4356529aceb7e6ed3b5fa29e6b59 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 26 Dec 2024 15:55:42 -0500 Subject: [PATCH] cleanining up coral tpu location --- hosts/hl-bigbox1.nix | 16 ++++++++ hosts/hl-minipc2.nix | 13 ++++-- .../hardware}/coral-tpu-udev.nix | 4 +- modules/nixos/common/hardware/default.nix | 1 + modules/nixos/server/default.nix | 1 - modules/nixos/server/services/dockge.nix | 40 +++++++++++++------ 6 files changed, 57 insertions(+), 18 deletions(-) rename modules/nixos/{server => common/hardware}/coral-tpu-udev.nix (84%) diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index 224212d..f73c2ba 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -24,14 +24,30 @@ common.hardware = { nvidia.enable = true; amdgpu.enable = true; + udevrules.coraltpu.enable = true; }; server.services = { ai.enable = true; 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; }; + users.users.ari.extraGroups = [ "input" ]; # firmware updater services.fwupd.enable = true; diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index eae4553..7012700 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -19,8 +19,6 @@ boot.loader.efi.canTouchEfiVariables = true; # Disable firewall networking.firewall.enable = false; - # Special udev rule for google's coral tpu - skyg.nixos.server.udevrules.coraltpu.enable = true; # Services skyg.nixos.server.services = { @@ -28,7 +26,16 @@ dockge = { enable = 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"; + }; + }; }; }; } diff --git a/modules/nixos/server/coral-tpu-udev.nix b/modules/nixos/common/hardware/coral-tpu-udev.nix similarity index 84% rename from modules/nixos/server/coral-tpu-udev.nix rename to modules/nixos/common/hardware/coral-tpu-udev.nix index efd1b8b..4e37cf1 100644 --- a/modules/nixos/server/coral-tpu-udev.nix +++ b/modules/nixos/common/hardware/coral-tpu-udev.nix @@ -1,9 +1,9 @@ { config, lib, ... }: with lib; -let cfg = config.skyg.nixos.server.udevrules.coraltpu; +let cfg = config.skyg.nixos.common.hardware.udevrules.coraltpu; in { options = { - skyg.nixos.server.udevrules.coraltpu = { + skyg.nixos.common.hardware.udevrules.coraltpu = { enable = mkEnableOption "Enable Coral TPU Udev rules"; symlinkName = mkOption { diff --git a/modules/nixos/common/hardware/default.nix b/modules/nixos/common/hardware/default.nix index 093477a..6151d34 100644 --- a/modules/nixos/common/hardware/default.nix +++ b/modules/nixos/common/hardware/default.nix @@ -7,6 +7,7 @@ ./laptop-power.nix ./nvidia.nix ./amdgpu.nix + ./coral-tpu-udev.nix ]; # Firmware Updater services.fwupd.enable = true; diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix index 299f334..febcd77 100644 --- a/modules/nixos/server/default.nix +++ b/modules/nixos/server/default.nix @@ -1,7 +1,6 @@ { ... }: { imports = [ - ./coral-tpu-udev.nix ./exporters.nix ./admin.nix ./arrs diff --git a/modules/nixos/server/services/dockge.nix b/modules/nixos/server/services/dockge.nix index 21ad12a..98132e3 100644 --- a/modules/nixos/server/services/dockge.nix +++ b/modules/nixos/server/services/dockge.nix @@ -2,22 +2,38 @@ let cfg = config.skyg.nixos.server.services.dockge; + volumeOptions = with lib; types.submodule { + options = { + nfsServer = mkOption { + type = types.str; + }; + share = mkOption { + type = types.str; + }; + }; + }; in { options = { - skyg.nixos.server.services.dockge = { - enable = lib.mkEnableOption + skyg.nixos.server.services.dockge = with lib; { + enable = mkEnableOption "Enable Dockge"; - openFirewall = lib.mkOption { + openFirewall = mkOption { description = - "Open ports in the firewall for the Audiobookshelf web interface."; + "Open ports in the firewall for the dockge web interface."; default = false; - type = lib.types.bool; + type = types.bool; }; - port = lib.mkOption { - description = "The TCP port Audiobookshelf will listen on."; + port = mkOption { + description = "The TCP port dockge will listen on."; 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 \ --driver local \ --opt type=nfs \ - --opt o=addr=terra1.lab.internal,rw,nfsvers=4.0,nolock,hard,noatime \ - --opt device=:/mnt/Data/apps/arrs/dockge/stacks \ + --opt o=addr=${cfg.volume.stacks.nfsServer},rw,nfsvers=4.0,nolock,hard,noatime \ + --opt device=:${cfg.volume.stacks.share} \ dockge-stacks ''; deps = [ ]; @@ -45,8 +61,8 @@ in ${pkgs.docker}/bin/docker volume create \ --driver local \ --opt type=nfs \ - --opt o=addr=terra1.lab.internal,rw,nfsvers=4.0,nolock,hard,noatime \ - --opt device=:/mnt/Data/apps/arrs/dockge/data \ + --opt o=addr=${cfg.volume.data.nfsServer},rw,nfsvers=4.0,nolock,hard,noatime \ + --opt device=:${cfg.volume.data.share} \ dockge-data ''; deps = [ ];