From 6d47716233b3d3f28c00769fd234fe689164ec7d Mon Sep 17 00:00:00 2001 From: stuebinm Date: Thu, 12 Oct 2023 16:38:09 +0200 Subject: more radicle stuff (now with tui!) --- chaski/services/radicle.nix | 9 ++++++--- flake.nix | 2 +- pkgs/overlay.nix | 2 ++ pkgs/radicle.nix | 22 ++++++++++++++++++---- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/chaski/services/radicle.nix b/chaski/services/radicle.nix index f02a934..62bb8d1 100644 --- a/chaski/services/radicle.nix +++ b/chaski/services/radicle.nix @@ -1,6 +1,9 @@ { config, lib, pkgs, ... }: { + + networking.firewall.allowedTCPPorts = [ 8776 ]; + services.nginx.virtualHosts."node.radicle.stuebinm.eu" = { enableACME = true; forceSSL = true; @@ -28,10 +31,10 @@ }; reactions = ["👍" "👎" "😄" "🎉" "🙁" "🚀" "👀"]; projects.pinned = [ { - name = "radicle-interface"; - id = "rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5"; + name = "bahnhof.name"; + id = "rad:z3R2BH43TcvaMQgtk6bKHxzqfNP2W"; baseUrl = { - hostname = "seed.radicle.xyz"; + hostname = "node.radicle.stuebinm.eu"; port = 443; scheme = "https"; }; diff --git a/flake.nix b/flake.nix index d5416be..d6e466b 100644 --- a/flake.nix +++ b/flake.nix @@ -140,7 +140,7 @@ galmon-core galmon-full glitchtip typst almanac rustex kijetesantakaluotokieni showrt isabelle-utils isabat travelynx crs-tracker crs-php bahnhof-name matrix-to - hikari_unstable heartwood radicle-interface; + hikari_unstable heartwood radicle-interface radicle-tui; }; nixosModules = { glitchtip = import ./modules/glitchtip.nix; }; diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 59905f9..15781d9 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -117,4 +117,6 @@ in heartwood = self.callPackage radicle.heartwood { inherit (rustPlatform) buildRustPackage; }; radicle-interface = self.callPackage radicle.interface {}; + + radicle-tui = self.callPackage radicle.tui { inherit (rustPlatform) buildRustPackage; }; } diff --git a/pkgs/radicle.nix b/pkgs/radicle.nix index ff65ecc..ff2ed8b 100644 --- a/pkgs/radicle.nix +++ b/pkgs/radicle.nix @@ -1,4 +1,4 @@ -let +{ interface = { lib, buildNpmPackage, fetchgit, bash, config ? null, ...}: buildNpmPackage { pname = "radicle-interface"; version = "git"; @@ -41,7 +41,21 @@ let # tests seem to be a little nondeterministic, and sometimes hang doCheck = false; }; -in -{ - inherit interface heartwood; + + tui = { lib, buildRustPackage, fetchgit }: buildRustPackage rec { + pname = "radicle-tui"; + version = "git"; + src = fetchgit { + url = "https://seed.radicle.xyz/z39mP9rQAaGmERfUMPULfPUi473tY.git"; + rev = "96967897b0a436d3298d0d21562081fe3bb3052b"; + hash = "sha256-jLhL2dl7aywFHG8naTjb250znJJYW2i6YdEqKaRJZzs="; + }; + cargoLock = { + lockFile = "${src}/Cargo.lock"; + outputHashes = { + "tui-realm-textarea-1.1.2" = "sha256-7dKyEUm4g+Hub2ouIBBSOnY9MDJcvD22At0Zi5CdmmY="; + "tui-textarea-0.2.0" = "sha256-aeQJh1SG6ICaqZIsQZo101ANNSkSw8NdtHuNHZXnEPA="; + }; + }; + }; } -- cgit v1.2.3