From 91a30624de6058f4756349c7ed73b5cd8cb85dd4 Mon Sep 17 00:00:00 2001 From: "oppi.li" Date: Mon, 7 Jul 2025 13:41:08 +0000 Subject: [PATCH] add spindle to nixery box --- flake.lock | 182 ++++++++++++++++++++++++++++++--- flake.nix | 5 +- hosts/nixery/configuration.nix | 8 ++ 3 files changed, 181 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 3fbe43a..0ff7b12 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1750040002, - "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=", + "lastModified": 1751854533, + "narHash": "sha256-U/OQFplExOR1jazZY4KkaQkJqOl59xlh21HP9mI79Vc=", "owner": "nix-community", "repo": "disko", - "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1", + "rev": "16b74a1e304197248a1bc663280f2548dbfcae3c", "type": "github" }, "original": { @@ -73,6 +73,106 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "tangled", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "htmx-src": { + "flake": false, + "locked": { + "narHash": "sha256-nm6avZuEBg67SSyyZUhjpXVNstHHgUxrtBHqJgowU08=", + "type": "file", + "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js" + }, + "original": { + "type": "file", + "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js" + } + }, + "htmx-ws-src": { + "flake": false, + "locked": { + "narHash": "sha256-2fg6KyEJoO24q0fQqbz9RMaYNPQrMwpZh29tkSqdqGY=", + "type": "file", + "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2" + }, + "original": { + "type": "file", + "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2" + } + }, + "ibm-plex-mono-src": { + "flake": false, + "locked": { + "lastModified": 1731402384, + "narHash": "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=", + "type": "tarball", + "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" + }, + "original": { + "type": "tarball", + "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" + } + }, + "indigo": { + "flake": false, + "locked": { + "lastModified": 1745333930, + "narHash": "sha256-83fIHqDE+dfnZ88HaNuwfKFO+R0RKAM1WxMfNh/Matk=", + "owner": "oppiliappan", + "repo": "indigo", + "rev": "e4e59280737b8676611fc077a228d47b3e8e9491", + "type": "github" + }, + "original": { + "owner": "oppiliappan", + "repo": "indigo", + "type": "github" + } + }, + "inter-fonts-src": { + "flake": false, + "locked": { + "lastModified": 1731687360, + "narHash": "sha256-5vdKKvHAeZi6igrfpbOdhZlDX2/5+UvzlnCQV6DdqoQ=", + "type": "tarball", + "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip" + }, + "original": { + "type": "tarball", + "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip" + } + }, + "lucide-src": { + "flake": false, + "locked": { + "lastModified": 1742302029, + "narHash": "sha256-OyPVtpnC4/AAmPq84Wt1r1Gcs48d9KG+UBCtZK87e9k=", + "type": "tarball", + "url": "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip" + }, + "original": { + "type": "tarball", + "url": "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip" + } + }, "nixery-flake": { "flake": false, "locked": { @@ -91,11 +191,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1683408522, + "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", "type": "github" }, "original": { @@ -107,11 +207,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -126,16 +242,30 @@ "colmena": "colmena", "disko": "disko", "nixery-flake": "nixery-flake", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "tangled": "tangled" + } + }, + "sqlite-lib-src": { + "flake": false, + "locked": { + "lastModified": 1706631843, + "narHash": "sha256-bJoMjirsBjm2Qk9KPiy3yV3+8b/POlYe76/FQbciHro=", + "type": "tarball", + "url": "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip" + }, + "original": { + "type": "tarball", + "url": "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip" } }, "stable": { "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "lastModified": 1669735802, + "narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "731cc710aeebecbf45a258e977e8b68350549522", "type": "github" }, "original": { @@ -144,6 +274,32 @@ "repo": "nixpkgs", "type": "github" } + }, + "tangled": { + "inputs": { + "gitignore": "gitignore", + "htmx-src": "htmx-src", + "htmx-ws-src": "htmx-ws-src", + "ibm-plex-mono-src": "ibm-plex-mono-src", + "indigo": "indigo", + "inter-fonts-src": "inter-fonts-src", + "lucide-src": "lucide-src", + "nixpkgs": "nixpkgs_3", + "sqlite-lib-src": "sqlite-lib-src" + }, + "locked": { + "lastModified": 1751894783, + "narHash": "sha256-kVsDo+VW3eOJFwRGUept/ik+o9qN8MJY0m+ijDaL/BY=", + "ref": "refs/heads/master", + "rev": "2d6f048f4a81ab5a542d18029a54d342a2c5b47e", + "revCount": 881, + "type": "git", + "url": "https://tangled.sh/@tangled.sh/core" + }, + "original": { + "type": "git", + "url": "https://tangled.sh/@tangled.sh/core" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ba7787d..0a46778 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ description = "nix infra for tangled"; inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + tangled.url = "git+https://tangled.sh/@tangled.sh/core"; colmena.url = "github:zhaofengli/colmena/release-0.4.x"; disko = { url = "github:nix-community/disko"; @@ -16,12 +17,13 @@ }; outputs = - { nixpkgs, disko, colmena, nixery-flake, ... }: + { nixpkgs, disko, colmena, nixery-flake, tangled, ... }: { nixosConfigurations.nixery = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ disko.nixosModules.disko + tangled.nixosModules.spindle ./hosts/nixery/configuration.nix ]; }; @@ -52,6 +54,7 @@ imports = [ disko.nixosModules.disko + tangled.nixosModules.spindle ./hosts/nixery/configuration.nix ./hosts/nixery/services/nginx.nix ./hosts/nixery/services/nixery.nix diff --git a/hosts/nixery/configuration.nix b/hosts/nixery/configuration.nix index 58a1ee6..50e6529 100644 --- a/hosts/nixery/configuration.nix +++ b/hosts/nixery/configuration.nix @@ -19,6 +19,14 @@ networking.hostName = "nixery"; services = { openssh.enable = true; + tangled-spindle = { + enable = true; + server = { + owner = "did:plc:hwevmowznbiukdf6uk5dwrrq"; + hostname = "spindle.tangled.sh"; + listenAddr = "0.0.0.0:6555"; + }; + }; }; virtualisation.docker = { -- 2.51.2