From 4b15be1b8d3b921f0d26dee119b3b5e2a668c43f Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Sun, 18 Feb 2024 19:24:34 -0600 Subject: [PATCH] nas fixes --- configuration-nas.nix | 22 ++++++++++++++++++++-- nas-apps/jellyfin.nix | 8 ++++---- nas-apps/swag.nix | 6 +++--- scripts/nas-init | 7 +++++++ 4 files changed, 34 insertions(+), 9 deletions(-) create mode 100755 scripts/nas-init diff --git a/configuration-nas.nix b/configuration-nas.nix index 44aa78f..aa9dfc0 100644 --- a/configuration-nas.nix +++ b/configuration-nas.nix @@ -148,14 +148,31 @@ in flatpak.enable = false; }; - # Networking configs + systemd.services.nas-mounts = { + path = [ pkgs.zfs ]; + script = '' + zpool import -R /mnt -f "Main Pool" + zpool import -R /mnt -f "Safe SSD" + zpool import -R /mnt -f "Junk" + zfs load-key -L file:///root/main-pool.key "Main Pool" + zfs load-key -L file:///root/safe-ssd.key "Safe SSD" + zfs mount -a + ''; + wantedBy = [ "multi-user.target" ]; + }; + + # Networking configs enp7s0 networking = { hostName = hostname; + interfaces.enp7s0.ipv4.routes = [{ + address = "10.0.1.18"; + prefixLength = 16; + }]; hostId = "4b501480"; # Enable Network Manager - networkmanager.enable = true; + networkmanager.enable = false; }; # Time config @@ -213,6 +230,7 @@ in }; virtualisation.docker.enable = true; + virtualisation.docker.enableNvidia = true; # This option defines the first version of NixOS you have installed on this particular machine, # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. diff --git a/nas-apps/jellyfin.nix b/nas-apps/jellyfin.nix index dd4d30c..880e439 100644 --- a/nas-apps/jellyfin.nix +++ b/nas-apps/jellyfin.nix @@ -22,13 +22,13 @@ "/mnt/Safe\ SSD/ssd_app_data/jellyfin/cache:/cache" "/mnt/Safe\ SSD/ssd_app_data/jellyfin/log:/log" "/mnt/Main\ Pool/Movies:/movies" - "/mnt/Main\ Pool/tv:/TV" + "/mnt/Main\ Pool/TV:/tv" ]; ports = [ "8096:8096" ]; environment = { JELLYFIN_LOG_DIR = "/log"; - PUID = 911; - PGID = 1000; + PUID = "911"; + PGID = "1000"; }; }; -} \ No newline at end of file +} diff --git a/nas-apps/swag.nix b/nas-apps/swag.nix index e7b8181..4ca6f5a 100644 --- a/nas-apps/swag.nix +++ b/nas-apps/swag.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { # Swag - virtualisation.oci-containers.containers."portainer" = { + virtualisation.oci-containers.containers."swag" = { autoStart = true; image = "linuxserver/swag"; ports = [ "80:80" "443:443" ]; @@ -9,8 +9,8 @@ "/mnt/Safe\ SSD/ssd_app_data/swag:/config" ]; environment = { - PGID = 1000; - PUID = 1000; + PGID = "1000"; + PUID = "1000"; TZ = "America/Chicago"; URL = "mjallen.dev"; VALIDATION = "http"; diff --git a/scripts/nas-init b/scripts/nas-init new file mode 100755 index 0000000..92de785 --- /dev/null +++ b/scripts/nas-init @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +zpool import -R /mnt -f "Main Pool" +zpool import -R /mnt -f "Safe SSD" +zpool import -R /mnt -f "Junk" +zfs load-key -L file:///root/main-pool.key "Main Pool" +zfs load-key -L file:///root/safe-ssd.key "Safe SSD" +zfs mount -a