diff --git a/flake.lock b/flake.lock index 67f2edd..e2c0ff1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "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": "darwin", @@ -81,49 +65,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "tangled", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1780397302, - "narHash": "sha256-SQmrkj17xBdvc8lVMbsY7pIJCjKftgNh42R1keP3dLQ=", - "owner": "nix-community", - "repo": "fenix", - "rev": "f6670530f53e69cc284f7aef818eb0f08fe81905", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fetch-tangled": { - "inputs": { - "nixpkgs": [ - "tangled", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1779479671, - "narHash": "sha256-8PR9nZnK0Fn4gDOikz+3sLdsEJYnKC3gaunBs4N+V9Q=", - "ref": "refs/heads/main", - "rev": "2e3744d31b990248f277d16a11ef81753b366f0f", - "revCount": 22, - "type": "git", - "url": "https://tangled.org/isabelroses.com/fetch-tangled" - }, - "original": { - "type": "git", - "url": "https://tangled.org/isabelroses.com/fetch-tangled" - } - }, "fish-prompt-pvsr": { "flake": false, "locked": { @@ -140,20 +81,6 @@ "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-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -208,24 +135,6 @@ "type": "github" } }, - "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" - } - }, "fzf-fish": { "flake": false, "locked": { @@ -242,28 +151,6 @@ "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" - } - }, "hjem": { "inputs": { "nixpkgs": [ @@ -284,55 +171,6 @@ "type": "github" } }, - "hls-src": { - "flake": false, - "locked": { - "narHash": "sha256-mmxgaQRXXWzRG6/OlOn5efV+NmzhvmXTQaFbODqh0b8=", - "type": "file", - "url": "https://cdn.jsdelivr.net/npm/hls.js@1.5.13/dist/hls.min.js" - }, - "original": { - "type": "file", - "url": "https://cdn.jsdelivr.net/npm/hls.js@1.5.13/dist/hls.min.js" - } - }, - "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": 1731402378, - "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" - } - }, "impermanence": { "inputs": { "home-manager": [], @@ -369,72 +207,6 @@ "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" - } - }, - "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": 1754044466, - "narHash": "sha256-+exBR2OToB1iv7ZQI2S4B0lXA/QRvC9n6U99UxGpJGs=", - "type": "tarball", - "url": "https://github.com/lucide-icons/lucide/releases/download/0.536.0/lucide-icons-0.536.0.zip" - }, - "original": { - "type": "tarball", - "url": "https://github.com/lucide-icons/lucide/releases/download/0.536.0/lucide-icons-0.536.0.zip" - } - }, - "mathjax-src": { - "flake": false, - "locked": { - "narHash": "sha256-eqg25bKfiDzynRMR2RfeWNfo0EefHF/eRRFafl9RnNI=", - "type": "file", - "url": "https://cdn.jsdelivr.net/npm/mathjax@4.1.2/tex-svg.js" - }, - "original": { - "type": "file", - "url": "https://cdn.jsdelivr.net/npm/mathjax@4.1.2/tex-svg.js" - } - }, - "mermaid-src": { - "flake": false, - "locked": { - "narHash": "sha256-/YOdECG2V5c3kJ1QfGvhziTT6K/Dx/4mOk2mr3Fs/do=", - "type": "file", - "url": "https://cdn.jsdelivr.net/npm/mermaid@11.12.3/dist/mermaid.min.js" - }, - "original": { - "type": "file", - "url": "https://cdn.jsdelivr.net/npm/mermaid@11.12.3/dist/mermaid.min.js" - } - }, "microvm": { "inputs": { "nixpkgs": [ @@ -800,27 +572,9 @@ "qbpm": "qbpm", "srcery-textmate": "srcery-textmate", "srvos": "srvos", - "tangled": "tangled", "weather": "weather" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1780337665, - "narHash": "sha256-RS3F+/6dtBIwd5+47GVen3jAk62/KumFZ4q3RVYafDk=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "55af1774e9e840d3b28d12fcfaa72d2e2caa8ac9", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "scss-reset": { "flake": false, "locked": { @@ -852,19 +606,6 @@ "url": "https://spectrum-os.org/git/spectrum" } }, - "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" - } - }, "srcery-textmate": { "flake": false, "locked": { @@ -916,56 +657,6 @@ "type": "github" } }, - "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": "actor-typeahead-src", - "fenix": "fenix", - "fetch-tangled": "fetch-tangled", - "flake-compat": "flake-compat", - "gomod2nix": "gomod2nix", - "hls-src": "hls-src", - "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", - "mathjax-src": "mathjax-src", - "mermaid-src": "mermaid-src", - "microvm": [ - "microvm" - ], - "nixpkgs": [ - "nixpkgs" - ], - "sqlite-lib-src": "sqlite-lib-src" - }, - "locked": { - "lastModified": 1783611944, - "narHash": "sha256-tVG8IV8wp/vrGJGvxgSOWKF+M8TwOemeU7G2Xp5CQpI=", - "type": "tarball", - "url": "https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is/archive/ae6436b9d026953f8d08167628a29b4f921669ef.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://tangled.org/tangled.org/core/archive/master.tar.gz" - } - }, "weather": { "inputs": { "flake-parts": "flake-parts_3", diff --git a/flake.nix b/flake.nix index 517a9fd..82788a8 100644 --- a/flake.nix +++ b/flake.nix @@ -30,10 +30,6 @@ niri.inputs.nixpkgs.follows = "nixpkgs"; niri.inputs.nixpkgs-stable.follows = "nixpkgs"; - tangled.url = "https://tangled.org/tangled.org/core/archive/master.tar.gz"; - tangled.inputs.nixpkgs.follows = "nixpkgs"; - tangled.inputs.microvm.follows = "microvm"; - qbpm.url = "github:pvsr/qbpm"; qbpm.inputs.nixpkgs.follows = "nixpkgs"; podcasts.url = "github:pvsr/podcasts"; diff --git a/modules/services/tangled.nix b/modules/services/tangled.nix deleted file mode 100644 index 9eb1888..0000000 --- a/modules/services/tangled.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ inputs, ... }: -let - hosts = inputs.self.nixosConfigurations; - internal = hosts.grancel.config.microvm.vms.tangled-knot.config.config.networking.fqdn; - external = "knot.pvsr.dev"; -in -{ - local.servers.crossbell = - { pkgs, ... }: - { - local.caddy.reverseProxies.${external} = "${internal}:5555"; - services.openssh.openFirewall = true; - systemd.services.knot-ssh = { - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${pkgs.socat}/bin/socat TCP-LISTEN:22,fork,reuseaddr TCP6:${internal}:22"; - Restart = "always"; - }; - }; - }; - - local.desktops.grancel.vms.tangled-knot = - { pkgs, ... }: - { - imports = [ inputs.tangled.nixosModules.knot ]; - environment.systemPackages = [ - inputs.tangled.packages.${pkgs.stdenv.hostPlatform.system}.knot - ]; - - microvm.shares = [ - { - source = "/var/lib/microvms/tangled/git"; - mountPoint = "/home/git"; - tag = "tangled-git-user"; - proto = "virtiofs"; - } - ]; - - services.openssh.openFirewall = true; - networking.firewall.allowedTCPPorts = [ 5555 ]; - - services.tangled.knot = { - enable = true; - server = { - owner = "did:plc:l7ruokyumokt2tduqqvu33j6"; - hostname = external; - }; - }; - }; -}