This commit is contained in:
ari committed 2025-02-17 21:49:20 -05:00
1 parent 3d540c6952
commit 73a084fccd
5 files changed
+66 -40

No files matched your search

+13 -32
View File
@@ -8,11 +8,16 @@ in
skyg.user.enable = true; skyg.user.enable = true;
skyg.nixos.common.ssh-server.enable = true; skyg.nixos.common.ssh-server.enable = true;
skyg.server.admin.enable = true; skyg.server.admin.enable = true;
skyg.networkDrives.options = [ skyg.nixos.server.k3s.enable = true;
"x-systemd.automount" skyg.networkDrives = {
"auto" enable = true;
]; options = [
"x-systemd.automount"
"auto"
"nofail"
"_netdev"
];
};
# firmware updater # firmware updater
services.fwupd.enable = true; services.fwupd.enable = true;
hardware.framework.enableKmod = true; hardware.framework.enableKmod = true;
@@ -21,32 +26,8 @@ in
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.tmp.useTmpfs = true; boot.tmp.useTmpfs = true;
services.k3s = {
enable = true; # Kernel
environmentFile = /mnt/EightTerra/k3s-cluster/k3s.env; boot.kernelPackages = pkgs.linuxPackages_zen;
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
# '';
# };
} }
+4 -4
View File
@@ -20,8 +20,8 @@ in
}; };
skyg.core.tailscaleRouting = "both"; skyg.core.tailscaleRouting = "both";
services.k3s = { services.k3s = {
enable = true; enable = false;
environmentFile = /mnt/EightTerra/k3s-cluster/k3s.env; environmentFile = "/mnt/EightTerra/k3s-cluster/configs/k3s.env";
role = "server"; role = "server";
}; };
# # Nix Stores # # Nix Stores
@@ -35,7 +35,7 @@ in
# # Services # # Services
skyg.nixos.server.services = { skyg.nixos.server.services = {
audiobookshelf = { audiobookshelf = {
enable = false; enable = true;
host = "0.0.0.0"; host = "0.0.0.0";
openFirewall = true; openFirewall = true;
port = 8000; port = 8000;
@@ -44,7 +44,7 @@ in
}; };
}; };
services.dockerRegistry = { services.dockerRegistry = {
enable = false; enable = true;
storagePath = "/mnt/Data/docker-registry"; storagePath = "/mnt/Data/docker-registry";
port = 5001; port = 5001;
openFirewall = true; openFirewall = true;
+12 -4
View File
@@ -10,6 +10,14 @@ in
skyg.networkDrives = { skyg.networkDrives = {
enable = lib.mkEnableOption enable = lib.mkEnableOption
"Network Drives"; "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 { options = lib.mkOption {
type = lib.types.listOf lib.types.str; type = lib.types.listOf lib.types.str;
default = [ "defaults" ]; default = [ "defaults" ];
@@ -18,25 +26,25 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
fileSystems."/torrents" = { fileSystems."/torrents" = {
device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents"; device = "${cfg.tnasHost}:/mnt/EightTerra/DownloadedTorrents";
fsType = "nfs"; fsType = "nfs";
options = cfg.options; options = cfg.options;
}; };
fileSystems."/mnt/EightTerra/k3s-cluster" = { fileSystems."/mnt/EightTerra/k3s-cluster" = {
device = "tnas1.lab.internal:/mnt/EightTerra/k3s-cluster"; device = "${cfg.tnasHost}:/mnt/EightTerra/k3s-cluster";
fsType = "nfs"; fsType = "nfs";
options = cfg.options; options = cfg.options;
}; };
fileSystems."/mnt/EightTerra/NVR" = { fileSystems."/mnt/EightTerra/NVR" = {
device = "tnas1.lab.internal:/mnt/EightTerra/NVR"; device = "${cfg.tnasHost}:/mnt/EightTerra/NVR";
fsType = "nfs"; fsType = "nfs";
options = cfg.options; options = cfg.options;
}; };
fileSystems."/mnt/terra1/Data/apps" = { fileSystems."/mnt/terra1/Data/apps" = {
device = "terra1.lab.internal:/mnt/Data/apps"; device = "${cfg.terraHost}:/mnt/Data/apps";
fsType = "nfs"; fsType = "nfs";
options = cfg.options; options = cfg.options;
}; };
+1
View File
@@ -5,6 +5,7 @@
./admin.nix ./admin.nix
./arrs ./arrs
./k8s ./k8s
./k3s
./services ./services
./timers.nix ./timers.nix
]; ];
+36
View File
@@ -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;
};
};
}