diff options
Diffstat (limited to 'Com/Simatime')
-rw-r--r-- | Com/Simatime/Serval/configuration.nix | 11 | ||||
-rwxr-xr-x | Com/Simatime/Serval/networking.nix | 5 | ||||
-rw-r--r-- | Com/Simatime/buildOS.nix | 5 |
3 files changed, 18 insertions, 3 deletions
diff --git a/Com/Simatime/Serval/configuration.nix b/Com/Simatime/Serval/configuration.nix new file mode 100644 index 0000000..d5ad02f --- /dev/null +++ b/Com/Simatime/Serval/configuration.nix @@ -0,0 +1,11 @@ +{ config, pkgs, ... }: +{ + networking.firewall.allowedTCPPorts = [ 22 80 443 ]; + services.que-server = { + enable = true; + domain = "que.run"; + port = 3000; + package = pkgs.biz.que-server; + }; + services.nginx.enable = true; +} diff --git a/Com/Simatime/Serval/networking.nix b/Com/Simatime/Serval/networking.nix index e13a6f5..79fbe27 100755 --- a/Com/Simatime/Serval/networking.nix +++ b/Com/Simatime/Serval/networking.nix @@ -3,7 +3,8 @@ # details gathered from the active system. networking = { nameservers = [ - "127.0.0.53" + "67.207.67.2" + "67.207.67.3" ]; defaultGateway = "157.245.160.1"; defaultGateway6 = ""; @@ -18,8 +19,6 @@ ipv6.addresses = [ { address="fe80::242a:8bff:feb7:6afb"; prefixLength=64; } ]; - ipv4.routes = [ { address = "157.245.160.1"; prefixLength = 32; } ]; - ipv6.routes = [ { address = ""; prefixLength = 32; } ]; }; }; }; diff --git a/Com/Simatime/buildOS.nix b/Com/Simatime/buildOS.nix index c40fc22..52aa51a 100644 --- a/Com/Simatime/buildOS.nix +++ b/Com/Simatime/buildOS.nix @@ -4,6 +4,7 @@ nixos: , vpnConnectTo ? "" , vpnRsaPrivateKeyFile ? null , vpnEd25519PrivateKeyFile ? null +, deps ? {} # added under pkgs.biz , configuration # see: configuration.nix(5) }: assert enableVpn -> builtins.isString ipAddress; @@ -15,6 +16,9 @@ let Ed25519PrivateKeyFile = "${vpnEd25519PrivateKeyFile}" PrivateKeyFile = "${vpnRsaPrivateKeyFile}" '' else ""; + bizpkgs = self: super: { + biz = deps; + }; defaults = { boot.cleanTmpDir = true; #networking.interfaces.simatime-vpn = [{ ipv4.address = ipAddress; }]; @@ -24,6 +28,7 @@ let nix.maxJobs = 1; # "auto"; nix.optimise.automatic = true; nix.optimise.dates = [ "Sunday 02:30" ]; + nixpkgs.overlays = [ bizpkgs ]; security.acme.email = "ben@bsima.me"; security.acme.acceptTerms = true; security.sudo.wheelNeedsPassword = false; |