From 999b2b73d22c6c22cd120582f3f156115d1a25b8 Mon Sep 17 00:00:00 2001 From: boyreau Date: Sat, 26 Sep 2026 13:13:49 +0200 Subject: [PATCH 1/9] tailscale now registers itself as a DNS provider --- modules/tailscale.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/tailscale.nix b/modules/tailscale.nix index 3687382..b322cfc 100644 --- a/modules/tailscale.nix +++ b/modules/tailscale.nix @@ -2,4 +2,8 @@ services.tailscale.enable = true; services.tailscale.disableUpstreamLogging = true; services.tailscale.authKeyFile = null; + + networking.nameservers = [ + "https://taila38157.ts.net" + ]; } From db5a737339a5639e8cd88e7f10e24d91882f7e92 Mon Sep 17 00:00:00 2001 From: boyreau Date: Sat, 26 Sep 2026 11:38:15 +0200 Subject: [PATCH 2/9] Kubo private network configuration --- modules/ipfs/kubo/default.nix | 40 +++++++++++++++++++++---- modules/ipfs/kubo/keys/network-key.yaml | 6 ++-- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/modules/ipfs/kubo/default.nix b/modules/ipfs/kubo/default.nix index 4cfd59c..e23cb3c 100644 --- a/modules/ipfs/kubo/default.nix +++ b/modules/ipfs/kubo/default.nix @@ -17,14 +17,44 @@ in ]; settings = { Addresses.API = "/ip4/127.0.0.1/tcp/5001"; + + # Private-network (mesh network where everybody knows everybody) specific configuration + # Not available in privated networks + AutoTLS.Enabled = false; + AutoConf.Enabled = false; + Provide.Enabled = false; + Swarm.AddrFilters = [ + ]; + Swarm.Transports.Network.Websocket = false; + + # Let's rely on tailscale MagicDNS + DNS.Resolvers."." = "https://taila38157.ts.net"; + # We're in a private/closed network, no need to hide ourselves + Addresses.NoAnnounce = [ ]; + + # Not needed since everybody knows everybody through peers. + Routing.type = "none"; + Routing.DelegatedRouters = [ ]; + IPNS.DelegatedPublishers = [ ]; + + # Peers that I want to constantly connect to. + # Less battery-intensive than the bootstrap nodes. + Bootstrap = [ ]; + Peering.Peers = [ + { + ID = "12D3KooWLW9Pms1H8KHMVnXTu8LtmnU29XDwvNmDbirGtDyKeiB6"; + Addrs = [ "/dns4/zomelab.taila38157.ts.net/tcp/4001" ]; + } + { + ID = "12D3KooWFVC9GmZqcYQNRiLfAmN8PjzdGE2yfMZZbbFpRaMtAKis"; + Addrs = [ "/dns4/niczos.taila38157.ts.net/tcp/4001" ]; + } + ]; + # End of private-network configuration + Discovery.MDNS.Enabled = false; Plugins.Plugins.telemetry.Config.Mode = "off"; Datastore.StorageMax = "10G"; - Bootstrap = [ - "/dnsaddr/zomelab/p2p/12D3KooWLW9Pms1H8KHMVnXTu8LtmnU29XDwvNmDbirGtDyKeiB6" - "/dnsaddr/niczos/p2p/12D3KooWFVC9GmZqcYQNRiLfAmN8PjzdGE2yfMZZbbFpRaMtAKis" - # "/dnsaddr/pepere/p2p" - ]; }; }; # Private network key diff --git a/modules/ipfs/kubo/keys/network-key.yaml b/modules/ipfs/kubo/keys/network-key.yaml index 350d19e..5cd227a 100644 --- a/modules/ipfs/kubo/keys/network-key.yaml +++ b/modules/ipfs/kubo/keys/network-key.yaml @@ -1,4 +1,4 @@ -network-key: ENC[AES256_GCM,data:G7f4h5k/SMBhe3y8ujfJ7xA83EpLJgOTE4c0Yd8p5p19DVufdjMxlNBPwds=,iv:wsV662+cnWYnjvrAxSd/1/AoQxa4nNIc2wdU5xgABvs=,tag:XBsX0EdHI6tUyfT1gv0UUQ==,type:str] +network-key: ENC[AES256_GCM,data:boWz7escIpqk4AVAWc69PtPNtqlySh4fAYauCR28dQW3DkRZHuC21WP+E82MznEKVqPsCi+sYtu9C3yxS+vpijePGUeATlaKOPGyLg0ss0WYAohcXnJ8q/g7aquFLwxk,iv:UNhqQs15HhKQNy0ds8J3d6G1Oe3Q6xQ21oswmg4l2e8=,tag:D2dFUutrWodi7HuJfhid7g==,type:str] sops: age: - enc: | @@ -81,7 +81,7 @@ sops: 3seQ+Y/Ap0tbohY= -----END AGE ENCRYPTED FILE----- recipient: age1pq1rme2egcmrap2w7garznjd5m9trxvqjgedn7fg2dfcawdpuz3a2t3gvhp3pldj6s0yfnn6c5d5ty4sy4vrx26vrgwqv7ra6te49dyqmrz39z8p80t4pcthwd66ltnxqy4eeu02rmq75f3l9slkfth2al4pfvd38d82alagxxqsmdxhyetw25x5mjxqxnk2asullwywdvvgx0d4nkl54tmunymfd4kag0udyyfsv3y2g380qzr7erzduz4ymxcqenmj9n09zjtcyx9acwkr4nd8qgvnfda33sqkl543lmzpj8a08vp9qf3y7uuqe5jvch8glrjwvf9cyqyk2s3mat4yfnjpklehj5vfyugaac0herts9mk9wp3hwawhfm5f6gvsrmytwccv6m62g0nmya0naq2xfkygj0zzd8s9v8v5qxlfv6qjyjkm7h2j8weq3j9xeqpp3qh5xercy2v99h2k7ddlj7jdq7xxmsv37cx4ud732kjwwqapagaw2qvl3l5yxrpw2ntkf9whyehtjyzq699xqwezlpt23g8hdu9enezk93yv7h5njp4dwf8yf2mn6dzv0qkydqxe0pj0x3epgfffsmz8yqthh6exzwum25lsgw9kleezrsmtw3ew0dhvgclzp50zqf5r3m3kymtcaas7as69nq6cfquz4hgv9uyj9t0kzl72hxz86smgyc9p3qzpvvhp3ll6zvhw5vcunau0k0uqezn5kyrv7gqf378xrzmr549x7jvurpxtcgn3k72c4lc9e50zyz72v6yfzcpv9vvv7ypg4n2fvycsel4372qm6yq5pmh4rf0vpkmdyvafgn7gpkf69sq5ymx2lw8msmaggnzvjrgpyer5zanv8duufm3qanyl2wfmuf42rtgn020e9cxz792x83pd4c30vwmd8jhrjtfh0rvpauep26zyau58py67v5r6nywnj3ksnttywylfpgnx7m6e7nx23chgspj9rrkd38sgxgrcd6sr934xywykytd88996zls0ueate58477u2sd0c2qq2qc5ck648xdjwjjrt9dcka3lszqhd4yqgfm4vnpvhmpmw3lzs7cr4qwdpa68zvdfp2kc4vhf2ffjrnr6sagyfrq6pg0csffu5rqc2hpvwwy5xv4g56qdk72hkyyzy4zk4nnhxkasw992v6hgysg758reugnfm8fp3afycuur5eshlfjzkcvte9t5hd09yhhlz3z4z3xqwlrnl3ycxkqav87vywgqv3kgwdmn5nt3k9kg93mqjk856792w0m3dpvrzy0pvae0sqghfdttn7sgqhu6pyvfs8mkx9ppkwgfj96zgdhjza378vrspv2pe2cl67rywflzkdqr5qrsdwh4kzsn8qq4fpytgr5f269hnvhv2592gtmu7mymjgk5x09hwvtnxdqt5y4cnypnscurvaqdz2rgw6sw3tdchku5cvjk4zrxgv05c64z9k56asu65j2awlnryg44zp5x7972pxemdt9y207mnt9z5lraurgvzppgt5a9hw5vtfrjsqeklly2d0u3v8tr3vpvgj7qsvdf0hmkf8j2zkpz9gtnm38pls56p5tpa6sgr54aqf8550xkssj9yur2dmentnercw0g5fhm8yzqq8p2gm0tqrsl293heqne0p6zfezsznn8jt9ed9jdyc2tyfwxsmanwjzfxq423xfwq9ha5x7vezesm64hdry82axqej0a0s7g3925tu98qdk0s70e5389z94ete7rru39wdxud9se57t0g4nuhjpypjzfgl5r5gyr5yh6dzv9zhue936mcdxjv037rzxc0n4ehht2xpuaajhu44u2vnc34uv058gye425k7gp7uty5lf84tz5t5kdeznch9evcqs2jvtfm9q5yhyrgcq4cepttjxkrmac0fl6qgpe78n0 - lastmodified: "2026-09-25T17:18:54Z" - mac: ENC[AES256_GCM,data:UFuQrDik7DNpraFN59w9dzKKOPxzqSvJOBuwXSKWBQBbAd4dOfP1Dmex4stlGDfge2uk7A8y/lKLvc6xEhgr4Vi8OAS3A0hrOTHSFSFYGurxyuBDVvtFOfJLaxs6XlHfCtinxHfKxuzbWJGtHVzK6RBWgzuORCWOoqfTR2E//hg=,iv:gEt+vyC7ho25YqPr5hqqe5SR9fKcOdoq94cMf7Crigc=,tag:pX3xamp05xZtaQ0jtYS+0Q==,type:str] + lastmodified: "2026-09-26T09:20:35Z" + mac: ENC[AES256_GCM,data:hSOqHDVdqNbhv9sApCfLrTRZngdBhI6S+CWA4PM7gyyNAZwAueeEparljkuMgRPo5nPWiFZUu/IDt915GL5gYvpVEboC3brM2b9PkURKxTdo+QnU4cJ4BN+VN6RklV5Xs5k/WxNJevnVdMEZ6AcreAbNCox8Eq19S9KyxJDnfFQ=,iv:rqVf1a47+SgL4P/+fS29MqpUbdS2zyeCJ2m107eED6A=,tag:PjscBwa2dBtGPyZ3/WtboA==,type:str] unencrypted_suffix: _unencrypted version: 3.13.3 From 0878d1264d9b406d3897b942778f5b0f5e1e61c0 Mon Sep 17 00:00:00 2001 From: boyreau Date: Sat, 26 Sep 2026 14:17:59 +0200 Subject: [PATCH 3/9] ipfs-cluster configuration --- .sops.yaml | 2 +- modules/ipfs/default.nix | 2 +- modules/ipfs/ipfs-cluster.nix | 30 ++++++- modules/ipfs/keys/ipfs-cluster-key.yaml | 87 +++++++++++++++++++ modules/ipfs/keys/ipfs-cluster.key | 1 + .../kubo-network-key.yaml} | 0 modules/ipfs/{kubo/default.nix => kubo.nix} | 2 +- modules/ipfs/kubo/key | 1 - modules/tailscale.nix | 2 +- 9 files changed, 121 insertions(+), 6 deletions(-) create mode 100644 modules/ipfs/keys/ipfs-cluster-key.yaml create mode 100644 modules/ipfs/keys/ipfs-cluster.key rename modules/ipfs/{kubo/keys/network-key.yaml => keys/kubo-network-key.yaml} (100%) rename modules/ipfs/{kubo/default.nix => kubo.nix} (97%) delete mode 100644 modules/ipfs/kubo/key diff --git a/.sops.yaml b/.sops.yaml index 7176bb8..43b5c6e 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -6,7 +6,7 @@ creation_rules: key_groups: - age: - *niczos - - path_regex: modules/ipfs/kubo/keys/.* + - path_regex: modules/ipfs/keys/.* key_groups: - age: - *niczos diff --git a/modules/ipfs/default.nix b/modules/ipfs/default.nix index 5f75641..dca538a 100644 --- a/modules/ipfs/default.nix +++ b/modules/ipfs/default.nix @@ -1,6 +1,6 @@ { imports = [ - ./kubo + ./kubo.nix ./ipfs-cluster.nix ]; } diff --git a/modules/ipfs/ipfs-cluster.nix b/modules/ipfs/ipfs-cluster.nix index 8df6b14..e4cda51 100644 --- a/modules/ipfs/ipfs-cluster.nix +++ b/modules/ipfs/ipfs-cluster.nix @@ -1,11 +1,39 @@ +{ + lib, + pkgs, + config, + ... +}: { services.ipfs-cluster = { enable = true; consensus = "crdt"; + secretFile = "/run/secrets/ipfs-cluster-key"; + # ipfs-cluster-init.service generates its own id and adds other ids as trusted/peers/bootstrap peers + # in $IPFS_CLUSTER_PATH/peerstore - for the peers to connect to on start + # in $IPFS_CLUSTER_PATH/services.json - for the peers to trust + # in $IPFS_CLUSTER_PATH/identity.json - for the new machine's peerId to then add to trusted peers + # TODO find a way to generate this ID manually and set it per-machine, instead of retrieving it from + # a generated config and adding it back manually to every other peer... + initPeers = [ + "/dns4/zomelab.taila38157.ts.net/tcp/9096/p2p/12D3KooWPnNjUKE88B9dZR6J4SkWTjD5uVFFfgUFypdXThrZxaLR" + "/dns4/niczos.taila38157.ts.net/tcp/9096/p2p/12D3KooWETrrcBP9Jw8L2Dwd9ywMWkShGqsveSd8fvd3ZyYeZmS9" + ]; + }; + + # Inject debug flag in ipfs-cluster ExecStart + systemd.services.ipfs-cluster.serviceConfig.ExecStart = lib.mkForce [ + "${lib.getExe' pkgs.ipfs-cluster "ipfs-cluster-service"} -l debug daemon" + ]; + + sops.secrets.ipfs-cluster-key = { + sopsFile = /etc/nixos/modules/ipfs/keys/ipfs-cluster-key.yaml; + mode = "0060"; + owner = "nobody"; + group = config.services.kubo.group; }; networking.firewall.interfaces."tailscale0".allowedTCPPorts = [ 9096 - 9094 ]; } diff --git a/modules/ipfs/keys/ipfs-cluster-key.yaml b/modules/ipfs/keys/ipfs-cluster-key.yaml new file mode 100644 index 0000000..b0c14ad --- /dev/null +++ b/modules/ipfs/keys/ipfs-cluster-key.yaml @@ -0,0 +1,87 @@ +ipfs-cluster-key: ENC[AES256_GCM,data:6cNoTQr32l2UqTnRbrrC+d81sYQDS4d+GFZ483oooYNOPaRDcZtQ7VQoj2UCQOF2SAfcrVY+Bllm5floqcsikN79d8IKwy8tXCTJYGKSxg==,iv:WJJ1ONFcycMrzmZfi0TtOEP7Vx8282JTW1cDpypmwlQ=,tag:g1rC0BxZKcMbDjUrzHe/aA==,type:str] +sops: + age: + - enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IG1sa2VtNzY4eDI1NTE5IGtlcGNSNGtr + V0g4VEdSWitEMGRTV2dZZDhBeTVxVElFUlZIZDIxSjQrN3NFaTUzckcxNktNLzhO + T0phQzljS3NqeWUxNE1scHBGaElwN0Y0TVl4VzlzTDdaelNWQmwvUEViWGR6T0Vn + bldiTDBFSWxmaFFkWUlHZFZacXRUQ2Z5aEt2ak9xalEvNW9OeFBnMjBQUk9iSnEy + dWhBYndURlJOQnJreGl2SHQyOTZVemRaVWdXLzBjNHI0d3FDT2dWdncxc2RCUlEz + dFNZblJwZjJmUHJVd2Fvd1RlSEJ4Y2JQRy9qaGk2R0hiYzc3TDZvWjhxWGFQLzFx + UnFHVVFISUNOSlhkblBLSEZsY0Y5VFMrbkZaYmI0NGtyc1Exb1RZSkhCdWsvSjFn + by9mZ0lHQzRyZWJxeEppd2p0MXBCSkM1enllcHVTWGdFcmpqN29xbUppSitjMjNh + WXVBSGdpRHFROVh5VzMwNU5MTCtlVjE1OURjaFBtdUw1Z3prUEMwYm9BMmR4Z2pp + cFBTRXQySWNjWVY5U1RqcVFoNHkweCt5cklud1VFQUV2WlcwNTNLMzB2K1luREt0 + aU5zd2Zab2JFck9yZ216Z1p3c3B5QTBaRGR3T1JrbkZ3TVNtaDVUbEpMSmRsZUlM + ZjlrVEZxOW45dFNTNnZSNTNYQXZWSGd3UlVYc2tKekp3S24rVWhid3dRaTYzWjZV + YVJ2MDFKTG1lUFdoVjJqNFBWdEFJZk5LUGI1YmIxVDJ6emVVVko0cHpOWHVsRXo5 + V1BSbW1OK2thLy8zcWhadCs5ZHJ5UjI1T3Y0cWh1TjRyRjNXNmJnbDBrbVR1cllB + OG1hOXBSVFF0U3dmejV2bzcwVEdVZXgyV1NvbjhJUGQ5bDBFMHUxQUpWOVkxWXFP + VDA4SkN1MEJkSFBzTEJBMFBRVDgzZzJxQThlNGhqZW9NOGRuSy9zbWpOZ0thdjNJ + YVg5bUpXb2lIRGFUSG5yeFBwbUhyM0FuWkM2L2o0N1hyOGpYRjVVOUNlMXp5L3dM + amZmcGVaNmdsQWtsblNvMGx4eExGTkFQMU1WaW04TXFmdEkrR2FtZTlqVUJaSUtS + c2NOS3M2dnJndFVPZ3BTWmIzczZaOEsyQmN3Q0JMS3MySEU4NkdlVUt4SEo0a0xE + VnhJdSt2a1pySmNDZUhCcmljVWVMZEY1VTB0Z0NmUEFSQ0RSZDhEQ3dOVGRqWi9n + N2pUMkJERUN3Ym1hUnpBRjNrQ05BU2hVTnBvdmFia1dRSTRDMVZ2Wm9BSFNnenoz + S3NtQ0N5RVN0MjE1YytPeTRjb0lOaEdTYTZSTFRRZVM2T3dnL3RBNXdhbFhkVHM3 + alFQTHFDWXBLc3l4YUluOTIxMCt2djFXdko2Tmt3UzcrYzVOYURsUmFXWnc5K2Fk + dStoYmZXSExZTjNWMU5Lc2dNYm9GMHgzMVVpVzZnUUVFRVhxWVRXOEYzTEg0YmNV + aDZBL3IyQkJxVTJuMTJIUlRBSHhtRm5CY0p1V3BNWjc1MmtucFdsYVh4QlZjYlZL + d1FtS1B3R2QyT3lxeEl4VWZ6RjNaTGNEbEhicXZiZFRUeGcvYjFyZGwvVWh2VHJP + b28rbzByWEJzd3E3OWJVUlRmQzlZRGU0NEdIRm1MR2tWdVFZV0VlUjlZOFZrTnd1 + VzY2TDhmU1hLcnRmNEtad2tuMkczV25xemRKcU9QVk1uTWt2bG9YNis3SDM0Q0RB + RVZLcjhJVVdqditoRHJqOERkYmxhSE5Gai9BMUIwNG8wUC8wckV4OFFJOW41MmhI + VDVldmhYN3AwanhaZXgzMHlIdVBuT1Rqa1oxeEZ2ekZOMUlOd1lRMGpCWVEvQ0xO + Y3ZnaVdFaWw4TjBmSll1b0RTM1BiZ3pxUHpERG5IOE1CVnhEYTRNRVRzT3NxODdB + NFNTVllzU3FLK2Y5RHdSRkdkL3NPNWNNM1lGdVlKVW9KNDJldTA5TFdMMFlMZwpJ + bXNCdlU0YVR0N3U1N1lESkVaQ3FtZTV2WWxHYUI1V0tJcTFZQlU1cDBjCi0tLSBu + VjRxcENuYjduMHBkTHYxOVI3UFcrZ2ZncFhRbmlaZEE3a3FXekxidG9jCs/UFog7 + ofygApss+Tcs0u7ivpLX6dFg0gFlU1dAh9JsC6EpFKkWCEGXkGen7dbVThi+ztCP + D1mS4FgQMHaY/fw= + -----END AGE ENCRYPTED FILE----- + recipient: age1pq1decgermns972scgk7cqvcp34v8ak0wpjsc0s09nnfqrwe96jas396a6jvxe3stt6234c87jyrp6cw6rzv0mvcrx2xssncq3ylgf83gvv38jl4sn4293kzunr06ms5u8tq875nv02ct9kvfe9uf55p748ew362kgvsdczwxc866wvg9m64tgzxp4ttsfq35tfah3mjjazf00nqytqczl6gtr4x9ffdq3cr53xeqrqzvj7l3eapaph7fekvpkk5sc0w2ny0jete3xrehlkrhete20xw9035fdu7hu2mnc22cd5ydnekmydlwy3qw7x6vwhw44y2xdzaymq5j662mfv4t4tw9pgqj49wjeazzap6d4eejcsvze6tshckx7s4eerugmuzw9x0cgugzm07s7xw09knapr7fdk5jaagtgfzem9jsskqtmfrh6jn7xqd3kagg3k4v7tuxvnea0ssgz00v0a7ud59cdj7tt4twd5g0slc2hfrnxk7sx0ewz4d5l3wx9lrvd3v4yyyvd9wyy8p9ssv6eyezdp7p03lqv45d4cktsyflx7nv4vmwjkqaf4v9e6y56kkvx9zvuh4jr59crg8f24zlph3txkyjx0c7jhxffpcd9hvyh3ft7ggt32gzzd0qcpt2yym7us4mtcsy2jkrxdla6vt9qvp9s8x7zcz5xwx7d7hrytx833f6js9dpf5x8ax6aaf4p4mrcjzd9s5j9jshs6fwrkzfm6ex9y523pdl4hjtedh89gq9ymgtpmzlvt3tqtwfsj4qu32lr0whwyp95x0nqq0v59273f83a0a2ey6x64r2r923jtdjud6szw6338y73tf7sw9d06xu522j5ytjn44tw3hxk9pf6gd93q5jdac77gp8zrn70uzln7zcjz9gpfh92ycyfxc4s3t23kanxhp7pyf9gczq7eyq69y8apq45dwj5wzh7qe6zvp3vqjwpd0tr03eaq0vfmlyntnhfc4tdw7zkscdx92hzp3kjgdphtk22ve2l635af3ns9nkl9ns0ehgt0ugmk9zd0u86979zxqpwrzfqw69rht63ykrz5hr8k2fwxvsc3uzesuqvvweeempqp42v3zaxt8fp4x9jrfmgnfcv8cz6exqwack00dfept5s5vtafgug3wwjmew9dj4auysz5vxxq0e5sttjjddqfl22myrngn6xxcx8qvys0yd5ua4wgaugskd3c5pcdnnrrhxctjv93zq42x75g37hsw70ltf5sf7w8rsgna5hvwj9phgzk22st29cl432xjdkj8wppg39kud9n6rz7ng9m4vv897mtxqqyvvhrypu03a6y939tc7edk5kyx5cunryjay6qxhf2tl3qxcl2ccrx84qc7k56luq9v6v5nths9qrpqyu39vvfl7trque7v93qyps2nqqa9z7rh3dz993ueyzfuptu8xvhqfn9yynfq8kvsxntc4nkzmyuz7gpzannn7l2exr63yrvgw5huep27kxt958kyy76pwd78348rtq69c7p2dmakvhkddgn6efh6qp6ju4rddv78x048vkxz5kgv4j358vhqy3yckagseh2lvj0zdyra4funpngjcy0eff2emrfav49cytk23slvm0rcyf6y7dynuvp22t3d8p4vnzaffqqs7cw6f25q6esw6ay5lajj3vzfzj0486kv6c8zv049dl5guxlmztmh8f34rc9j30f3zsg5fgplwe8sfftzrne0cjrqx6vhf8spcfz5gu4t2w39hv2wj4qxetgj5vv43zj5mwkca2pxz5q5zw9lxnd39tvewurzr2nyg48a2y8r5kkjas69lune0plhqljyqx0zvtwydvwtxce5zy5gyvszdwj6ndynphjmnvea0hrygu8q0g2utdzc0urajkcqzaqupff79l6wqt0gsceqp66 + - enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IG1sa2VtNzY4eDI1NTE5IGdkUDV0SEts + dUZSbUkwdk9lNklYM1FOM2g5SmxmalpheXd6cUh4bjNseE90NzRrTDV4aTN6VDhJ + M3pnblBhK1ZDVUJSdDVtbFVhM0FQMytqb0xUSnhyVmQwS2l0SDlFeGFNMzlGOXRJ + WmpTWW4wcjF3dmxYK1VKaks1M0xZUWRsUEhscWFLL1k2Z1NQY3pUeHV3V0tjeHQx + U05JVzFnUmRiT1RyZURFOXltUyt4SEE2eHFGL0d4VkRZZlJ6QVF0SU1nc1RoNFVF + TFluVEsyNENodkNqN1dNbytFSndiSXRRNW5ZVmMvMFg1OE9UUkxZRUh2UXkxYUZi + ZDlKNVFzTzV1em1nR2ZleXBLTE1LVlY1NjNaQTNTdGlvODl0T216Q1FyZG53SUFs + MDQyVjh5N1pVMGFSMnA5TzVQSFBpL0Z0anphaGNFYWw2Z2RsRXVrZU9ualFPMjhH + UHdNL0N0Vk9SRjFDSDY2bXZTVFkvbUVoYmJ5Y2xHbHdySkFBN2NFc1BQcStFaUcr + cDZsWmVlNElvcm1FZnp1dnRqeU9LaUtReklQd1owMGdKZnpqcEdvYUczMEtMUEI3 + ekVkVkF0cHJCdU5xdjdHWVpFazV1VTZhczNqUk91Z2gwdm1BQVBHeThFekRwVy96 + TDVoek9KYlQyMDlIbVZnZGduMnpEbHBBajNaNnVyOWg1TEQxL0tuSkVpWkxhVCtz + U2dvSEgzMUpwbldFdStyZUs4RmJNcGg4eHlBZWlGc0JIWmMwaURXNTh1SjI5azNi + N0hBUTdBM0l2WmZuanFVREJNbHhOSzNOV0x6S0ZCTjlXMWdwVWRIT3grNzV6U0Zy + S3paY0Y0d1Qxa21wOWhjejFaMTRDUTIzQWloNHBwQlVnSTN1YUdOZUN1UXhzK21N + Mk56OEVOTTJ1ZmFRMHlURVA2ODNUNWo3d1AzWHFLN2VRdm1qUloxNEgyNS9vTnpt + RHgvTGZkeU9ueEQ1bDdQRkJuc0M0Z0NReDZlQnd4NXBrY1dURlg0VG1tUGlEUElR + V3paa3U2YlN0MWpqVmFXV2k1TE9wSVVLRTZZYmQ1SEV4Wk8wN2RCQVhqR2tOVUFl + R0hDVmpkL0VrQUxURExsL1ZpU2lqY0M3aHU5YVMzbzVrOGJkUEt5Tm5rd0lEaVAr + NlVpdXhTVldocG40V1J3Vjc2aTI3ekZIZDRWdXJSV2x0bnB2ejRVdnRaa2JpSUxF + RlFhZStPTTRBYllNbjlnSmtvdnZ5elpVaGhOUUNtOWFmR0IrbTFiMXJGRnFuaFJT + Z3FZZmFPNXpzbThyVStCNTNaNkVqQWVMZ24zWVJyMFoxVFJXOGZrUVU0Nm5VSmlR + c25xVis1b3hGZWtEMkc3SDFydWNHTzA2emo3eDZ5RjRDWUhqQ055ZFJhRS9Md0x6 + aHZ6aVo1UFZlcVI5UjdnQ2l1MFFNSXZKTktQdkRISlk4cUxmWDhYdnc2eVp2NE4v + Wm1GNkdQYkN5bXBoZ1AwRlhXYjcvcFNsWFdFb29rTDFUakdqOTVJc3hXTFE5aHB4 + MDhvdmJqN3pSMXNvSVplRGpldlVCUUZZN3d1RDRUQUhsaEtYdENhVEpRUHhRYVNu + MXBSOGtVNjAxMDZXWVNnQXM0S3ZsODVrTmliT1lrbFdPVDFKd05iai81bExpckEv + UGV1TXFxSTVDM1ViWkFSQ0xOb2RoMXlrM0E0Nko4MTdjMXY1WUdqa2xxbFJDTUhr + Qk9PeGxGcHVWSTVKYzVmSlM3UjdIaHgwN0FVVEFxYnhrSW5aWldIUGdGSWY5SXhK + U3hMTkxkRkVBRUZodEx4U1kveVNGQVd6NFhhbFB3d2VtbHVJemp6S0F6YTA4bkl5 + ZU03WXZ1Wjc0NGVjNmcyQWc4MFNYUVhZQmRJc0dGaFJmNlBBYXpLWUo2NmhYUmxJ + SUJsMjFBcTYrMm9HK0lLRjBmWDdzV3ZvWENYNHZFVEkvaE04ZWZxZG1VV1lIQQpM + U3JNU2lGZUFNRkhqUGJQZlVvd0ErWi9kUnNrZkx3UEdNNjlRZHlDaWJZCi0tLSA0 + UWYyaGxlUWI5c0hTVmYwcmVWV3BCN1hsenFYbitSdEhLb29tQkhmVUdrCuj8BeBA + YuGBtUDU39rWova+Wo4sRfCkBGUDCwgfQqYLktnIPlCV3fHDucF4lgUoloXNcqdi + 7NYX3PingoQ779k= + -----END AGE ENCRYPTED FILE----- + recipient: age1pq1rme2egcmrap2w7garznjd5m9trxvqjgedn7fg2dfcawdpuz3a2t3gvhp3pldj6s0yfnn6c5d5ty4sy4vrx26vrgwqv7ra6te49dyqmrz39z8p80t4pcthwd66ltnxqy4eeu02rmq75f3l9slkfth2al4pfvd38d82alagxxqsmdxhyetw25x5mjxqxnk2asullwywdvvgx0d4nkl54tmunymfd4kag0udyyfsv3y2g380qzr7erzduz4ymxcqenmj9n09zjtcyx9acwkr4nd8qgvnfda33sqkl543lmzpj8a08vp9qf3y7uuqe5jvch8glrjwvf9cyqyk2s3mat4yfnjpklehj5vfyugaac0herts9mk9wp3hwawhfm5f6gvsrmytwccv6m62g0nmya0naq2xfkygj0zzd8s9v8v5qxlfv6qjyjkm7h2j8weq3j9xeqpp3qh5xercy2v99h2k7ddlj7jdq7xxmsv37cx4ud732kjwwqapagaw2qvl3l5yxrpw2ntkf9whyehtjyzq699xqwezlpt23g8hdu9enezk93yv7h5njp4dwf8yf2mn6dzv0qkydqxe0pj0x3epgfffsmz8yqthh6exzwum25lsgw9kleezrsmtw3ew0dhvgclzp50zqf5r3m3kymtcaas7as69nq6cfquz4hgv9uyj9t0kzl72hxz86smgyc9p3qzpvvhp3ll6zvhw5vcunau0k0uqezn5kyrv7gqf378xrzmr549x7jvurpxtcgn3k72c4lc9e50zyz72v6yfzcpv9vvv7ypg4n2fvycsel4372qm6yq5pmh4rf0vpkmdyvafgn7gpkf69sq5ymx2lw8msmaggnzvjrgpyer5zanv8duufm3qanyl2wfmuf42rtgn020e9cxz792x83pd4c30vwmd8jhrjtfh0rvpauep26zyau58py67v5r6nywnj3ksnttywylfpgnx7m6e7nx23chgspj9rrkd38sgxgrcd6sr934xywykytd88996zls0ueate58477u2sd0c2qq2qc5ck648xdjwjjrt9dcka3lszqhd4yqgfm4vnpvhmpmw3lzs7cr4qwdpa68zvdfp2kc4vhf2ffjrnr6sagyfrq6pg0csffu5rqc2hpvwwy5xv4g56qdk72hkyyzy4zk4nnhxkasw992v6hgysg758reugnfm8fp3afycuur5eshlfjzkcvte9t5hd09yhhlz3z4z3xqwlrnl3ycxkqav87vywgqv3kgwdmn5nt3k9kg93mqjk856792w0m3dpvrzy0pvae0sqghfdttn7sgqhu6pyvfs8mkx9ppkwgfj96zgdhjza378vrspv2pe2cl67rywflzkdqr5qrsdwh4kzsn8qq4fpytgr5f269hnvhv2592gtmu7mymjgk5x09hwvtnxdqt5y4cnypnscurvaqdz2rgw6sw3tdchku5cvjk4zrxgv05c64z9k56asu65j2awlnryg44zp5x7972pxemdt9y207mnt9z5lraurgvzppgt5a9hw5vtfrjsqeklly2d0u3v8tr3vpvgj7qsvdf0hmkf8j2zkpz9gtnm38pls56p5tpa6sgr54aqf8550xkssj9yur2dmentnercw0g5fhm8yzqq8p2gm0tqrsl293heqne0p6zfezsznn8jt9ed9jdyc2tyfwxsmanwjzfxq423xfwq9ha5x7vezesm64hdry82axqej0a0s7g3925tu98qdk0s70e5389z94ete7rru39wdxud9se57t0g4nuhjpypjzfgl5r5gyr5yh6dzv9zhue936mcdxjv037rzxc0n4ehht2xpuaajhu44u2vnc34uv058gye425k7gp7uty5lf84tz5t5kdeznch9evcqs2jvtfm9q5yhyrgcq4cepttjxkrmac0fl6qgpe78n0 + lastmodified: "2026-09-26T14:13:50Z" + mac: ENC[AES256_GCM,data:jLYsndyP4GFDQXam3qqJ9qVb8IMuWa61tmb8d3OAv7UC4WQqOnRoowenZ2gBnj0xQph7dHRYYdadZivmfTLgzlVW/PWaUNpqE1ZeDxMsr3m/sdIPpH41uhKUrDFFhQYUhnVAQM/mbEIJq+V20Qv41LzcnmYfgr+jWyllHi3Enuc=,iv:AUgjfwaNUjQAgT00kLwFdJDHD94zMzZAql1/APzTXMY=,tag:dOKmFow18HUdMfkr5sbFjw==,type:str] + unencrypted_suffix: _unencrypted + version: 3.13.3 diff --git a/modules/ipfs/keys/ipfs-cluster.key b/modules/ipfs/keys/ipfs-cluster.key new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/modules/ipfs/keys/ipfs-cluster.key @@ -0,0 +1 @@ + diff --git a/modules/ipfs/kubo/keys/network-key.yaml b/modules/ipfs/keys/kubo-network-key.yaml similarity index 100% rename from modules/ipfs/kubo/keys/network-key.yaml rename to modules/ipfs/keys/kubo-network-key.yaml diff --git a/modules/ipfs/kubo/default.nix b/modules/ipfs/kubo.nix similarity index 97% rename from modules/ipfs/kubo/default.nix rename to modules/ipfs/kubo.nix index e23cb3c..c4acffc 100644 --- a/modules/ipfs/kubo/default.nix +++ b/modules/ipfs/kubo.nix @@ -65,7 +65,7 @@ in ]; sops.secrets.network-key = { - sopsFile = /etc/nixos/modules/ipfs/kubo/keys/network-key.yaml; + sopsFile = /etc/nixos/modules/ipfs/keys/kubo-network-key.yaml; mode = "0060"; owner = "nobody"; group = config.services.kubo.group; diff --git a/modules/ipfs/kubo/key b/modules/ipfs/kubo/key deleted file mode 100644 index e436709..0000000 --- a/modules/ipfs/kubo/key +++ /dev/null @@ -1 +0,0 @@ -xhghnBxUYD+bPe8Oilr6DpWeaPgjhsaCgvJKn0dhrk8= diff --git a/modules/tailscale.nix b/modules/tailscale.nix index b322cfc..5ee4227 100644 --- a/modules/tailscale.nix +++ b/modules/tailscale.nix @@ -4,6 +4,6 @@ services.tailscale.authKeyFile = null; networking.nameservers = [ - "https://taila38157.ts.net" + "100.100.100.100" ]; } From 76c1563cef9a4ff6a2767be32054423e4ff88332 Mon Sep 17 00:00:00 2001 From: boyreau Date: Sat, 26 Sep 2026 14:40:46 +0000 Subject: [PATCH 4/9] added git to zomelab package set --- machines/homelab/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/machines/homelab/default.nix b/machines/homelab/default.nix index f98325d..305c0df 100644 --- a/machines/homelab/default.nix +++ b/machines/homelab/default.nix @@ -33,6 +33,7 @@ environment.systemPackages = [ pkgs.vim pkgs.direnv + pkgs.git ]; system.stateVersion = "26.05"; From b7096c6ba52f73f02a320225fc7c7c655a5f3257 Mon Sep 17 00:00:00 2001 From: boyreau Date: Sat, 26 Sep 2026 19:37:59 +0200 Subject: [PATCH 5/9] IPFS + backup-module configuration to backup stuff daily on the IPFS cluster --- machines/niczos/default.nix | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/machines/niczos/default.nix b/machines/niczos/default.nix index c091f7a..3ac0873 100644 --- a/machines/niczos/default.nix +++ b/machines/niczos/default.nix @@ -4,6 +4,8 @@ }: let pkgs = import /etc/nixos/pkgs/jailed-packages.nix; + npins = import /etc/nixos/npins/default.nix; + pkgs-unstable = import npins.nixpkgs-unstable { }; # TODO remove once kubo-0.43 is stable in { imports = [ @@ -52,17 +54,28 @@ in }; }; - services.backup = { - "/home/zo/dev" = { - enable = true; - dest = "/tmp/backups/"; - }; + services.backup = + let + ipfs = "env IPFS_PATH=/var/lib/ipfs ${pkgs.lib.getExe' pkgs-unstable.kubo "ipfs"}"; + ipfs-cluster-ctl = "env IPFS_CLUSTER_PATH=/var/lib/ipfs-cluster ${pkgs.lib.getExe' pkgs.ipfs-cluster "ipfs-cluster-ctl"}"; + in + { + "/home/zo/dev" = { + enable = true; + dest = "/tmp/backups/"; + }; - "/home/zo/Documents" = { - enable = true; - dest = "/tmp/backups/"; + "/home/zo/Documents" = { + enable = true; + dest = "/tmp/backups/"; + salvation.command = /* bash */ '' + SAVED_FILE="$(basename "$SRC")" + mv "$SRC" "/mfs/$SAVED_FILE"; + HASH="$(${ipfs} files stat --hash "/$SAVED_FILE")" + ${ipfs-cluster-ctl} pin add "$HASH"; + ''; + }; }; - }; programs = { steam.enable = true; From b6d496b874df812045797385adbad81fe7751215 Mon Sep 17 00:00:00 2001 From: boyreau Date: Sat, 26 Sep 2026 20:54:21 +0200 Subject: [PATCH 6/9] DNS configuration fix to have internet in the terminal --- modules/dns.nix | 18 +++++++++--------- modules/tailscale.nix | 4 ---- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/modules/dns.nix b/modules/dns.nix index 7c9feab..c7003e1 100644 --- a/modules/dns.nix +++ b/modules/dns.nix @@ -1,11 +1,11 @@ { - networking = { - nameservers = [ - "45.90.28.0" - "2a07:a8c0::" - "45.90.30.0" - "2a07:a8c1::" - ]; - networkmanager.dns = "none"; - }; + networking.networkmanager.insertNameservers = [ + "2a07:a8c0::9e:18bb" + # Default NextDNS + "45.90.28.0" + "2a07:a8c0::" + "45.90.30.0" + "2a07:a8c1::" + ]; + # networking.networkmanager.dns = "none"; } diff --git a/modules/tailscale.nix b/modules/tailscale.nix index 5ee4227..3687382 100644 --- a/modules/tailscale.nix +++ b/modules/tailscale.nix @@ -2,8 +2,4 @@ services.tailscale.enable = true; services.tailscale.disableUpstreamLogging = true; services.tailscale.authKeyFile = null; - - networking.nameservers = [ - "100.100.100.100" - ]; } From bd9957003ceab6112016b0dcc823022068f4b20f Mon Sep 17 00:00:00 2001 From: boyreau Date: Sat, 26 Sep 2026 20:54:28 +0200 Subject: [PATCH 7/9] forgejo config update --- machines/homelab/forgejo.nix | 37 +++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/machines/homelab/forgejo.nix b/machines/homelab/forgejo.nix index 699612b..3f6dd31 100644 --- a/machines/homelab/forgejo.nix +++ b/machines/homelab/forgejo.nix @@ -1,8 +1,39 @@ { services.forgejo = { enable = true; - settings.server.HTTP_PORT = 8888; - settings.server.DISABLE_SSH = true; - settings.server.ROOT_URL = "https://zospace.freeboxos.fr/forgejo"; + settings = { + server = { + HTTP_PORT = 8888; + DISABLE_SSH = true; + ROOT_URL = "https://zospace.freeboxos.fr/forgejo"; + }; + + service = { + DISABLE_REGISTRATION = true; + }; + + repository = { + DEFAULT_PUSH_CREATE_PRIVATE = false; + DISABLE_HTTP_GIT = true; + DISABLED_REPO_UNITS = "repo.releases,repo.wiki,repo.actions"; + ENABLE_PUSH_CREATE_USER = true; + ALLOW_FORK_WITHOUT_MAXIMUM_LIMIT = false; + }; + + ui = { + SHOW_USER_EMAIL = false; + + meta = '' + AUTHOR="Forgeato - beyond forging. We potato."; + DESCRIPTION="Potato. Refined."; + KEYWORDS="git,forge,forgejo,potato"; + ''; + }; + + cors = { + ENABLED = true; + ALLOW_DOMAIN = "https://zospace.freeboxos.fr"; + }; + }; }; } From 684708bbb6e8d5f20e37df1cf3f86648f1159ba5 Mon Sep 17 00:00:00 2001 From: boyreau Date: Sat, 26 Sep 2026 21:32:02 +0000 Subject: [PATCH 8/9] better ssh config --- modules/ssh.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/ssh.nix b/modules/ssh.nix index a0d0ee3..ac1f39e 100644 --- a/modules/ssh.nix +++ b/modules/ssh.nix @@ -1,8 +1,7 @@ { services.openssh.enable = true; services.openssh.ports = [ 22 ]; - services.openssh.settings.PermitRootLogin = "yes"; - services.openssh.settings.AllowUsers = [ "root" ]; + services.openssh.settings.PermitRootLogin = "no"; # Firewall services.openssh.openFirewall = false; From 24de03cb067f2d01657e1d05a38a859a6be86556 Mon Sep 17 00:00:00 2001 From: boyreau Date: Sat, 26 Sep 2026 21:33:55 +0000 Subject: [PATCH 9/9] forgejo config now supports ssh-based push --- machines/homelab/default.nix | 2 +- machines/homelab/forgejo.nix | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/machines/homelab/default.nix b/machines/homelab/default.nix index 305c0df..b03ce21 100644 --- a/machines/homelab/default.nix +++ b/machines/homelab/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { imports = [ /etc/nixos/modules/nix.nix diff --git a/machines/homelab/forgejo.nix b/machines/homelab/forgejo.nix index 3f6dd31..98f3b96 100644 --- a/machines/homelab/forgejo.nix +++ b/machines/homelab/forgejo.nix @@ -1,11 +1,19 @@ +{ pkgs, lib, ... }: { + networking.firewall.allowedTCPPorts = [ + 22 + ]; services.forgejo = { enable = true; settings = { server = { HTTP_PORT = 8888; - DISABLE_SSH = true; ROOT_URL = "https://zospace.freeboxos.fr/forgejo"; + START_SSH_SERVER = false; + DISABLE_SSH = false; + SSH_PORT = 22; + SSH_DOMAIN = "zospace.freeboxos.fr"; + SSH_CREATE_AUTHORIZED_KEYS_FILE = true; }; service = { @@ -24,9 +32,9 @@ SHOW_USER_EMAIL = false; meta = '' - AUTHOR="Forgeato - beyond forging. We potato."; - DESCRIPTION="Potato. Refined."; - KEYWORDS="git,forge,forgejo,potato"; + AUTHOR="Forgeato - beyond forging. We potato." + DESCRIPTION="Potato. Refined." + KEYWORDS="git,forge,forgejo,potato" ''; };