From 793ea803091ff6e9597d096ba793552505b6060d Mon Sep 17 00:00:00 2001 From: Phil Pluckthun Date: Mon, 17 Nov 2025 15:23:47 +0000 Subject: [PATCH] Update flakes and nix inputs --- flake.lock | 89 ++++++++++++++++++------------- flake.nix | 2 +- machines/ramune/configuration.nix | 1 - modules/router/upnp.nix | 5 -- modules/server/caddy.nix | 2 +- modules/server/tangled.nix | 14 ++--- 6 files changed, 62 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index b320e92..7675538 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "actor-typeahead-src": { + "flake": false, + "locked": { + "lastModified": 1762835797, + "narHash": "sha256-heizoWUKDdar6ymfZTnj3ytcEv/L4d4fzSmtr0HlXsQ=", + "ref": "refs/heads/main", + "rev": "677fe7f743050a4e7f09d4a6f87bbf1325a06f6b", + "revCount": 6, + "type": "git", + "url": "https://tangled.org/@jakelazaroff.com/actor-typeahead" + }, + "original": { + "type": "git", + "url": "https://tangled.org/@jakelazaroff.com/actor-typeahead" + } + }, "agenix": { "inputs": { "darwin": [ @@ -14,11 +30,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1754433428, - "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", + "lastModified": 1762618334, + "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", + "rev": "fcdea223397448d35d9b31f798479227e80183f6", "type": "github" }, "original": { @@ -60,11 +76,11 @@ ] }, "locked": { - "lastModified": 1760213993, - "narHash": "sha256-EWdMehWtLMRncjs7mGnor/lmUiVuNP65pKAVVIeutVk=", + "lastModified": 1763324551, + "narHash": "sha256-RmJ19a5eq4aWfMeGvCQGsnnVgZNZKwvQU/H9Q1hTpMY=", "owner": "tadfisher", "repo": "android-nixpkgs", - "rev": "e8b193106797ac680f906464fae31b7588a632ad", + "rev": "b3deb5d9c67274adee5b2161e4485bf8671137a3", "type": "github" }, "original": { @@ -82,11 +98,11 @@ ] }, "locked": { - "lastModified": 1759818599, - "narHash": "sha256-4Go3gVl3E+geWMcFQ+06qlkO/lJlSvS9dyhYiXLWYq0=", + "lastModified": 1763329080, + "narHash": "sha256-S6eZaiRZPvSWv9d2kZO+HrYTelWqn++vsC/bUwOSQ7I=", "owner": "nix-community", "repo": "nixos-apple-silicon", - "rev": "24ab28e47b586f741910b3a2f0428f3523a0fff3", + "rev": "bc52b0623f4367447347cbcc88522ec64486d710", "type": "github" }, "original": { @@ -155,11 +171,11 @@ ] }, "locked": { - "lastModified": 1758805352, - "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", + "lastModified": 1763136804, + "narHash": "sha256-6p2ljK42s0S8zS0UU59EsEqupz0GVCaBYRylpUadeBM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", + "rev": "973db96394513fd90270ea5a1211a82a4a0ba47f", "type": "github" }, "original": { @@ -176,11 +192,11 @@ ] }, "locked": { - "lastModified": 1741473158, - "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", + "lastModified": 1762521437, + "narHash": "sha256-RXN+lcx4DEn3ZS+LqEJSUu/HH+dwGvy0syN7hTo/Chg=", "owner": "numtide", "repo": "devshell", - "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", + "rev": "07bacc9531f5f4df6657c0a02a806443685f384a", "type": "github" }, "original": { @@ -392,11 +408,11 @@ ] }, "locked": { - "lastModified": 1760239230, - "narHash": "sha256-eqSP/BAbQwNTlQ/6yuK0yILzZAPNNj91gp6oIfVtu/E=", + "lastModified": 1763313531, + "narHash": "sha256-yvdCYUL85zEDp2NzPUBmaNBXP6KnWEOhAk3j7PTfsKw=", "owner": "nix-community", "repo": "home-manager", - "rev": "c4aaddeaecc09554c92518fd904e3e84b497ed09", + "rev": "3670a78eee49deebe4825fc8ecc46b172d1a8391", "type": "github" }, "original": { @@ -583,11 +599,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760106635, - "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", + "lastModified": 1762847253, + "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", + "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", "type": "github" }, "original": { @@ -599,11 +615,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760164275, - "narHash": "sha256-gKl2Gtro/LNf8P+4L3S2RsZ0G390ccd5MyXYrTdMCFE=", + "lastModified": 1763312402, + "narHash": "sha256-3YJkOBrFpmcusnh7i8GXXEyh7qZG/8F5z5+717550Hk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "362791944032cb532aabbeed7887a441496d5e6e", + "rev": "85a6c4a07faa12aaccd81b36ba9bfc2bec974fa1", "type": "github" }, "original": { @@ -1039,6 +1055,7 @@ }, "tangled": { "inputs": { + "actor-typeahead-src": "actor-typeahead-src", "flake-compat": "flake-compat_3", "gomod2nix": "gomod2nix", "htmx-src": "htmx-src", @@ -1053,17 +1070,17 @@ "sqlite-lib-src": "sqlite-lib-src" }, "locked": { - "lastModified": 1760265128, - "narHash": "sha256-16Kk6qlIFNS8gdvFAq/6ygNRo0+xqSKltBUNA4PxscY=", + "lastModified": 1763367685, + "narHash": "sha256-PznnFGOwl+FUj2b/xf2qeoh5+tWjj9monYiSufpjXuk=", "ref": "refs/heads/master", - "rev": "3ebdcdbd0f620da0dba554012bc89f59b9122808", - "revCount": 1520, + "rev": "e499dc0f74cea6a6e6eb930c1118683ae8d78d7d", + "revCount": 1667, "type": "git", - "url": "ssh://git@tangled.org/tangled.org/core" + "url": "https://tangled.org/@tangled.org/core" }, "original": { "type": "git", - "url": "ssh://git@tangled.org/tangled.org/core" + "url": "https://tangled.org/@tangled.org/core" } }, "telescope-nvim": { @@ -1188,11 +1205,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1760294209, - "narHash": "sha256-dVtV5m0AzcxUn7dVnVvmiQECQzO1rEMNYOEJvpodY1A=", + "lastModified": 1761993598, + "narHash": "sha256-2KCNlCz+W76Fdl+N7rEPdrwNwO011dDDYgZZmYlV3+o=", "owner": "AndyFilter", "repo": "yeetmouse", - "rev": "783f8f3c9dbb660235b953ad234b8b4b964ab2e7", + "rev": "99844bbd786d612657d892cac2f663d940fd3d62", "type": "github" }, "original": { @@ -1212,11 +1229,11 @@ ] }, "locked": { - "lastModified": 1760293464, - "narHash": "sha256-ZzEtJKudu4ElfYM2+hX9EIk43wX30wE2v5pjClibFq4=", + "lastModified": 1763353619, + "narHash": "sha256-y30wSzjr7QiO4OVB/Tt7dnLRLIuK2EpaftpKeMMLGu0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a6ed465e39c76713f2d17918101193012e387e15", + "rev": "7463345c68cfdd9e92e2d40e390b1a802b0f2add", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cb65bb1..4b66e86 100644 --- a/flake.nix +++ b/flake.nix @@ -84,7 +84,7 @@ }; tangled = { - url = "git+ssh://git@tangled.org/tangled.org/core"; + url = "git+https://tangled.org/@tangled.org/core"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/machines/ramune/configuration.nix b/machines/ramune/configuration.nix index a710376..cacd9fd 100644 --- a/machines/ramune/configuration.nix +++ b/machines/ramune/configuration.nix @@ -31,7 +31,6 @@ leases = [ { macAddress = "98:ed:7e:c6:57:b2"; ipAddress = "10.0.0.102"; } # eero router { macAddress = "c4:f1:74:51:4c:f2"; ipAddress = "10.0.0.124"; } # eero router - { macAddress = "5c:61:99:7a:16:40"; ipAddress = "10.0.0.103"; } # brother printer { macAddress = "1c:1d:d3:de:4b:06"; ipAddress = "10.0.0.35"; } # irnbru ]; nftables.blockForward = [ diff --git a/modules/router/upnp.nix b/modules/router/upnp.nix index 15f2021..3a848df 100644 --- a/modules/router/upnp.nix +++ b/modules/router/upnp.nix @@ -20,7 +20,6 @@ in { services.miniupnpd = { enable = true; upnp = true; - natpmp = true; internalIPs = if intern != null then [ intern.name ] else []; externalInterface = extern.name; appendConfig = '' @@ -32,9 +31,5 @@ in { deny 0-65535 0.0.0.0/0 0-65535 ''; }; - - systemd.services.miniupnpd = { - after = [ "network-online.target" ]; - }; }; } diff --git a/modules/server/caddy.nix b/modules/server/caddy.nix index 0eb3649..b929300 100644 --- a/modules/server/caddy.nix +++ b/modules/server/caddy.nix @@ -49,7 +49,7 @@ let knotConfig = if knotEnabled then '' ${cfg.tangled.hostname} { - reverse_proxy localhost:5555 + reverse_proxy ${config.services.tangled.knot.server.listenAddr} } '' else ""; diff --git a/modules/server/tangled.nix b/modules/server/tangled.nix index f71b4c2..e4ed25e 100644 --- a/modules/server/tangled.nix +++ b/modules/server/tangled.nix @@ -25,12 +25,11 @@ in helpers.linuxAttrs { }; config = mkIf (cfg.enable && cfg.tangled.enable) { - services.tangled-knot = { + services.tangled.knot = { enable = true; openFirewall = true; server = { hostname = cfg.tangled.hostname; - listenAddr = "127.0.0.1:5555"; owner = cfg.tangled.owner; }; }; @@ -45,17 +44,18 @@ in helpers.linuxAttrs { fsckObjects = true; autogc = true; }; - - include.path = "/etc/gitconfig.private"; + include.path = config.age.secrets."gitconfig.private".path; }; }; - age.secrets."gitconfig.private" = { + age.secrets."gitconfig.private" = let + user = config.services.tangled.knot.gitUser; + in { symlink = false; path = "/etc/gitconfig.private"; file = ./encrypt/gitconfig.age; - owner = cfg.tangled.owner; - group = cfg.tangled.owner; + owner = user; + group = user; mode = "0444"; }; }; -- 2.51.2