commit deac6cbbd5e18651c2926e08e851acf82201a647
parent 102f1b9b08a12545902e873806944d9228457b85
Author: mtmn <miro@haravara.org>
Date: Tue, 28 Apr 2026 23:40:44 +0200
void: packages stuff
Diffstat:
5 files changed, 31 insertions(+), 89 deletions(-)
diff --git a/hosts/nixaran/configuration.nix b/hosts/nixaran/configuration.nix
Binary files differ.
diff --git a/hosts/void/default.nix b/hosts/void/default.nix
@@ -26,7 +26,6 @@
jq
gron
datasette
- difftastic
tokyocabinet
dhall
dhall-json
@@ -46,6 +45,7 @@
prek
gh
prr
+ difftastic
];
ci = [
@@ -70,6 +70,7 @@
lftp
miniserve
nmap
+ knot-dns
];
media =
@@ -118,11 +119,17 @@
];
lsp = [
- gopls
- zls
+ zls_0_15
just-lsp
];
+ go = [
+ go
+ gopls
+ go-audit
+ golangci-lint
+ ];
+
nix = [
cachix
comma
@@ -168,6 +175,15 @@
tidal
]);
+ haskell = with haskell;
+ [
+ compiler.ghc914
+ ]
+ ++ (with haskellPackages; [
+ Cabal_3_16_1_0
+ stack
+ ]);
+
lua =
(with luaPackages; [
fennel
@@ -177,23 +193,33 @@
fnlfmt
];
+ beam =
+ (with beamMinimal28Packages; [
+ erlang
+ rebar3
+ erlang-language-platform
+ ])
+ ++ [
+ gleam
+ ];
+
gui = [
picard
xnviewmp
freerdp
obsidian
+ halloy
];
llm = [
claude-code
- gemini-cli-bin
+ gemini-cli
(antigravity.fhsWithPackages (p: [p.zsh]))
crush
];
other = [
babashka
- gleam
];
}));
}
diff --git a/modules/services/radicle-node.nix b/modules/services/radicle-node.nix
@@ -1,83 +0,0 @@
-{
- config,
- lib,
- ...
-}: let
- cfg = config.services.haravara.radicle-node;
-in {
- options.services.haravara.radicle-node = {
- enable = lib.mkEnableOption "Radicle seed node";
-
- domain = lib.mkOption {
- type = lib.types.str;
- description = "Public domain name for the seed node (used as alias and external address)";
- example = "seed.haravara.org";
- };
-
- publicKey = lib.mkOption {
- type = lib.types.str;
- description = "SSH public key string for the Radicle node identity (without comment field)";
- example = "ssh-ed25519 AAAA...";
- };
-
- privateKeyFile = lib.mkOption {
- type = lib.types.path;
- description = "Path to the SSH private key file (e.g. an age-decrypted secret)";
- };
-
- openFirewall = lib.mkEnableOption "opening the firewall for radicle-node (port 8776)";
-
- settings = lib.mkOption {
- type = lib.types.attrs;
- default = {};
- description = "Additional settings merged into services.radicle.settings";
- };
-
- httpd = {
- enable = lib.mkEnableOption "Radicle HTTP gateway (radicle-httpd) behind Caddy";
-
- port = lib.mkOption {
- type = lib.types.port;
- default = 8080;
- description = "Internal listen port for radicle-httpd";
- };
-
- aliases = lib.mkOption {
- type = lib.types.attrsOf lib.types.str;
- default = {};
- description = "Alias-to-RID pairs for short clone URLs";
- example = lib.literalExpression ''{ heartwood = "rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5"; }'';
- };
- };
- };
-
- config = lib.mkIf cfg.enable {
- services.radicle = {
- enable = true;
- inherit (cfg) publicKey;
- privateKey = cfg.privateKeyFile;
- node = {
- inherit (cfg) openFirewall;
- };
- settings = lib.mkMerge [
- {
- node.alias = cfg.domain;
- node.externalAddresses = ["${cfg.domain}:8776"];
- }
- cfg.settings
- ];
- httpd = lib.mkIf cfg.httpd.enable {
- enable = true;
- listenAddress = "127.0.0.1";
- listenPort = cfg.httpd.port;
- inherit (cfg.httpd) aliases;
- };
- };
-
- services.caddy.virtualHosts."${cfg.domain}" = lib.mkIf cfg.httpd.enable {
- extraConfig = ''
- reverse_proxy 127.0.0.1:${toString cfg.httpd.port}
- '';
- };
- };
-}
diff --git a/secrets.nix b/secrets.nix
@@ -20,5 +20,4 @@ in {
"secrets/smtp-alerts-password.age".publicKeys = allKeys;
"secrets/radicale-htpasswd.age".publicKeys = allKeys;
"secrets/shirt-linkener-auth-token.age".publicKeys = allKeys;
- "secrets/radicle-node-key.age".publicKeys = allKeys;
}
diff --git a/secrets/radicle-node-key.age b/secrets/radicle-node-key.age
Binary files differ.
