diff --git a/_sources/generated.json b/_sources/generated.json index cf25213..e4034a8 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -22,7 +22,7 @@ }, "blog": { "cargoLocks": null, - "date": "2026-01-13", + "date": "2026-01-15", "extract": null, "name": "blog", "passthru": null, @@ -32,13 +32,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "61331b565e674acad615c98f11d1adca5e367b54", - "sha256": "sha256-CllCqGh0dSdYCIKhLL4+qCMFbHVUgzL9mkPFL0MOBcY=", + "rev": "9d55af51b568597aecfd03bfb85dfe6b219dd1d7", + "sha256": "sha256-ao/UxHSC6gUeU8mA+hFvBsc/1/iIXKN297qZ+578J/0=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@ptr.pet/endpoint" }, - "version": "61331b565e674acad615c98f11d1adca5e367b54" + "version": "9d55af51b568597aecfd03bfb85dfe6b219dd1d7" }, "clickee": { "cargoLocks": null, @@ -144,7 +144,7 @@ }, "gomod2nix": { "cargoLocks": null, - "date": "2025-11-24", + "date": "2025-12-29", "extract": null, "name": "gomod2nix", "passthru": null, @@ -156,16 +156,16 @@ "name": null, "owner": "nix-community", "repo": "gomod2nix", - "rev": "02e63a239d6eabd595db56852535992c898eba72", - "sha256": "sha256-ur4QIAHwgFc0vXiaxn5No/FuZicxBr2p0gmT54xZkUQ=", + "rev": "49662a44272806ff785df2990a420edaaca15db4", + "sha256": "sha256-NodN+lhWTD59b44Q2bPjE1edINfjfRkQYdZsrxifCeU=", "sparseCheckout": [], "type": "github" }, - "version": "02e63a239d6eabd595db56852535992c898eba72" + "version": "49662a44272806ff785df2990a420edaaca15db4" }, "home": { "cargoLocks": null, - "date": "2025-12-27", + "date": "2026-01-13", "extract": null, "name": "home", "passthru": null, @@ -177,12 +177,12 @@ "name": null, "owner": "nix-community", "repo": "home-manager", - "rev": "4067ca1ffb6425b8597eafb63a84b171e0192d2b", - "sha256": "sha256-Ok0jocJ82JriaMDtYEytR8oWcxADlX5WcWXULrN4czA=", + "rev": "c5d67517bbcaf37e15c416219c965cc707a0ca24", + "sha256": "sha256-dlWl/z/rdZmPGVexkYL1VLKBMU1e5Y1DZmQfiRf60cQ=", "sparseCheckout": [], "type": "github" }, - "version": "4067ca1ffb6425b8597eafb63a84b171e0192d2b" + "version": "c5d67517bbcaf37e15c416219c965cc707a0ca24" }, "limbusart": { "cargoLocks": null, @@ -247,7 +247,7 @@ }, "nixos-hardware": { "cargoLocks": null, - "date": "2025-12-24", + "date": "2025-12-31", "extract": null, "name": "nixos-hardware", "passthru": null, @@ -259,16 +259,16 @@ "name": null, "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", - "sha256": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=", + "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", + "sha256": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", "sparseCheckout": [], "type": "github" }, - "version": "c5db9569ac9cc70929c268ac461f4003e3e5ca80" + "version": "40b1a28dce561bea34858287fbb23052c3ee63fe" }, "nixpkgs-xr": { "cargoLocks": null, - "date": "2025-12-24", + "date": "2026-01-09", "extract": null, "name": "nixpkgs-xr", "passthru": null, @@ -280,12 +280,12 @@ "name": null, "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "9e8efcd2c4ea906772dea99204a9819284a29b81", - "sha256": "sha256-biwvZsCGC4vCXS6rzs3tUkELqqEXPko0E3R9IhYKavE=", + "rev": "df098c5ff75e641d010c472d8321391db4e90eb9", + "sha256": "sha256-phU4/JrtliPo7VznNgvVNVYNYzNodvdCfq5kBYQMAV4=", "sparseCheckout": [], "type": "github" }, - "version": "9e8efcd2c4ea906772dea99204a9819284a29b81" + "version": "df098c5ff75e641d010c472d8321391db4e90eb9" }, "nsid-tracker": { "cargoLocks": null, @@ -329,7 +329,7 @@ }, "stylix": { "cargoLocks": null, - "date": "2025-12-24", + "date": "2026-01-12", "extract": null, "name": "stylix", "passthru": null, @@ -341,16 +341,16 @@ "name": null, "owner": "nix-community", "repo": "stylix", - "rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430", - "sha256": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=", + "rev": "a62840a9e95801969a03b91e49c1607b5322224c", + "sha256": "sha256-li0Z2Tr5qpH+wyuCMpzXSsHYRleaTukcdLTpAsGcVzY=", "sparseCheckout": [], "type": "github" }, - "version": "551df12ee3ebac52c5712058bd97fd9faa4c3430" + "version": "a62840a9e95801969a03b91e49c1607b5322224c" }, "tangled": { "cargoLocks": null, - "date": "2026-01-11", + "date": "2026-01-13", "extract": null, "name": "tangled", "passthru": null, @@ -360,13 +360,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "1cb2fb5cdd0ddfb30575af85d2d3fcf337ac4c4b", - "sha256": "sha256-JZgqPGYaNxFcj4gl4U4eXctDtPv6YHyu3KuHtMNEyZk=", + "rev": "3638909db6c988eef717981ee3f4950937e92836", + "sha256": "sha256-T87j98h4T2ux5LYc/R1KjisUfv1qck65MknhGJVMEA4=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/tangled.org/core" }, - "version": "1cb2fb5cdd0ddfb30575af85d2d3fcf337ac4c4b" + "version": "3638909db6c988eef717981ee3f4950937e92836" }, "tangled-sqlite-lib": { "cargoLocks": null, @@ -404,7 +404,7 @@ }, "zen-browser": { "cargoLocks": null, - "date": "2025-12-25", + "date": "2026-01-13", "extract": null, "name": "zen-browser", "passthru": null, @@ -416,11 +416,11 @@ "name": null, "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "98d8f48ba80a4b6e3b56addad850d57132301075", - "sha256": "sha256-mGZBEN67mxeOsBhplBRLm6L+y++8jU46EEUYgemG1aQ=", + "rev": "2357b84ef617772c012397a7e8b4542bd5e4bab8", + "sha256": "sha256-ASI9j+Fgj7TzB4mj+IBIBrV5mH9P/D/vjKLyVDZWZOw=", "sparseCheckout": [], "type": "github" }, - "version": "98d8f48ba80a4b6e3b56addad850d57132301075" + "version": "2357b84ef617772c012397a7e8b4542bd5e4bab8" } } \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index 6fff2be..efbba66 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -15,17 +15,17 @@ }; blog = { pname = "blog"; - version = "61331b565e674acad615c98f11d1adca5e367b54"; + version = "9d55af51b568597aecfd03bfb85dfe6b219dd1d7"; src = fetchgit { url = "https://tangled.org/@ptr.pet/endpoint"; - rev = "61331b565e674acad615c98f11d1adca5e367b54"; + rev = "9d55af51b568597aecfd03bfb85dfe6b219dd1d7"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-CllCqGh0dSdYCIKhLL4+qCMFbHVUgzL9mkPFL0MOBcY="; + sha256 = "sha256-ao/UxHSC6gUeU8mA+hFvBsc/1/iIXKN297qZ+578J/0="; }; - date = "2026-01-13"; + date = "2026-01-15"; }; clickee = { pname = "clickee"; @@ -95,27 +95,27 @@ }; gomod2nix = { pname = "gomod2nix"; - version = "02e63a239d6eabd595db56852535992c898eba72"; + version = "49662a44272806ff785df2990a420edaaca15db4"; src = fetchFromGitHub { owner = "nix-community"; repo = "gomod2nix"; - rev = "02e63a239d6eabd595db56852535992c898eba72"; + rev = "49662a44272806ff785df2990a420edaaca15db4"; fetchSubmodules = false; - sha256 = "sha256-ur4QIAHwgFc0vXiaxn5No/FuZicxBr2p0gmT54xZkUQ="; + sha256 = "sha256-NodN+lhWTD59b44Q2bPjE1edINfjfRkQYdZsrxifCeU="; }; - date = "2025-11-24"; + date = "2025-12-29"; }; home = { pname = "home"; - version = "4067ca1ffb6425b8597eafb63a84b171e0192d2b"; + version = "c5d67517bbcaf37e15c416219c965cc707a0ca24"; src = fetchFromGitHub { owner = "nix-community"; repo = "home-manager"; - rev = "4067ca1ffb6425b8597eafb63a84b171e0192d2b"; + rev = "c5d67517bbcaf37e15c416219c965cc707a0ca24"; fetchSubmodules = false; - sha256 = "sha256-Ok0jocJ82JriaMDtYEytR8oWcxADlX5WcWXULrN4czA="; + sha256 = "sha256-dlWl/z/rdZmPGVexkYL1VLKBMU1e5Y1DZmQfiRf60cQ="; }; - date = "2025-12-27"; + date = "2026-01-13"; }; limbusart = { pname = "limbusart"; @@ -159,27 +159,27 @@ }; nixos-hardware = { pname = "nixos-hardware"; - version = "c5db9569ac9cc70929c268ac461f4003e3e5ca80"; + version = "40b1a28dce561bea34858287fbb23052c3ee63fe"; src = fetchFromGitHub { owner = "NixOS"; repo = "nixos-hardware"; - rev = "c5db9569ac9cc70929c268ac461f4003e3e5ca80"; + rev = "40b1a28dce561bea34858287fbb23052c3ee63fe"; fetchSubmodules = false; - sha256 = "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo="; + sha256 = "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q="; }; - date = "2025-12-24"; + date = "2025-12-31"; }; nixpkgs-xr = { pname = "nixpkgs-xr"; - version = "9e8efcd2c4ea906772dea99204a9819284a29b81"; + version = "df098c5ff75e641d010c472d8321391db4e90eb9"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixpkgs-xr"; - rev = "9e8efcd2c4ea906772dea99204a9819284a29b81"; + rev = "df098c5ff75e641d010c472d8321391db4e90eb9"; fetchSubmodules = false; - sha256 = "sha256-biwvZsCGC4vCXS6rzs3tUkELqqEXPko0E3R9IhYKavE="; + sha256 = "sha256-phU4/JrtliPo7VznNgvVNVYNYzNodvdCfq5kBYQMAV4="; }; - date = "2025-12-24"; + date = "2026-01-09"; }; nsid-tracker = { pname = "nsid-tracker"; @@ -211,29 +211,29 @@ }; stylix = { pname = "stylix"; - version = "551df12ee3ebac52c5712058bd97fd9faa4c3430"; + version = "a62840a9e95801969a03b91e49c1607b5322224c"; src = fetchFromGitHub { owner = "nix-community"; repo = "stylix"; - rev = "551df12ee3ebac52c5712058bd97fd9faa4c3430"; + rev = "a62840a9e95801969a03b91e49c1607b5322224c"; fetchSubmodules = false; - sha256 = "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE="; + sha256 = "sha256-li0Z2Tr5qpH+wyuCMpzXSsHYRleaTukcdLTpAsGcVzY="; }; - date = "2025-12-24"; + date = "2026-01-12"; }; tangled = { pname = "tangled"; - version = "1cb2fb5cdd0ddfb30575af85d2d3fcf337ac4c4b"; + version = "3638909db6c988eef717981ee3f4950937e92836"; src = fetchgit { url = "https://tangled.org/tangled.org/core"; - rev = "1cb2fb5cdd0ddfb30575af85d2d3fcf337ac4c4b"; + rev = "3638909db6c988eef717981ee3f4950937e92836"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-JZgqPGYaNxFcj4gl4U4eXctDtPv6YHyu3KuHtMNEyZk="; + sha256 = "sha256-T87j98h4T2ux5LYc/R1KjisUfv1qck65MknhGJVMEA4="; }; - date = "2026-01-11"; + date = "2026-01-13"; }; tangled-sqlite-lib = { pname = "tangled-sqlite-lib"; @@ -259,14 +259,14 @@ }; zen-browser = { pname = "zen-browser"; - version = "98d8f48ba80a4b6e3b56addad850d57132301075"; + version = "2357b84ef617772c012397a7e8b4542bd5e4bab8"; src = fetchFromGitHub { owner = "0xc000022070"; repo = "zen-browser-flake"; - rev = "98d8f48ba80a4b6e3b56addad850d57132301075"; + rev = "2357b84ef617772c012397a7e8b4542bd5e4bab8"; fetchSubmodules = false; - sha256 = "sha256-mGZBEN67mxeOsBhplBRLm6L+y++8jU46EEUYgemG1aQ="; + sha256 = "sha256-ASI9j+Fgj7TzB4mj+IBIBrV5mH9P/D/vjKLyVDZWZOw="; }; - date = "2025-12-25"; + date = "2026-01-13"; }; } diff --git a/dns/dnsconfig.js b/dns/dnsconfig.js index 9736d43..163c65d 100644 --- a/dns/dnsconfig.js +++ b/dns/dnsconfig.js @@ -124,7 +124,7 @@ D( "ptr.pet", REG_NONE, DnsProvider(DSP_PRIMARY), - TRIMOUNTS(["@", "tunes", "x"], CF_PROXY_OFF), + TRIMOUNTS(["@", "tunes", "corpus", "x"], CF_PROXY_OFF), DZWONEK(["nucleus", "trill", "dysnomia"], CF_PROXY_OFF), TXT("_kicya", "3b11cb74243eea1fc84e62ffefd7e246279c2f203e1cae42e19d0454dc8d2172"), // atproto diff --git a/flake.lock b/flake.lock index 8ca23f0..53aa881 100644 --- a/flake.lock +++ b/flake.lock @@ -121,11 +121,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1766651565, - "narHash": "sha256-gtanTxYMENOVHWdS4QgxxKGPaSqvcNJVw0KBfaF5/Bo=", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", + "lastModified": 1768127708, + "narHash": "sha256-caCMFMAeeiexMCYzSb8okUJWy7uAoxAczPjrQkaFCqo=", + "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre916364.3e2499d5539c/nixexprs.tar.xz?lastModified=1766651565&rev=3e2499d5539c16d0d173ba53552a4ff8547f4539" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre925861.ffbc9f8cbaac/nixexprs.tar.xz?lastModified=1768127708&rev=ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38" }, "original": { "type": "tarball", diff --git a/hosts/trimounts/modules/nginx.nix b/hosts/trimounts/modules/nginx.nix index f9ee641..03579df 100644 --- a/hosts/trimounts/modules/nginx.nix +++ b/hosts/trimounts/modules/nginx.nix @@ -38,7 +38,6 @@ users.users.nginx.extraGroups = [ "acme" ]; - age.secrets.bunnyApiKey.file = ../../../secrets/bunnyApiKey.age; security.acme = { acceptTerms = true; defaults = { diff --git a/hosts/trimounts/modules/perses.nix/dashboards/.gitignore b/hosts/trimounts/modules/perses.disabled/dashboards/.gitignore similarity index 100% rename from hosts/trimounts/modules/perses.nix/dashboards/.gitignore rename to hosts/trimounts/modules/perses.disabled/dashboards/.gitignore diff --git a/hosts/trimounts/modules/perses.nix/dashboards/go.mod b/hosts/trimounts/modules/perses.disabled/dashboards/go.mod similarity index 100% rename from hosts/trimounts/modules/perses.nix/dashboards/go.mod rename to hosts/trimounts/modules/perses.disabled/dashboards/go.mod diff --git a/hosts/trimounts/modules/perses.nix/dashboards/go.sum b/hosts/trimounts/modules/perses.disabled/dashboards/go.sum similarity index 100% rename from hosts/trimounts/modules/perses.nix/dashboards/go.sum rename to hosts/trimounts/modules/perses.disabled/dashboards/go.sum diff --git a/hosts/trimounts/modules/perses.nix/dashboards/wolumonde.go b/hosts/trimounts/modules/perses.disabled/dashboards/wolumonde.go similarity index 100% rename from hosts/trimounts/modules/perses.nix/dashboards/wolumonde.go rename to hosts/trimounts/modules/perses.disabled/dashboards/wolumonde.go diff --git a/hosts/trimounts/modules/perses.nix/default.nix b/hosts/trimounts/modules/perses.disabled/default.nix similarity index 100% rename from hosts/trimounts/modules/perses.nix/default.nix rename to hosts/trimounts/modules/perses.disabled/default.nix diff --git a/hosts/trimounts/modules/perses.nix/provision/1-private-infra.yaml b/hosts/trimounts/modules/perses.disabled/provision/1-private-infra.yaml similarity index 100% rename from hosts/trimounts/modules/perses.nix/provision/1-private-infra.yaml rename to hosts/trimounts/modules/perses.disabled/provision/1-private-infra.yaml diff --git a/hosts/trimounts/modules/perses.nix/provision/2-admin-role.yaml b/hosts/trimounts/modules/perses.disabled/provision/2-admin-role.yaml similarity index 100% rename from hosts/trimounts/modules/perses.nix/provision/2-admin-role.yaml rename to hosts/trimounts/modules/perses.disabled/provision/2-admin-role.yaml diff --git a/hosts/trimounts/modules/perses.nix/provision/3-admin-bind-role.yaml b/hosts/trimounts/modules/perses.disabled/provision/3-admin-bind-role.yaml similarity index 100% rename from hosts/trimounts/modules/perses.nix/provision/3-admin-bind-role.yaml rename to hosts/trimounts/modules/perses.disabled/provision/3-admin-bind-role.yaml diff --git a/hosts/trimounts/modules/perses.nix/provision/4-victoria.yaml b/hosts/trimounts/modules/perses.disabled/provision/4-victoria.yaml similarity index 100% rename from hosts/trimounts/modules/perses.nix/provision/4-victoria.yaml rename to hosts/trimounts/modules/perses.disabled/provision/4-victoria.yaml diff --git a/hosts/trimounts/modules/perses.nix/provision/6-guest-role.yaml b/hosts/trimounts/modules/perses.disabled/provision/6-guest-role.yaml similarity index 100% rename from hosts/trimounts/modules/perses.nix/provision/6-guest-role.yaml rename to hosts/trimounts/modules/perses.disabled/provision/6-guest-role.yaml diff --git a/hosts/trimounts/modules/perses.nix/provision/7-guest-role-bind.yaml b/hosts/trimounts/modules/perses.disabled/provision/7-guest-role-bind.yaml similarity index 100% rename from hosts/trimounts/modules/perses.nix/provision/7-guest-role-bind.yaml rename to hosts/trimounts/modules/perses.disabled/provision/7-guest-role-bind.yaml diff --git a/hosts/trimounts/modules/perses.nix/provision/90-wolumonde.yaml b/hosts/trimounts/modules/perses.disabled/provision/90-wolumonde.yaml similarity index 100% rename from hosts/trimounts/modules/perses.nix/provision/90-wolumonde.yaml rename to hosts/trimounts/modules/perses.disabled/provision/90-wolumonde.yaml diff --git a/hosts/trimounts/modules/pocket-id.nix b/hosts/trimounts/modules/pocket-id.disabled similarity index 100% rename from hosts/trimounts/modules/pocket-id.nix rename to hosts/trimounts/modules/pocket-id.disabled diff --git a/hosts/trimounts/modules/tailscale.nix b/hosts/trimounts/modules/tailscale.nix index 055ebde..b82c41f 100644 --- a/hosts/trimounts/modules/tailscale.nix +++ b/hosts/trimounts/modules/tailscale.nix @@ -1,9 +1,9 @@ -{ ... }: +{ lib, ... }: { imports = [ ../../../modules/network/tailscale.nix ]; services.tailscale = { extraSetFlags = [ "--advertise-exit-node" ]; - useRoutingFeatures = "both"; + useRoutingFeatures = lib.mkForce "both"; }; } diff --git a/hosts/trimounts/modules/trilium.disabled b/hosts/trimounts/modules/trilium.disabled new file mode 100644 index 0000000..44413b8 --- /dev/null +++ b/hosts/trimounts/modules/trilium.disabled @@ -0,0 +1,24 @@ +{config, ...}: +let + rootDomain = "ptr.pet"; + domain = "corpus.${rootDomain}"; + cfg = config.services.trilium-server; +in { + services.trilium-server = { + enable = true; + instanceName = "corpus"; + port = 7788; + }; + + security.acme.certs.${rootDomain}.extraDomainNames = [domain]; + services.nginx.virtualHosts.${domain} = { + useACMEHost = "ptr.pet"; + forceSSL = true; + quic = true; + kTLS = true; + locations."/" = { + proxyPass = "http://${cfg.host}:${toString cfg.port}"; + proxyWebsockets = true; + }; + }; +} diff --git a/hosts/volsinii/modules/hardware-configuration.nix b/hosts/volsinii/modules/hardware-configuration.nix index 6b33ab5..b6d9703 100644 --- a/hosts/volsinii/modules/hardware-configuration.nix +++ b/hosts/volsinii/modules/hardware-configuration.nix @@ -32,6 +32,7 @@ address = [ "199.71.188.53/29" ]; gateway = [ "199.71.188.49" ]; }; + networking.interfaces."enX0".mtu = 1370; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/hosts/volsinii/modules/tailscale.nix b/hosts/volsinii/modules/tailscale.nix index 2573b4d..a432a8f 100644 --- a/hosts/volsinii/modules/tailscale.nix +++ b/hosts/volsinii/modules/tailscale.nix @@ -1,7 +1,9 @@ -{ config, ... }: +{ lib, ... }: { imports = [ ../../../modules/network/tailscale.nix ]; + services.tailscale.useRoutingFeatures = lib.mkForce "server"; + # age.secrets.tailscaleAuthKey.file = ../../../secrets/tailscaleAuthKey.age; # services.tailscale.authKeyFile = config.age.secrets.tailscaleAuthKey.path; } diff --git a/modules/network/tailscale.nix b/modules/network/tailscale.nix index dc68f12..d9cde28 100644 --- a/modules/network/tailscale.nix +++ b/modules/network/tailscale.nix @@ -6,6 +6,7 @@ # extraUpFlags = [ "--ssh" ]; extraDaemonFlags = [ "--no-logs-no-support" ]; openFirewall = true; + useRoutingFeatures = "client"; }; networking.interfaces.tailscale0.useDHCP = lib.mkForce false; diff --git a/pkgs-set/pkgs/helium.nix b/pkgs-set/pkgs/helium.nix index b0cdc35..86cafff 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.7.10.1"; + version = "0.8.1.1"; src = let platformMap = { @@ -16,7 +16,7 @@ pkgs.appimageTools.wrapType2 rec { platform = platformMap.${pkgs.system}; hashes = { - "x86_64-linux" = "sha256-11xSlHIqmyyVwjjwt5FmLhp72P3m07PppOo7a9DbTcE="; + "x86_64-linux" = "sha256-n1wn80h9O7GpZz4AygNSKMcilX8lr6fJkiQBBPPQXok="; "aarch64-linux" = "sha256-B63tvOtSRlMRJozvzC7lqG2LM0ZgLIq2G/AHABl+Qqg="; }; diff --git a/pkgs-set/pkgs/tangled-knot.nix b/pkgs-set/pkgs/tangled-knot.nix index 1d73787..62cf203 100644 --- a/pkgs-set/pkgs/tangled-knot.nix +++ b/pkgs-set/pkgs/tangled-knot.nix @@ -7,13 +7,11 @@ }: let unwrapped = - (callPackage "${inputs.tangled}/nix/pkgs/knot-unwrapped.nix" { + callPackage "${inputs.tangled}/nix/pkgs/knot-unwrapped.nix" { modules = tangled-modules; sqlite-lib = tangled-sqlite-lib; - }).overrideAttrs - (_: { - src = inputs.tangled; - }); + src = inputs.tangled; + }; in callPackage "${inputs.tangled}/nix/pkgs/knot.nix" { knot-unwrapped = unwrapped; diff --git a/pkgs-set/pkgs/tangled-spindle.nix b/pkgs-set/pkgs/tangled-spindle.nix index ccf3ff1..14c82e0 100644 --- a/pkgs-set/pkgs/tangled-spindle.nix +++ b/pkgs-set/pkgs/tangled-spindle.nix @@ -5,10 +5,8 @@ tangled-sqlite-lib, ... }: -(callPackage "${inputs.tangled}/nix/pkgs/spindle.nix" { +callPackage "${inputs.tangled}/nix/pkgs/spindle.nix" { modules = tangled-modules; sqlite-lib = tangled-sqlite-lib; -}).overrideAttrs - (_: { - src = inputs.tangled; - }) + src = inputs.tangled; +} \ No newline at end of file diff --git a/secrets/roka.key.pub b/secrets/roka.key.pub new file mode 100644 index 0000000..5a27c93 --- /dev/null +++ b/secrets/roka.key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHTE6VnzgLG+PbNMAcfmxYNJpvaevXKJg7mVY0bUkF+8 \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 832692e..6cebf78 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -30,11 +30,6 @@ in dzwonek trimounts ]; - "bunnyApiKey.age".publicKeys = [ - yusdacra - dzwonek - trimounts - ]; "atfileCfg.age".publicKeys = [yusdacra]; "ziplineCfg.age".publicKeys = [yusdacra trimounts]; "callieMusic.age".publicKeys = [yusdacra trimounts]; diff --git a/users/root/default.nix b/users/root/default.nix index fb13803..6ce42cb 100644 --- a/users/root/default.nix +++ b/users/root/default.nix @@ -5,6 +5,7 @@ initialHashedPassword = "$6$XLWo1sPpgp63Zm$XHBbULH9q1gb/.yalPPU/I7EgTcW80bM.moCjIe/qGyOwE47VcXNVbTHloBZdIWQq0MfIG0IxInAu59.oJyos/"; openssh.authorizedKeys.keys = [ (builtins.readFile "${inputs.self}/secrets/yusdacra.key.pub") + (builtins.readFile "${inputs.self}/secrets/roka.key.pub") ]; };