diff --git a/common/dns/for.miras.pet.nix b/common/dns/for.miras.pet.nix index ca97d24..a425ce4 100644 --- a/common/dns/for.miras.pet.nix +++ b/common/dns/for.miras.pet.nix @@ -16,6 +16,7 @@ in "git".A = singleton dnsData.tripPublicV4; "auth".A = singleton dnsData.tripPublicV4; "wisdom".A = singleton dnsData.tripPublicV4; + "chat".A = singleton dnsData.tripPublicV4; "_acme-challenge".CNAME = singleton "199b8aa4-bc9f-4f43-88bf-3f613f62b663.auwwth.dis8.net."; }; }; diff --git a/flake.nix b/flake.nix index 70ef153..c59ef75 100644 --- a/flake.nix +++ b/flake.nix @@ -451,6 +451,7 @@ vnopnCA = pkgs-stable.writeText "vnopnCA.cert" plain.config.vacu.vnopnCA; wrappedSops = plain.config.vacu.wrappedSops; z3 = pkgs-unstable.callPackage ./packages/z3 { }; + # zulip-server = pkgs.python312Packages.callPackage ./packages/zulip.nix { }; }; } )); diff --git a/fw/default.nix b/fw/default.nix index 018a396..8d32084 100644 --- a/fw/default.nix +++ b/fw/default.nix @@ -90,7 +90,7 @@ kdePackages.dragon kanidm ]) - ++ [ inputs.self.packages.${pkgs.system}.sm64coopdx ]; + ++ [ ]; networking.firewall.enable = false; diff --git a/legtop/default.nix b/legtop/default.nix index 997b3a2..04fab20 100644 --- a/legtop/default.nix +++ b/legtop/default.nix @@ -53,7 +53,7 @@ lutris radicle-node ]) - ++ [ inputs.self.packages.${pkgs.system}.sm64coopdx ]; + ++ [ ]; services.openssh.enable = true; diff --git a/packages/zulip.nix b/packages/zulip.nix new file mode 100644 index 0000000..3d231c9 --- /dev/null +++ b/packages/zulip.nix @@ -0,0 +1,19 @@ +{ + fetchFromGitHub, + buildPythonPackage, + + pyyaml, +}: +buildPythonPackage rec { + pname = "zulip-server"; + version = "9.4"; + + src = fetchFromGitHub { + owner = "zulip"; + repo = "zulip"; + rev = version; + hash = "sha256-Ah/aPgy4RmW3796w6k62zpKsGKB3VKkhoom7l77ibCQ="; + }; + + dependencies = [ pyyaml ]; +} diff --git a/triple-dezert/proxied/services/jl-stats.nix b/triple-dezert/proxied/services/jl-stats.nix index e16782d..d27fe21 100644 --- a/triple-dezert/proxied/services/jl-stats.nix +++ b/triple-dezert/proxied/services/jl-stats.nix @@ -6,10 +6,6 @@ let name = "jl-stats"; contain = config.containers.${name}; - pg = config.services.postgresql.package; - most-winningest = inputs.most-winningest.packages."${config.nixpkgs.system}".default.override { - postgresql = pg; - }; in { vacu.databases.${name}.fromContainer = name; @@ -37,7 +33,13 @@ in }; config = - { pkgs, ... }: + { pkgs, config, ... }: + let + pg = config.services.postgresql.package; + most-winningest = inputs.most-winningest.packages."${config.nixpkgs.system}".default.override { + postgresql = pg; + }; + in { system.stateVersion = "23.11"; diff --git a/triple-dezert/proxied/services/mira-chat.nix b/triple-dezert/proxied/services/mira-chat.nix new file mode 100644 index 0000000..0443407 --- /dev/null +++ b/triple-dezert/proxied/services/mira-chat.nix @@ -0,0 +1,53 @@ +{ config, lib, ... }: +let + container = config.containers.mira-chat; + domain = "chat.for.miras.pet"; + port = 3000; +in +{ + vacu.databases.mira-chat = { + # user = "mira-chat"; + fromContainer = "mira-chat"; + }; + + vacu.proxiedServices.mira-chat = { + inherit domain port; + fromContainer = "mira-chat"; + forwardFor = true; + maxConnections = 100; + }; + + containers.mira-chat = { + privateNetwork = true; + hostAddress = "192.168.100.44"; + localAddress = "192.168.100.45"; + + autoStart = true; + ephemeral = false; + restartIfChanged = true; + + # bindMounts."/mira-chat" = { + # hostPath = "/trip/mira-chat"; + # isReadOnly = false; + # }; + + config = + let + outer_config = config; + in + { + config, + pkgs, + lib, + ... + }: + { + system.stateVersion = "latest"; + + networking.firewall.enable = false; + networking.useHostResolvConf = lib.mkForce false; + services.resolved.enable = true; + + }; + }; +}