From f4fd27aa0d657c547b1447afc943a22af7797c90 Mon Sep 17 00:00:00 2001 From: dawn <90008@klbr.net> Date: Thu, 18 Jun 2026 22:19:58 +0300 Subject: [PATCH] awa --- _sources/generated.json | 82 ++-- _sources/generated.nix | 82 ++-- dns/dnsconfig.js | 4 +- flake.lock | 366 ++++++++++++++++-- flake.nix | 4 + hosts/chernobog/default.nix | 2 + hosts/chernobog/modules/kernel.nix | 2 +- hosts/chernobog/modules/spindle.nix | 69 ++++ .../dzwonek/modules/headscale.nix/default.nix | 3 +- .../modules/bobbin.nix | 11 +- hosts/volsinii/modules/nginx.nix | 10 +- .../{trimounts => volsinii}/modules/relay.nix | 7 +- .../modules/slingshot.nix | 0 hosts/volsinii/modules/spindle.nix | 24 ++ nvfetcher.toml | 4 +- pkgs-set/pkgs/bobbin.nix | 37 +- pkgs-set/pkgs/helium.nix | 4 +- pkgs-set/pkgs/llama-cpp-rocm.nix | 4 +- pkgs-set/pkgs/llama-cpp.nix | 10 +- users/mayer/default.nix | 14 +- users/modules/discord/default.nix | 19 +- users/modules/discord/service.nix | 2 +- users/modules/ssh/default.nix | 19 + 23 files changed, 592 insertions(+), 187 deletions(-) create mode 100644 hosts/chernobog/modules/spindle.nix rename hosts/{trimounts => volsinii}/modules/bobbin.nix (81%) rename hosts/{trimounts => volsinii}/modules/relay.nix (89%) rename hosts/{trimounts => volsinii}/modules/slingshot.nix (100%) create mode 100644 hosts/volsinii/modules/spindle.nix diff --git a/_sources/generated.json b/_sources/generated.json index b57c74d..7eba047 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -42,7 +42,7 @@ }, "blog": { "cargoLock": null, - "date": "2026-05-25", + "date": "2026-06-16", "extract": null, "name": "blog", "passthru": null, @@ -52,13 +52,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "6dc394fe9d71f8849e97ffae6c61edc2956420b6", - "sha256": "sha256-feVwvbOv72QUzViI/XQqm+1QOUrMJoBGjPYAVz5P5yI=", + "rev": "3678ca2aae1020939601d5840f4f4ae588d4a649", + "sha256": "sha256-Uhv70rnsHftsSzCPcQQs3kZHnQ0uPlOeqVGeIkGXxZ4=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@ptr.pet/endpoint" }, - "version": "6dc394fe9d71f8849e97ffae6c61edc2956420b6" + "version": "3678ca2aae1020939601d5840f4f4ae588d4a649" }, "clickee": { "cargoLock": null, @@ -122,7 +122,7 @@ }, "disko": { "cargoLock": null, - "date": "2026-05-19", + "date": "2026-06-11", "extract": null, "name": "disko", "passthru": null, @@ -134,16 +134,16 @@ "name": null, "owner": "nix-community", "repo": "disko", - "rev": "65fb947964bd44fc0008faf77d1fcb7a9f40bb32", - "sha256": "sha256-wuOkjI6pRiN4sEn/EPBRnNW5cmcpvd7xtIM8y5LooAs=", + "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1", + "sha256": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=", "sparseCheckout": [], "type": "github" }, - "version": "65fb947964bd44fc0008faf77d1fcb7a9f40bb32" + "version": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1" }, "drop": { "cargoLock": null, - "date": "2026-05-20", + "date": "2026-06-06", "extract": null, "name": "drop", "passthru": null, @@ -153,13 +153,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "2b5466012d716bdd4ba399644e223559a5452eee", - "sha256": "sha256-SYXY3ZvwnyQSNwP10YmuSn5/ucakSmoBLXpfK+jtcrQ=", + "rev": "5a70d7e2fab7c1352b9ae9410da17c25bd859dd7", + "sha256": "sha256-/RYOc3Y2vQI5LhfD9m5m1bwjanl6HorpjUaxdfmbYuA=", "sparseCheckout": [], "type": "git", - "url": "https://tangled.org/juliet.paris/drop" + "url": "https://github.com/notjuliet/drop" }, - "version": "2b5466012d716bdd4ba399644e223559a5452eee" + "version": "5a70d7e2fab7c1352b9ae9410da17c25bd859dd7" }, "dysnomia": { "cargoLock": null, @@ -225,7 +225,7 @@ }, "home": { "cargoLock": null, - "date": "2026-05-22", + "date": "2026-06-13", "extract": null, "name": "home", "passthru": null, @@ -237,16 +237,16 @@ "name": null, "owner": "nix-community", "repo": "home-manager", - "rev": "509ed3c603349a9d43de9e2ae6613baea6bd5b34", - "sha256": "sha256-7wOwi8B6D0BYsieZCnHZZj2sNUzgJhLoIVSfkwB7lxQ=", + "rev": "5b6f5733726a1b2ccafb5dec6ac4ca7299fad66c", + "sha256": "sha256-zqDBhXMzfbdlO7F2bGHe7MOtB3xngd/+4ieMHDC+ZXo=", "sparseCheckout": [], "type": "github" }, - "version": "509ed3c603349a9d43de9e2ae6613baea6bd5b34" + "version": "5b6f5733726a1b2ccafb5dec6ac4ca7299fad66c" }, "hydrant": { "cargoLock": null, - "date": "2026-06-07", + "date": "2026-06-18", "extract": null, "name": "hydrant", "passthru": null, @@ -256,13 +256,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "fce50c7782152ac36dd12a4121f92c5eae819f0c", - "sha256": "sha256-TSoHRcAB4Lca7ieRxqtWEHoSptSW19kPb36mRLzZxsk=", + "rev": "7c0b1c54007c8c9ac108d7132c19463e5bc0f731", + "sha256": "sha256-g3vGi9+IdBF2oOF46uTqLXx+2PB7RMwmoaW70UMbnnc=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@ptr.pet/hydrant" }, - "version": "fce50c7782152ac36dd12a4121f92c5eae819f0c" + "version": "7c0b1c54007c8c9ac108d7132c19463e5bc0f731" }, "limbusart": { "cargoLock": null, @@ -327,7 +327,7 @@ }, "nixos-hardware": { "cargoLock": null, - "date": "2026-05-20", + "date": "2026-06-11", "extract": null, "name": "nixos-hardware", "passthru": null, @@ -339,16 +339,16 @@ "name": null, "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77", - "sha256": "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU=", + "rev": "6358ff76821101c178e3ab4919a62799bfe3652e", + "sha256": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=", "sparseCheckout": [], "type": "github" }, - "version": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77" + "version": "6358ff76821101c178e3ab4919a62799bfe3652e" }, "nixpkgs-xr": { "cargoLock": null, - "date": "2026-05-23", + "date": "2026-06-13", "extract": null, "name": "nixpkgs-xr", "passthru": null, @@ -360,12 +360,12 @@ "name": null, "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "8e2ce138c168499500f209a39c618cc4aef45e53", - "sha256": "sha256-yePAKD3X68ExEk+rZDOEXCH1y0bUSTbtOzPaiZfhT+4=", + "rev": "8f260d85e88328a766f2473945bf0fb33caba3a8", + "sha256": "sha256-EYKmqHvB+0jSQszhth326c4hh3XAOGy0BeyGR1/Fttg=", "sparseCheckout": [], "type": "github" }, - "version": "8e2ce138c168499500f209a39c618cc4aef45e53" + "version": "8f260d85e88328a766f2473945bf0fb33caba3a8" }, "nsid-tracker": { "cargoLock": null, @@ -449,7 +449,7 @@ }, "stylix": { "cargoLock": null, - "date": "2026-05-21", + "date": "2026-06-09", "extract": null, "name": "stylix", "passthru": null, @@ -461,16 +461,16 @@ "name": null, "owner": "nix-community", "repo": "stylix", - "rev": "c1456cc4ba3c9485e7b4158c909eeca5a752cd59", - "sha256": "sha256-IsDb9erotvx9npI94UDosvMeYQK17p7/vmU2v9batrY=", + "rev": "a378e4c09031fb15a4d65da88aa628f71fc52f6b", + "sha256": "sha256-C+cGIUaC6dqfwTbI+BwCd572PbESGA3WYxR1sLTqxkY=", "sparseCheckout": [], "type": "github" }, - "version": "c1456cc4ba3c9485e7b4158c909eeca5a752cd59" + "version": "a378e4c09031fb15a4d65da88aa628f71fc52f6b" }, "tangled": { "cargoLock": null, - "date": "2026-05-31", + "date": "2026-06-18", "extract": null, "name": "tangled", "passthru": null, @@ -480,13 +480,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "f73a82beea33daa6e8a94e32f85a02e8a98f195e", - "sha256": "sha256-DQ4d7fyOMLmkn2jqOovUMajKLKJI16gEXiVYBvRnyak=", + "rev": "831803198d7c6a2557fba215ed011e9db4fabf98", + "sha256": "sha256-eTalLQIOzv5xuqbPy+ZB/qVWWoQUuEXe+Uck/3Bp798=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is" }, - "version": "f73a82beea33daa6e8a94e32f85a02e8a98f195e" + "version": "831803198d7c6a2557fba215ed011e9db4fabf98" }, "tangled-sqlite-lib": { "cargoLock": null, @@ -524,7 +524,7 @@ }, "zen-browser": { "cargoLock": null, - "date": "2026-05-22", + "date": "2026-06-13", "extract": null, "name": "zen-browser", "passthru": null, @@ -536,11 +536,11 @@ "name": null, "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5bcdfcef664bf62831dcb4b947004d9c5fbf7201", - "sha256": "sha256-svU6Ro4xiMxMA1KJGwQ/nfKwz3yXE/SONCw2Z1qTXHA=", + "rev": "b7562bb6de361d2982a2a6104ee27e4f3169efa5", + "sha256": "sha256-FHqsgWr7O3XcRNtBO/bjo/nI06EP9JjUb5AEz0Dh3HI=", "sparseCheckout": [], "type": "github" }, - "version": "5bcdfcef664bf62831dcb4b947004d9c5fbf7201" + "version": "b7562bb6de361d2982a2a6104ee27e4f3169efa5" } } \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index 2792292..fca6dfb 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -34,17 +34,17 @@ }; blog = { pname = "blog"; - version = "6dc394fe9d71f8849e97ffae6c61edc2956420b6"; + version = "3678ca2aae1020939601d5840f4f4ae588d4a649"; src = fetchgit { url = "https://tangled.org/@ptr.pet/endpoint"; - rev = "6dc394fe9d71f8849e97ffae6c61edc2956420b6"; + rev = "3678ca2aae1020939601d5840f4f4ae588d4a649"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-feVwvbOv72QUzViI/XQqm+1QOUrMJoBGjPYAVz5P5yI="; + sha256 = "sha256-Uhv70rnsHftsSzCPcQQs3kZHnQ0uPlOeqVGeIkGXxZ4="; }; - date = "2026-05-25"; + date = "2026-06-16"; }; clickee = { pname = "clickee"; @@ -90,29 +90,29 @@ }; disko = { pname = "disko"; - version = "65fb947964bd44fc0008faf77d1fcb7a9f40bb32"; + version = "ff8702b4de27f72b4c78573dfb89ec74e36abdf1"; src = fetchFromGitHub { owner = "nix-community"; repo = "disko"; - rev = "65fb947964bd44fc0008faf77d1fcb7a9f40bb32"; + rev = "ff8702b4de27f72b4c78573dfb89ec74e36abdf1"; fetchSubmodules = false; - sha256 = "sha256-wuOkjI6pRiN4sEn/EPBRnNW5cmcpvd7xtIM8y5LooAs="; + sha256 = "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o="; }; - date = "2026-05-19"; + date = "2026-06-11"; }; drop = { pname = "drop"; - version = "2b5466012d716bdd4ba399644e223559a5452eee"; + version = "5a70d7e2fab7c1352b9ae9410da17c25bd859dd7"; src = fetchgit { - url = "https://tangled.org/juliet.paris/drop"; - rev = "2b5466012d716bdd4ba399644e223559a5452eee"; + url = "https://github.com/notjuliet/drop"; + rev = "5a70d7e2fab7c1352b9ae9410da17c25bd859dd7"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-SYXY3ZvwnyQSNwP10YmuSn5/ucakSmoBLXpfK+jtcrQ="; + sha256 = "sha256-/RYOc3Y2vQI5LhfD9m5m1bwjanl6HorpjUaxdfmbYuA="; }; - date = "2026-05-20"; + date = "2026-06-06"; }; dysnomia = { pname = "dysnomia"; @@ -154,29 +154,29 @@ }; home = { pname = "home"; - version = "509ed3c603349a9d43de9e2ae6613baea6bd5b34"; + version = "5b6f5733726a1b2ccafb5dec6ac4ca7299fad66c"; src = fetchFromGitHub { owner = "nix-community"; repo = "home-manager"; - rev = "509ed3c603349a9d43de9e2ae6613baea6bd5b34"; + rev = "5b6f5733726a1b2ccafb5dec6ac4ca7299fad66c"; fetchSubmodules = false; - sha256 = "sha256-7wOwi8B6D0BYsieZCnHZZj2sNUzgJhLoIVSfkwB7lxQ="; + sha256 = "sha256-zqDBhXMzfbdlO7F2bGHe7MOtB3xngd/+4ieMHDC+ZXo="; }; - date = "2026-05-22"; + date = "2026-06-13"; }; hydrant = { pname = "hydrant"; - version = "fce50c7782152ac36dd12a4121f92c5eae819f0c"; + version = "7c0b1c54007c8c9ac108d7132c19463e5bc0f731"; src = fetchgit { url = "https://tangled.org/@ptr.pet/hydrant"; - rev = "fce50c7782152ac36dd12a4121f92c5eae819f0c"; + rev = "7c0b1c54007c8c9ac108d7132c19463e5bc0f731"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-TSoHRcAB4Lca7ieRxqtWEHoSptSW19kPb36mRLzZxsk="; + sha256 = "sha256-g3vGi9+IdBF2oOF46uTqLXx+2PB7RMwmoaW70UMbnnc="; }; - date = "2026-06-07"; + date = "2026-06-18"; }; limbusart = { pname = "limbusart"; @@ -220,27 +220,27 @@ }; nixos-hardware = { pname = "nixos-hardware"; - version = "c97bc4d15bd3473dd095e8e8ba57330ab1943a77"; + version = "6358ff76821101c178e3ab4919a62799bfe3652e"; src = fetchFromGitHub { owner = "NixOS"; repo = "nixos-hardware"; - rev = "c97bc4d15bd3473dd095e8e8ba57330ab1943a77"; + rev = "6358ff76821101c178e3ab4919a62799bfe3652e"; fetchSubmodules = false; - sha256 = "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU="; + sha256 = "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE="; }; - date = "2026-05-20"; + date = "2026-06-11"; }; nixpkgs-xr = { pname = "nixpkgs-xr"; - version = "8e2ce138c168499500f209a39c618cc4aef45e53"; + version = "8f260d85e88328a766f2473945bf0fb33caba3a8"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixpkgs-xr"; - rev = "8e2ce138c168499500f209a39c618cc4aef45e53"; + rev = "8f260d85e88328a766f2473945bf0fb33caba3a8"; fetchSubmodules = false; - sha256 = "sha256-yePAKD3X68ExEk+rZDOEXCH1y0bUSTbtOzPaiZfhT+4="; + sha256 = "sha256-EYKmqHvB+0jSQszhth326c4hh3XAOGy0BeyGR1/Fttg="; }; - date = "2026-05-23"; + date = "2026-06-13"; }; nsid-tracker = { pname = "nsid-tracker"; @@ -300,29 +300,29 @@ }; stylix = { pname = "stylix"; - version = "c1456cc4ba3c9485e7b4158c909eeca5a752cd59"; + version = "a378e4c09031fb15a4d65da88aa628f71fc52f6b"; src = fetchFromGitHub { owner = "nix-community"; repo = "stylix"; - rev = "c1456cc4ba3c9485e7b4158c909eeca5a752cd59"; + rev = "a378e4c09031fb15a4d65da88aa628f71fc52f6b"; fetchSubmodules = false; - sha256 = "sha256-IsDb9erotvx9npI94UDosvMeYQK17p7/vmU2v9batrY="; + sha256 = "sha256-C+cGIUaC6dqfwTbI+BwCd572PbESGA3WYxR1sLTqxkY="; }; - date = "2026-05-21"; + date = "2026-06-09"; }; tangled = { pname = "tangled"; - version = "f73a82beea33daa6e8a94e32f85a02e8a98f195e"; + version = "831803198d7c6a2557fba215ed011e9db4fabf98"; src = fetchgit { url = "https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is"; - rev = "f73a82beea33daa6e8a94e32f85a02e8a98f195e"; + rev = "831803198d7c6a2557fba215ed011e9db4fabf98"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-DQ4d7fyOMLmkn2jqOovUMajKLKJI16gEXiVYBvRnyak="; + sha256 = "sha256-eTalLQIOzv5xuqbPy+ZB/qVWWoQUuEXe+Uck/3Bp798="; }; - date = "2026-05-31"; + date = "2026-06-18"; }; tangled-sqlite-lib = { pname = "tangled-sqlite-lib"; @@ -348,14 +348,14 @@ }; zen-browser = { pname = "zen-browser"; - version = "5bcdfcef664bf62831dcb4b947004d9c5fbf7201"; + version = "b7562bb6de361d2982a2a6104ee27e4f3169efa5"; src = fetchFromGitHub { owner = "0xc000022070"; repo = "zen-browser-flake"; - rev = "5bcdfcef664bf62831dcb4b947004d9c5fbf7201"; + rev = "b7562bb6de361d2982a2a6104ee27e4f3169efa5"; fetchSubmodules = false; - sha256 = "sha256-svU6Ro4xiMxMA1KJGwQ/nfKwz3yXE/SONCw2Z1qTXHA="; + sha256 = "sha256-FHqsgWr7O3XcRNtBO/bjo/nI06EP9JjUb5AEz0Dh3HI="; }; - date = "2026-05-22"; + date = "2026-06-13"; }; } diff --git a/dns/dnsconfig.js b/dns/dnsconfig.js index 28c166d..55d80d3 100644 --- a/dns/dnsconfig.js +++ b/dns/dnsconfig.js @@ -65,7 +65,6 @@ D( ], CF_PROXY_OFF, ), - VOLSINII(["plc"], CF_PROXY_OFF), // github pages CNAME("dev", "90-008.github.io."), // fastmail @@ -95,7 +94,8 @@ D( "klbr.net", REG_NONE, DnsProvider(DSP_PRIMARY), - TRIMOUNTS(["api.compare.plc", "api.spool", "bsky", "drop", "bobbin", "plc", "relay", "sl"]), + VOLSINII(["ci", "relay", "sl", "bobbin"]), + TRIMOUNTS(["api.compare.plc", "api.spool", "bsky", "drop", "plc"]), DZWONEK("vpn"), // VOLSINII(["bobbin", "plc", "relay", "sl"]), TXT("@", "data endpoint for services and projects that fall under klbr.net."), diff --git a/flake.lock b/flake.lock index bac42dc..9aa80e0 100644 --- a/flake.lock +++ b/flake.lock @@ -1,19 +1,36 @@ { "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" + } + }, "chaotic": { "inputs": { "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", + "niks3": "niks3", "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765204341, - "narHash": "sha256-7xd45skcuLCu2DHxVvU+W/z+7CUOjyv+QPtT4PLZaIU=", + "lastModified": 1781792206, + "narHash": "sha256-e3LCHcL0igOukPTJvP9j2zx59NYVoAuEle2a+azCx7E=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "aacb796ccd42be1555196c20013b9b674b71df75", + "rev": "fc1619c9b1f04d88393f332e6fadb218ff16f22b", "type": "github" }, "original": { @@ -23,6 +40,42 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "microvm-spindle", + "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" + } + }, + "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-schemas": { "locked": { "lastModified": 1721999734, @@ -37,6 +90,46 @@ "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "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": [ + "microvm-spindle", + "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": [ @@ -45,11 +138,11 @@ ] }, "locked": { - "lastModified": 1764998300, - "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", + "lastModified": 1781751568, + "narHash": "sha256-hZAbXoNA4nCSaIJJLGl/EdErFtlnAS06jEp4oO7Qp6s=", "owner": "nix-community", "repo": "home-manager", - "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", + "rev": "5bcff43156c0eebe68759338b7879c8e1b2e2bd0", "type": "github" }, "original": { @@ -58,20 +151,88 @@ "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": 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" + } + }, + "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" + } + }, "jovian": { "inputs": { - "nix-github-actions": "nix-github-actions", + "nix-github-actions": [ + "chaotic" + ], "nixpkgs": [ "chaotic", "nixpkgs" ] }, "locked": { - "lastModified": 1764922999, - "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", + "lastModified": 1781714346, + "narHash": "sha256-eSkLPid3Pb7ki5OivCp0UQIVSZHgs35lR93IBbS06oY=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", + "rev": "928678675f4093383a0503b0e6c2f9965fe37309", "type": "github" }, "original": { @@ -80,36 +241,119 @@ "type": "github" } }, - "nix-github-actions": { + "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" + } + }, + "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": [ + "microvm-spindle", + "nixpkgs" + ], + "spectrum": "spectrum" + }, + "locked": { + "lastModified": 1779970379, + "narHash": "sha256-ZHsxoYXXnfJtMVh1/yY+1Eh9hHcPBhE28Qvinauh+BQ=", + "owner": "microvm-nix", + "repo": "microvm.nix", + "rev": "0d49083ba2d7419b22908ac392777c16df9a032e", + "type": "github" + }, + "original": { + "owner": "microvm-nix", + "repo": "microvm.nix", + "type": "github" + } + }, + "microvm-spindle": { + "inputs": { + "actor-typeahead-src": "actor-typeahead-src", + "fenix": "fenix", + "flake-compat": "flake-compat", + "gomod2nix": "gomod2nix", + "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", + "mermaid-src": "mermaid-src", + "microvm": "microvm", + "nixpkgs": [ + "nixpkgs" + ], + "sqlite-lib-src": "sqlite-lib-src" + }, + "locked": { + "lastModified": 1781783538, + "narHash": "sha256-B1+K4pOfebE3vzNXnnXBmtUqLu0ufbR6zfS+qN/2oIQ=", + "ref": "dwn/spindle-microvm", + "rev": "a470f063369d7985d7671d6fdedbd99939a11951", + "revCount": 2710, + "type": "git", + "url": "https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is" + }, + "original": { + "ref": "dwn/spindle-microvm", + "type": "git", + "url": "https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is" + } + }, + "niks3": { "inputs": { "nixpkgs": [ "chaotic", - "jovian", "nixpkgs" + ], + "treefmt-nix": [ + "chaotic" ] }, "locked": { - "lastModified": 1729697500, - "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", + "lastModified": 1781027181, + "narHash": "sha256-IHIUd1/lYTaS4ilHZNV6+x0fchxDpvUdMjwnnEBASu4=", + "owner": "Mic92", + "repo": "niks3", + "rev": "c74d275536d9a38ff279b498612fae0fd68cfe85", "type": "github" }, "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", + "owner": "Mic92", + "repo": "niks3", + "rev": "c74d275536d9a38ff279b498612fae0fd68cfe85", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { @@ -121,11 +365,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1779357205, - "narHash": "sha256-STlbE8L45Uutxaffotwjqp+nX6g6jqc/mnx/7DxODyA=", - "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1", + "lastModified": 1781577229, + "narHash": "sha256-rcUHdUtJEvMdNEl2Wq+YpHraHKfcer3KsBscpZEF2Yg=", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre1002845.f83fc3c307e7/nixexprs.tar.xz?lastModified=1779357205&rev=f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1017464.567a49d1913c/nixexprs.tar.xz?lastModified=1781577229&rev=567a49d1913ce81ac6e9582e3553dd90a955875f" }, "original": { "type": "tarball", @@ -135,9 +379,27 @@ "root": { "inputs": { "chaotic": "chaotic", + "microvm-spindle": "microvm-spindle", "nixpkgs": "nixpkgs_2" } }, + "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" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -146,11 +408,11 @@ ] }, "locked": { - "lastModified": 1765075567, - "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", + "lastModified": 1781752752, + "narHash": "sha256-kVG5tV9hddPviGAgqf9sGSuStvv+HAB9onfKqGptV0k=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", + "rev": "c06d86dabe5b92982b9d67acccb9990d58da3a0e", "type": "github" }, "original": { @@ -158,6 +420,50 @@ "repo": "rust-overlay", "type": "github" } + }, + "spectrum": { + "flake": false, + "locked": { + "lastModified": 1778940603, + "narHash": "sha256-voSM8dZNlaOWN3kbYFky+FNY6fFQOEw0xF+ZMpZKkCQ=", + "ref": "refs/heads/main", + "rev": "367dd227f539267eae2b62770b4c17b88ac8c1f1", + "revCount": 1265, + "type": "git", + "url": "https://spectrum-os.org/git/spectrum" + }, + "original": { + "type": "git", + "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" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4758f5c..ec64b30 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,10 @@ inputs.nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"; inputs.chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + inputs.microvm-spindle = { + url = "git+https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is?ref=dwn/spindle-microvm"; + inputs.nixpkgs.follows = "nixpkgs"; + }; outputs = flakeInputs: diff --git a/hosts/chernobog/default.nix b/hosts/chernobog/default.nix index 871be28..3ea5557 100644 --- a/hosts/chernobog/default.nix +++ b/hosts/chernobog/default.nix @@ -78,6 +78,8 @@ hardware.enableRedistributableFirmware = true; virtualisation.podman.enable = true; + environment.systemPackages = [pkgs.docker-compose]; + virtualisation.spiceUSBRedirection.enable = true; programs.nix-ld = { enable = true; diff --git a/hosts/chernobog/modules/kernel.nix b/hosts/chernobog/modules/kernel.nix index a859048..669eee2 100644 --- a/hosts/chernobog/modules/kernel.nix +++ b/hosts/chernobog/modules/kernel.nix @@ -1,4 +1,4 @@ { pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages_cachyos-lto; + # boot.kernelPackages = pkgs.linuxPackages_cachyos-lto; } diff --git a/hosts/chernobog/modules/spindle.nix b/hosts/chernobog/modules/spindle.nix new file mode 100644 index 0000000..1aa771f --- /dev/null +++ b/hosts/chernobog/modules/spindle.nix @@ -0,0 +1,69 @@ +{ + lib, + config, + inputs, + pkgs, + ... +}: +let + spindleCfg = config.services.tangled.spindle; + system = pkgs.stdenv.hostPlatform.system; +in +{ + imports = [ + "${inputs.microvm-spindle}/nix/modules/spindle.nix" + ]; + + services.tangled.spindle = { + enable = true; + package = inputs.microvm-spindle.packages.${system}.spindle; + server = { + listenAddr = "0.0.0.0:7391"; + hostname = "ci.klbr.net"; + owner = "did:plc:dfl62fgb7wtjj3fcbb72naae"; + # secrets = { + # provider = "openbao"; + # openbao.proxyAddr = "http://spindle.bao.lan.gaze.systems"; + # }; + secrets.provider = "sqlite"; + }; + pipelines = { + workflowTimeout = "20m"; + microvm = { + enableKVM = true; + limits.total.memoryMiB = 6200; + }; + }; + cache = { + readUrls = ["https://cache.nixos.org"]; + trustedPublicKeys = ["cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="]; + }; + }; + systemd.tmpfiles.rules = [ +"L+ /var/lib/spindle/images/nixos-x86_64 - - - - ${inputs.microvm-spindle.packages.${system}.spindle-nixos-image}" +"L+ /var/lib/spindle/images/alpine-x86_64 - - - - ${inputs.microvm-spindle.packages.${system}.spindle-alpine-image}" + "L+ /var/lib/spindle/images/nixos - - - - /var/lib/spindle/images/nixos-x86_64" + "L+ /var/lib/spindle/images/alpine - - - - /var/lib/spindle/images/alpine-x86_64" + ]; + users.users.spindle = { + group = "spindle"; + isSystemUser = true; + }; + users.groups.spindle = { }; + users.groups.podman.members = [ "spindle" ]; + systemd.services.spindle = { + # after = lib.mkForce [ "network.target" "openbao-proxy-spindle.service" ]; + serviceConfig = { + User = "spindle"; + Group = "spindle"; + }; + }; + + virtualisation.docker.enable = lib.mkForce false; + virtualisation.podman = { + enable = true; + autoPrune.enable = true; + dockerCompat = true; + dockerSocket.enable = true; + }; +} diff --git a/hosts/dzwonek/modules/headscale.nix/default.nix b/hosts/dzwonek/modules/headscale.nix/default.nix index 464d073..03500aa 100644 --- a/hosts/dzwonek/modules/headscale.nix/default.nix +++ b/hosts/dzwonek/modules/headscale.nix/default.nix @@ -29,6 +29,7 @@ in hosts = { chernobog = "100.64.0.6"; trimounts = "100.64.0.1"; + volsinii = "100.64.0.3"; }; sshRules = [ { @@ -62,7 +63,7 @@ in dst = [ "tag:private-infra:*" ]; } { - src = [ "trimounts" ]; + src = [ "trimounts" "volsinii" ]; dst = [ "chernobog:*" ]; } { diff --git a/hosts/trimounts/modules/bobbin.nix b/hosts/volsinii/modules/bobbin.nix similarity index 81% rename from hosts/trimounts/modules/bobbin.nix rename to hosts/volsinii/modules/bobbin.nix index c8c6bd4..726c8da 100644 --- a/hosts/trimounts/modules/bobbin.nix +++ b/hosts/volsinii/modules/bobbin.nix @@ -42,15 +42,16 @@ in environment = { HYDRANT_API_BIND = "127.0.0.1:${toString hydrantPort}"; # HYDRANT_RELAY_HOSTS = "http://127.0.0.1:13579"; - HYDRANT_RELAY_HOSTS = "https://bsky.network"; # HYDRANT_PLC_URL = "http://127.0.0.1:8000"; + HYDRANT_RELAY_HOSTS = "https://relay1.us-east.bsky.network"; HYDRANT_PLC_URL = "https://plc.directory"; - HYDRANT_FILTER_SIGNALS = "sh.tangled.actor.profile,sh.tangled.feed.reaction,sh.tangled.feed.star,sh.tangled.git.refUpdate,sh.tangled.graph.follow,sh.tangled.graph.vouch,sh.tangled.knot,sh.tangled.knot.member,sh.tangled.label.definition,sh.tangled.label.op,sh.tangled.pipeline,sh.tangled.pipeline.status,sh.tangled.publicKey,sh.tangled.repo,sh.tangled.repo.artifact,sh.tangled.repo.collaborator,sh.tangled.repo.issue,sh.tangled.repo.issue.comment,sh.tangled.repo.issue.state,sh.tangled.repo.pull,sh.tangled.repo.pull.comment,sh.tangled.repo.pull.status,sh.tangled.spindle,sh.tangled.spindle.member,sh.tangled.string"; + HYDRANT_FILTER_SIGNALS = "sh.tangled.actor.profile,sh.tangled.feed.comment,sh.tangled.feed.reaction,sh.tangled.feed.star,sh.tangled.git.refUpdate,sh.tangled.graph.follow,sh.tangled.graph.vouch,sh.tangled.knot,sh.tangled.knot.member,sh.tangled.label.definition,sh.tangled.label.op,sh.tangled.pipeline,sh.tangled.pipeline.status,sh.tangled.publicKey,sh.tangled.repo,sh.tangled.repo.artifact,sh.tangled.repo.collaborator,sh.tangled.repo.issue,sh.tangled.repo.issue.comment,sh.tangled.repo.issue.state,sh.tangled.repo.pull,sh.tangled.repo.pull.comment,sh.tangled.repo.pull.status,sh.tangled.spindle,sh.tangled.spindle.member,sh.tangled.string"; HYDRANT_FILTER_COLLECTIONS = "sh.tangled.*"; HYDRANT_VERIFY_SIGNATURES = "none"; - HYDRANT_REPO_FETCH_TIMEOUT = "1h"; - HYDRANT_FIREHOSE_WORKERS = "8"; - HYDRANT_BACKFILL_CONCURRENCY_LIMIT = "32"; + HYDRANT_REPO_FETCH_TIMEOUT = "1m"; + HYDRANT_FIREHOSE_WORKERS = "16"; + HYDRANT_BACKFILL_CONCURRENCY_LIMIT = "64"; + HYDRANT_BACKFILL_STRATEGY = "sparse-filter"; }; serviceConfig = { Type = "simple"; diff --git a/hosts/volsinii/modules/nginx.nix b/hosts/volsinii/modules/nginx.nix index 5fb022b..88f81fe 100644 --- a/hosts/volsinii/modules/nginx.nix +++ b/hosts/volsinii/modules/nginx.nix @@ -46,10 +46,10 @@ email = (import "${inputs.self}/personal.nix").emails.primary; webroot = "/var/lib/acme/acme-challenge"; }; - certs."plc.gaze.systems" = { - # extraDomainNames = ["relay.gaze.systems"]; - }; - certs."plc.klbr.net" = { - }; + # certs."plc.gaze.systems" = { + # # extraDomainNames = ["relay.gaze.systems"]; + # }; + # certs."plc.klbr.net" = { + # }; }; } diff --git a/hosts/trimounts/modules/relay.nix b/hosts/volsinii/modules/relay.nix similarity index 89% rename from hosts/trimounts/modules/relay.nix rename to hosts/volsinii/modules/relay.nix index 5f641a4..eb27fd9 100644 --- a/hosts/trimounts/modules/relay.nix +++ b/hosts/volsinii/modules/relay.nix @@ -21,8 +21,11 @@ in after = [ "network.target" ]; environment = { HYDRANT_API_BIND = "0.0.0.0:${port},[::]:${port}"; - HYDRANT_CURSOR_SAVE_INTERVAL = "3sec"; - HYDRANT_SEED_HOSTS = "https://relay.bas.sh"; + HYDRANT_FULL_NETWORK = "true"; + HYDRANT_FIREHOSE_WORKERS = "64"; + HYDRANT_CURSOR_SAVE_INTERVAL = "5sec"; + HYDRANT_IDENTITY_CACHE_SIZE = "1000000"; + HYDRANT_SEED_HOSTS = "https://relay.bas.sh,https://relay.bsky.network,https://relay3.fr.hose.cam"; # HYDRANT_PLC_URL = "http://127.0.0.1:8000"; HYDRANT_PLC_URL = "https://plc.directory"; HYDRANT_DATA_COMPRESSION = "zstd"; diff --git a/hosts/trimounts/modules/slingshot.nix b/hosts/volsinii/modules/slingshot.nix similarity index 100% rename from hosts/trimounts/modules/slingshot.nix rename to hosts/volsinii/modules/slingshot.nix diff --git a/hosts/volsinii/modules/spindle.nix b/hosts/volsinii/modules/spindle.nix new file mode 100644 index 0000000..63dd6cf --- /dev/null +++ b/hosts/volsinii/modules/spindle.nix @@ -0,0 +1,24 @@ +{ + lib, + config, + inputs, + pkgs, + ... +}: +let + system = pkgs.stdenv.hostPlatform.system; + hostname = "ci.klbr.net"; +in +{ + security.acme.certs.${hostname} = {}; + services.nginx.virtualHosts.${hostname} = { + useACMEHost = hostname; + forceSSL = true; + quic = true; + kTLS = true; + locations."/" = { + proxyPass = "http://chernobog:7391"; + proxyWebsockets = true; + }; + }; +} diff --git a/nvfetcher.toml b/nvfetcher.toml index 654cf72..6eb7fe0 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -75,8 +75,8 @@ src.git = "https://tangled.org/@ptr.pet/slopview" fetch.git = "https://tangled.org/@ptr.pet/slopview" [drop] -src.git = "https://tangled.org/juliet.paris/drop" -fetch.git = "https://tangled.org/juliet.paris/drop" +src.git = "https://github.com/notjuliet/drop" +fetch.git = "https://github.com/notjuliet/drop" ## TANGLED ## diff --git a/pkgs-set/pkgs/bobbin.nix b/pkgs-set/pkgs/bobbin.nix index 55340b3..19ac7fe 100644 --- a/pkgs-set/pkgs/bobbin.nix +++ b/pkgs-set/pkgs/bobbin.nix @@ -1,39 +1,8 @@ -{ - lib, - rustPlatform, - inputs, - ... -}: -rustPlatform.buildRustPackage { - pname = "bobbin"; - version = "main"; - +{ inputs, callPackage, ... }: (callPackage "${inputs.tangled}/nix/pkgs/bobbin.nix" { src = inputs.tangled; - - cargoHash = "sha256-uiD2U7MqfufoBJZa3oKsyhnBk4mCXo42lc18aVSLJiM="; - - cargoBuildFlags = [ - "--bin" - "bobbin" - "--package" - "bobbin" - ]; - +}).overrideAttrs (old: { postUnpack = '' substituteInPlace $sourceRoot/Cargo.toml \ --replace-fail 'rust-version = "1.96"' 'rust-version = "1.95"' ''; - - preBuild = '' - export BOBBIN_LEXICONS_DIR=${inputs.tangled}/lexicons - ''; - - doCheck = false; - - meta = { - description = "tangled appview"; - homepage = "https://tangled.org/oyster.cafe/bobbin"; - license = lib.licenses.mit; - mainProgram = "bobbin"; - }; -} \ No newline at end of file +}) diff --git a/pkgs-set/pkgs/helium.nix b/pkgs-set/pkgs/helium.nix index 3dab924..e186269 100644 --- a/pkgs-set/pkgs/helium.nix +++ b/pkgs-set/pkgs/helium.nix @@ -5,7 +5,7 @@ }: pkgs.appimageTools.wrapType2 rec { pname = "helium"; - version = "0.12.4.1"; + version = "0.13.3.1"; src = let platformMap = { @@ -16,7 +16,7 @@ pkgs.appimageTools.wrapType2 rec { platform = platformMap.${pkgs.system}; hashes = { - "x86_64-linux" = "sha256-OgS8HkLBseFrEhNFJxMwp1bg0gzPdfY1VaySAAp7vq0="; + "x86_64-linux" = "sha256-RS+Sn42V+HjCw41N1zayMVIqlgH+i2B2IdVJwBPmw00="; "aarch64-linux" = ""; }; diff --git a/pkgs-set/pkgs/llama-cpp-rocm.nix b/pkgs-set/pkgs/llama-cpp-rocm.nix index 0c0a644..f9e1271 100644 --- a/pkgs-set/pkgs/llama-cpp-rocm.nix +++ b/pkgs-set/pkgs/llama-cpp-rocm.nix @@ -8,9 +8,9 @@ stdenvNoCC, unzip, - releaseTag ? "b1290", + releaseTag ? "b1291", gpuVariant ? "gfx110X", - assetHash ? "sha256-yA5JhGn6uc7CVSwsFc+IwpGOKvCVmKIItfr3/LmBtGc=", + assetHash ? "sha256-BrzJZ0tU0bnrwnR6X8lVu+OimX5JBqbihKkCeDO+YcE=", ... }: diff --git a/pkgs-set/pkgs/llama-cpp.nix b/pkgs-set/pkgs/llama-cpp.nix index 39f0115..72f0c9a 100644 --- a/pkgs-set/pkgs/llama-cpp.nix +++ b/pkgs-set/pkgs/llama-cpp.nix @@ -82,7 +82,7 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "9493"; + version = "9553"; outputs = [ "out" @@ -90,12 +90,10 @@ effectiveStdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - # owner = "ggml-org"; - owner = "am17an"; + owner = "ggml-org"; repo = "llama.cpp"; - # tag = "b${finalAttrs.version}"; - rev = "efd651a8ef2cd13d6c7bb22358659fb64f9e3b18"; - hash = "sha256-azzi78+aTVuXES7JZ/HTUNmJgC6vo4fozhmPbOEsGoU="; + tag = "b${finalAttrs.version}"; + hash = "sha256-mdaOrFbC/DA+mSoCridB7W4ZRU8JYwb5nZlBOLzIgoQ="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT diff --git a/users/mayer/default.nix b/users/mayer/default.nix index f1890af..b2f37a7 100644 --- a/users/mayer/default.nix +++ b/users/mayer/default.nix @@ -97,7 +97,7 @@ in }; services.joycond.enable = true; - services.udev.packages = [pkgs.libimobiledevice]; + services.udev.packages = [pkgs.libimobiledevice pkgs.yubikey-personalization]; home-manager.users.mayer = { @@ -155,6 +155,7 @@ in font-awesome dejavu_fonts # Programs + quickemu imv mpv ffmpeg @@ -171,15 +172,17 @@ in cemu tor-browser feishin + jujutsu # these are for gitnexus nodejs gcc gnumake - python3 + (python3.withPackages (ps: [ ps.aiohttp-socks ])) gh codex codex-acp rtk + flyctl pi-coding-agent ]) ++ [ terra.headroom-ai @@ -209,7 +212,10 @@ in Port 2222 User git IdentityFile ~/.ssh/tangled-dev + Host knot.tngl.boltless.dev + Port 2222 ''; + # services.yubikey-agent.enable = true; services.tailscale = { ana = { @@ -217,6 +223,10 @@ in controlServer = "https://headscale.nekomimi.pet"; port = 1056; }; + work = { + enable = true; + port = 1057; + }; }; }; } diff --git a/users/modules/discord/default.nix b/users/modules/discord/default.nix index 290f58e..85f2e00 100644 --- a/users/modules/discord/default.nix +++ b/users/modules/discord/default.nix @@ -4,25 +4,24 @@ ... }: let - pkg = pkgs.discord.override { - withMoonlight = true; - inherit (terra) moonlight; - withOpenASAR = false; - withTTS = false; - }; + # pkg = pkgs.discord.override { + # withMoonlight = true; + # inherit (terra) moonlight; + # withOpenASAR = false; + # withTTS = false; + # }; + pkg = pkgs.equibop; in { imports = [./service.nix]; home.packages = [ (pkgs.symlinkJoin { - name = "discord"; + name = "equibop"; paths = [ pkg ]; buildInputs = [ pkgs.makeWrapper ]; postBuild = '' - wrapProgram $out/bin/discord \ - --add-flags "--proxy-server=socks5://127.0.0.1:1338" - wrapProgram $out/bin/Discord \ + wrapProgram $out/bin/equibop \ --add-flags "--proxy-server=socks5://127.0.0.1:1338" ''; }) diff --git a/users/modules/discord/service.nix b/users/modules/discord/service.nix index fd80e0f..0de2394 100644 --- a/users/modules/discord/service.nix +++ b/users/modules/discord/service.nix @@ -7,7 +7,7 @@ let [ProxyList] socks5 127.0.0.1 ${port} ''; - wrappedProxychains = pkgs.writers.writeBashBin "proxy" '' + wrappedProxychains = pkgs.writers.writeBashBin "discord-proxy" '' ${pkgs.proxychains-ng}/bin/proxychains4 -f "${proxychainsCfg}" $@ ''; in diff --git a/users/modules/ssh/default.nix b/users/modules/ssh/default.nix index e7c46af..3ce7afa 100644 --- a/users/modules/ssh/default.nix +++ b/users/modules/ssh/default.nix @@ -1,3 +1,4 @@ +{ pkgs, ... }: { programs.ssh = { enable = true; @@ -25,4 +26,22 @@ # ''; }; services.ssh-agent.enable = true; + + # FIDO2/YubiKey (sk-ssh-ed25519) keys created with `verify-required` need a + # PIN prompt at signing time. The ssh-agent has no TTY, so it must use an + # SSH_ASKPASS helper. NixOS sets SSH_ASKPASS="" globally whenever + # programs.ssh.enableAskPassword is false (true when there's no X server, as + # with a pure-Wayland/niri session); that empty value gets imported into the + # user systemd manager and the agent, so signing fails with + # "sign_and_send_pubkey: signing failed ... agent refused operation". + # A unit-level Environment= overrides the inherited empty value. + # + # Note: gcr's gcr4-ssh-askpass is NOT a usable generic SSH_ASKPASS — it + # exits with "this program is not meant to be run directly" unless spawned by + # gcr-ssh-agent. x11-ssh-askpass is a standalone askpass and works fine here + # via the xwayland-satellite Xwayland :0 that the niri session runs. + systemd.user.services.ssh-agent.Service.Environment = [ + "SSH_ASKPASS=${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass" + "SSH_ASKPASS_REQUIRE=prefer" + ]; } -- 2.51.2