diff options
Diffstat (limited to 'Omni')
| -rw-r--r-- | Omni/Bild.hs | 4 | ||||
| -rw-r--r-- | Omni/Cloud.nix | 2 | ||||
| -rw-r--r-- | Omni/Cloud/Grocy.nix | 17 | ||||
| -rw-r--r-- | Omni/Cloud/Hub.nix | 57 | ||||
| -rw-r--r-- | Omni/Dev/Lithium.nix | 8 |
5 files changed, 1 insertions, 87 deletions
diff --git a/Omni/Bild.hs b/Omni/Bild.hs index e6c9152..659619b 100644 --- a/Omni/Bild.hs +++ b/Omni/Bild.hs @@ -460,9 +460,7 @@ isBuildableNs = \case (Namespace _ Namespace.Toml) -> True where nixTargets = - [ ["Biz", "Pie"], - ["Biz", "Que"], - ["Omni", "Cloud"], + [ ["Omni", "Cloud"], ["Omni", "Dev"], ["Omni", "Dev", "Lithium"], ["Omni", "Dev", "Beryllium"], diff --git a/Omni/Cloud.nix b/Omni/Cloud.nix index 08d1ba2..2ec801f 100644 --- a/Omni/Cloud.nix +++ b/Omni/Cloud.nix @@ -10,13 +10,11 @@ bild.os { ./Cloud/Comms.nix ./Cloud/Git.nix ./Cloud/Hardware.nix - ./Cloud/Hub.nix ./Cloud/Mail.nix ./Cloud/Networking.nix ./Cloud/Web.nix ./Cloud/Znc.nix "${bild.sources.nixos-mailserver}" - # ./Nixpert.nix ]; networking.hostName = "simatime"; networking.domain = "simatime.com"; diff --git a/Omni/Cloud/Grocy.nix b/Omni/Cloud/Grocy.nix deleted file mode 100644 index 697c2f1..0000000 --- a/Omni/Cloud/Grocy.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ ... }: - -{ - services.grocy = { - enable = true; - hostName = "grocy.simatime.com"; - nginx.enableSSL = false; # set in Web.nix - settings = { - calendar = { - firstDayOfWeek = 1; - showWeekNumber = true; - }; - currency = "USD"; - culture = "en"; - }; - }; -} diff --git a/Omni/Cloud/Hub.nix b/Omni/Cloud/Hub.nix deleted file mode 100644 index 39bbdd0..0000000 --- a/Omni/Cloud/Hub.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, pkgs, config, ... }: - -let - ssl = { - cert = "/var/lib/acme/${config.networking.domain}/fullchain.pem"; - key = "/var/lib/acme/${config.networking.domain}/key.pem"; - }; - ports = import ./Ports.nix; - mkPlugin = path: settings: { - plugin = "${pkgs.uhub}/plugins/${path}"; - inherit settings; - }; - motdFile = pkgs.writeText "motd" '' - Meshheads write code. - ''; - rulesFile = pkgs.writeText "rules" '' - 1. x - 2. (λx.M) - 3. (M N) - 4. Profit. - ''; -in { - networking.firewall.allowedUDPPorts = [ ports.meshhub ]; - networking.firewall.allowedTCPPorts = [ ports.meshhub ]; - - services.uhub = { - "meshhub" = { - enable = true; - enableTLS = false; - settings = { - hub_name = "meshhub"; - hub_description = "vaporware is dead. long live vaporware"; - server_port = toString ports.meshhub; - server_bind_addr = "any"; - max_users = 14; # we only have 14 users in meshheads chat - tls_private_key = ssl.key; - tls_certificate = ssl.cert; - tls_enable = "no"; - tls_require = "no"; - }; - plugins = lib.attrsets.mapAttrsToList mkPlugin { - #"mod_logging.so" = { - # file = "/var/log/uhub/meshhub.log"; - #}; - "mod_welcome.so" = { - motd = "${motdFile}"; - rules = "${rulesFile}"; - }; - "mod_chat_history.so" = { - history_max = "200"; - history_default = "10"; - history_connect = "5"; - }; - }; - }; - }; -} diff --git a/Omni/Dev/Lithium.nix b/Omni/Dev/Lithium.nix index 567f6e0..1716d51 100644 --- a/Omni/Dev/Lithium.nix +++ b/Omni/Dev/Lithium.nix @@ -11,17 +11,9 @@ bild.os { ./Hoogle.nix ./Networking.nix ./Dns.nix - ../../Biz/Dragons.nix #./Guix.nix # I need to package a bunch of guile libs first ./Vpn.nix ]; networking.hostName = "lithium"; networking.domain = "dev.simatime.com"; - services.dragons = { - enable = true; - port = 8095; - package = bild.run ../../Biz/Dragons.hs; - keep = "/var/dragons/keep"; - depo = "/var/dragons/depo"; - }; } |