diff --git a/hosts/hl-fws1.nix b/hosts/hl-fws1.nix index cb48e97..c1b9a13 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -8,11 +8,16 @@ in skyg.user.enable = true; skyg.nixos.common.ssh-server.enable = true; skyg.server.admin.enable = true; - skyg.networkDrives.options = [ - "x-systemd.automount" - "auto" - ]; - + skyg.nixos.server.k3s.enable = true; + skyg.networkDrives = { + enable = true; + options = [ + "x-systemd.automount" + "auto" + "nofail" + "_netdev" + ]; + }; # firmware updater services.fwupd.enable = true; hardware.framework.enableKmod = true; @@ -21,32 +26,8 @@ in boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.tmp.useTmpfs = true; - services.k3s = { - enable = true; - environmentFile = /mnt/EightTerra/k3s-cluster/k3s.env; - role = "server"; - }; - # Game Engine - # programs = { - # gamescope = { - # enable = true; - # capSysNice = true; - # }; - # steam = { - # enable = true; - # gamescopeSession.enable = true; - # extest.enable = true; - # remotePlay.openFirewall = true; - # dedicatedServer.openFirewall = true; - # localNetworkGameTransfers.openFirewall = true; - # }; - # }; - # services.getty.autologinUser = "ari"; - # environment = { - # systemPackages = with pkgs;[ mangohud ]; - # loginShellInit = '' - # [[ "$(tty)" = "/dev/tty1" ]] && ${scriptsFolder}/gs.sh - # ''; - # }; + + # Kernel + boot.kernelPackages = pkgs.linuxPackages_zen; } diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index cfb5295..5535e6b 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -20,8 +20,8 @@ in }; skyg.core.tailscaleRouting = "both"; services.k3s = { - enable = true; - environmentFile = /mnt/EightTerra/k3s-cluster/k3s.env; + enable = false; + environmentFile = "/mnt/EightTerra/k3s-cluster/configs/k3s.env"; role = "server"; }; # # Nix Stores @@ -35,7 +35,7 @@ in # # Services skyg.nixos.server.services = { audiobookshelf = { - enable = false; + enable = true; host = "0.0.0.0"; openFirewall = true; port = 8000; @@ -44,7 +44,7 @@ in }; }; services.dockerRegistry = { - enable = false; + enable = true; storagePath = "/mnt/Data/docker-registry"; port = 5001; openFirewall = true; diff --git a/modules/network-drives.nix b/modules/network-drives.nix index c93cfe5..9945e43 100644 --- a/modules/network-drives.nix +++ b/modules/network-drives.nix @@ -10,6 +10,14 @@ in skyg.networkDrives = { enable = lib.mkEnableOption "Network Drives"; + tnasHost = lib.mkOption { + type = lib.types.str; + default = "tnas1.lab.internal"; + }; + terraHost = lib.mkOption { + type = lib.types.str; + default = "terra1.lab.internal"; + }; options = lib.mkOption { type = lib.types.listOf lib.types.str; default = [ "defaults" ]; @@ -18,25 +26,25 @@ in }; config = lib.mkIf cfg.enable { fileSystems."/torrents" = { - device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents"; + device = "${cfg.tnasHost}:/mnt/EightTerra/DownloadedTorrents"; fsType = "nfs"; options = cfg.options; }; fileSystems."/mnt/EightTerra/k3s-cluster" = { - device = "tnas1.lab.internal:/mnt/EightTerra/k3s-cluster"; + device = "${cfg.tnasHost}:/mnt/EightTerra/k3s-cluster"; fsType = "nfs"; options = cfg.options; }; fileSystems."/mnt/EightTerra/NVR" = { - device = "tnas1.lab.internal:/mnt/EightTerra/NVR"; + device = "${cfg.tnasHost}:/mnt/EightTerra/NVR"; fsType = "nfs"; options = cfg.options; }; fileSystems."/mnt/terra1/Data/apps" = { - device = "terra1.lab.internal:/mnt/Data/apps"; + device = "${cfg.terraHost}:/mnt/Data/apps"; fsType = "nfs"; options = cfg.options; }; diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix index febcd77..6802fd3 100644 --- a/modules/nixos/server/default.nix +++ b/modules/nixos/server/default.nix @@ -5,6 +5,7 @@ ./admin.nix ./arrs ./k8s + ./k3s ./services ./timers.nix ]; diff --git a/modules/nixos/server/k3s/default.nix b/modules/nixos/server/k3s/default.nix new file mode 100644 index 0000000..4581abb --- /dev/null +++ b/modules/nixos/server/k3s/default.nix @@ -0,0 +1,36 @@ +{ config, pkgs, lib, ... }: +let + cfg = config.skyg.nixos.server.k3s; +in +{ + options = { + skyg.nixos.server.k3s = { + enable = lib.mkEnableOption + "Enable K3s"; + role = lib.mkOption { + type = lib.types.str; + default = "server"; + }; + envPath = lib.mkOption { + type = lib.types.str; + default = "/mnt/EightTerra/k3s-cluster/configs/k3s.env"; + }; + }; + }; + + config = + lib.mkIf cfg.enable { + system.activationScripts.k3sEnv = '' + set -e + mkdir -p /var/lib/k3s + cp ${cfg.envPath} /var/lib/k3s/.env + chmod 0644 /var/lib/k3s/.env + chown root:root /var/lib/k3s/.env + ''; + services.k3s = { + enable = true; + environmentFile = "/var/lib/k3s/.env"; + role = cfg.role; + }; + }; +}