From 1331844c9d7278044eab1d50c9fffa8bac80e299 Mon Sep 17 00:00:00 2001 From: pleasesendmeloadsofvegetables Date: Sat, 9 May 2026 00:53:50 -0700 Subject: [PATCH] feat(etrokwal): add spindle --- flake.lock | 130 +++++++++++++++++++++++++--- flake.nix | 20 ++++- hosts/etrokwal/default.nix | 2 +- hosts/etrokwal/services/default.nix | 3 +- hosts/etrokwal/services/tangled.nix | 9 ++ 5 files changed, 149 insertions(+), 15 deletions(-) create mode 100644 hosts/etrokwal/services/tangled.nix diff --git a/flake.lock b/flake.lock index b45fa09..a8de0c3 100644 --- a/flake.lock +++ b/flake.lock @@ -82,6 +82,60 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1751685974, + "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", + "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/flake-compat/archive/549f2762aebeff29a2e5ece7a7dc0f955281a1d1.tar.gz?rev=549f2762aebeff29a2e5ece7a7dc0f955281a1d1" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gomod2nix": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "tangled", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1763982521, + "narHash": "sha256-ur4QIAHwgFc0vXiaxn5No/FuZicxBr2p0gmT54xZkUQ=", + "owner": "nix-community", + "repo": "gomod2nix", + "rev": "02e63a239d6eabd595db56852535992c898eba72", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "gomod2nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -135,6 +189,22 @@ "type": "github" } }, + "indigo": { + "flake": false, + "locked": { + "lastModified": 1753693716, + "narHash": "sha256-DMIKnCJRODQXEHUxA+7mLzRALmnZhkkbHlFT2rCQYrE=", + "owner": "oppiliappan", + "repo": "indigo", + "rev": "5f170569da9360f57add450a278d73538092d8ca", + "type": "github" + }, + "original": { + "owner": "oppiliappan", + "repo": "indigo", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -199,7 +269,20 @@ "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", "nixpkgs": "nixpkgs", - "tranquil": "tranquil" + "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" } }, "systems": { @@ -217,24 +300,51 @@ "type": "github" } }, - "tranquil": { + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tangled": { "inputs": { + "actor-typeahead-src": [], + "fenix": [], + "flake-compat": "flake-compat", + "gomod2nix": "gomod2nix", + "htmx-src": [], + "htmx-ws-src": [], + "ibm-plex-mono-src": [], + "indigo": "indigo", + "inter-fonts-src": [], + "lucide-src": [], + "mermaid-src": [], "nixpkgs": [ "nixpkgs" - ] + ], + "sqlite-lib-src": "sqlite-lib-src" }, "locked": { - "lastModified": 1777753977, - "narHash": "sha256-St0O1h5JIU+Rg0l7HzKHmk+MgoEDZ/TPIU8nAzpggOk=", - "ref": "refs/heads/main", - "rev": "f176f55862bc4c41472f8697cc2ca069c24d5e37", - "revCount": 339, + "lastModified": 1778252983, + "narHash": "sha256-2XIiL7sNXmjr17YbI/xUW8p7p1rWa2+atoUSLA3aqV0=", + "ref": "refs/heads/master", + "rev": "519c8db397a81e36fc0df42443ffeb5a40db213e", + "revCount": 2373, "type": "git", - "url": "https://tangled.org/tranquil.farm/tranquil-pds" + "url": "https://tangled.org/tangled.org/core" }, "original": { "type": "git", - "url": "https://tangled.org/tranquil.farm/tranquil-pds" + "url": "https://tangled.org/tangled.org/core" } } }, diff --git a/flake.nix b/flake.nix index 7330f81..76c65b1 100644 --- a/flake.nix +++ b/flake.nix @@ -24,8 +24,21 @@ agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; - tranquil.url = "git+https://tangled.org/tranquil.farm/tranquil-pds"; - tranquil.inputs.nixpkgs.follows = "nixpkgs"; + # tranquil.url = "git+https://tangled.org/tranquil.farm/tranquil-pds"; + # tranquil.inputs.nixpkgs.follows = "nixpkgs"; + + tangled = { + url = "git+https://tangled.org/tangled.org/core"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.actor-typeahead-src.follows = ""; + inputs.fenix.follows = ""; + inputs.htmx-src.follows = ""; + inputs.htmx-ws-src.follows = ""; + inputs.ibm-plex-mono-src.follows = ""; + inputs.inter-fonts-src.follows = ""; + inputs.lucide-src.follows = ""; + inputs.mermaid-src.follows = ""; + }; }; outputs = inputs: { @@ -41,7 +54,8 @@ modules = [ inputs.disko.nixosModules.disko inputs.agenix.nixosModules.default - inputs.tranquil.nixosModules.default + # inputs.tranquil.nixosModules.default + inputs.tangled.nixosModules.spindle ./hosts/etrokwal ]; specialArgs = {inherit inputs;}; diff --git a/hosts/etrokwal/default.nix b/hosts/etrokwal/default.nix index f08fdcc..1d99d5c 100644 --- a/hosts/etrokwal/default.nix +++ b/hosts/etrokwal/default.nix @@ -20,7 +20,7 @@ age.secrets = { pangolin.file = ../../secrets/pangolin.age; - tranquil.file = ../../secrets/tranquil.age; + # tranquil.file = ../../secrets/tranquil.age; }; documentation.enable = false; diff --git a/hosts/etrokwal/services/default.nix b/hosts/etrokwal/services/default.nix index 790adcc..5fe5bbf 100644 --- a/hosts/etrokwal/services/default.nix +++ b/hosts/etrokwal/services/default.nix @@ -3,6 +3,7 @@ ./ssh.nix ./pangolin.nix - ./tranquil.nix + ./tangled.nix + # ./tranquil.nix ]; } diff --git a/hosts/etrokwal/services/tangled.nix b/hosts/etrokwal/services/tangled.nix new file mode 100644 index 0000000..21bafe5 --- /dev/null +++ b/hosts/etrokwal/services/tangled.nix @@ -0,0 +1,9 @@ +{ + services.tangled.spindle = { + enable = true; + server = { + hostname = "spindle.pleasesendmeloadsofvegetables.moe"; + owner = "did:plc:uoihkvfmwkdbh2suubpesgo3"; + }; + }; +} -- 2.51.2