From 440cf7690a520a7c74e5125e5d94922f177e51c5 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Wed, 1 Dec 2021 07:52:00 -0500 Subject: Run k3s, and provide bild.image --- Biz/Bild.nix | 2 ++ Biz/Cloud/Ports.nix | 1 + Biz/Dev/Configuration.nix | 10 ++++++++++ 3 files changed, 13 insertions(+) diff --git a/Biz/Bild.nix b/Biz/Bild.nix index 6a0ce0c..cab8193 100644 --- a/Biz/Bild.nix +++ b/Biz/Bild.nix @@ -153,4 +153,6 @@ in rec { }; os = cfg: (nixpkgs.nixos (args: cfg)).toplevel; + + image = pkgs.dockerTools.buildImage; } diff --git a/Biz/Cloud/Ports.nix b/Biz/Cloud/Ports.nix index ad5ddc9..4ba5d7e 100644 --- a/Biz/Cloud/Ports.nix +++ b/Biz/Cloud/Ports.nix @@ -13,6 +13,7 @@ https = 443; jellyfin = 8096; jupyter = 4000; + k3s = 6443; mpd = 6600; mpd-stream = 8097; murmur = 64738; diff --git a/Biz/Dev/Configuration.nix b/Biz/Dev/Configuration.nix index 8eb4958..6c58ba4 100644 --- a/Biz/Dev/Configuration.nix +++ b/Biz/Dev/Configuration.nix @@ -22,6 +22,7 @@ in { ports.https ports.jellyfin ports.jupyter + ports.k3s ports.mpd ports.mpd-stream ports.murmur @@ -64,6 +65,7 @@ in { ]; environment.systemPackages = [ + pkgs.k3s pkgs.wemux pkgs.tmux pkgs.wireguard @@ -128,6 +130,14 @@ in { eternal-terminal = { enable = true; }; + + k3s = { + enable = true; + role = "server"; + extraFlags = toString [ + ]; + }; + tor = { enable = true; client.enable = true; -- cgit v1.2.3