From 5ceb27c5868ec6a5c80e59bc834026efde45f111 Mon Sep 17 00:00:00 2001 From: Callum Leslie Date: Mon, 4 Aug 2025 08:09:38 +0100 Subject: [PATCH 1/8] fix --- flake.lock | 212 +++++++++++++++++++++--------------------------- flake.nix | 5 -- modules/nix.nix | 1 + 3 files changed, 92 insertions(+), 126 deletions(-) diff --git a/flake.lock b/flake.lock index 2fc5c39..908e356 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1736852337, - "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", + "lastModified": 1748408240, + "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", + "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "type": "github" }, "original": { @@ -122,15 +122,12 @@ } }, "crane": { - "inputs": { - "nixpkgs": "nixpkgs" - }, "locked": { - "lastModified": 1717535930, - "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -208,11 +205,11 @@ ] }, "locked": { - "lastModified": 1751854533, - "narHash": "sha256-U/OQFplExOR1jazZY4KkaQkJqOl59xlh21HP9mI79Vc=", + "lastModified": 1752718651, + "narHash": "sha256-PkaR0qmyP9q/MDN3uYa+RLeBA0PjvEQiM0rTDDBXkL8=", "owner": "nix-community", "repo": "disko", - "rev": "16b74a1e304197248a1bc663280f2548dbfcae3c", + "rev": "d5ad4485e6f2edcc06751df65c5e16572877db88", "type": "github" }, "original": { @@ -266,11 +263,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1752033806, - "narHash": "sha256-XUHXDV8vwVjX6aYeJmPShMGJI9jx+JC0yWw0hsKbtMw=", + "lastModified": 1752811437, + "narHash": "sha256-TVWYBcNpeQ3fEloryVP9N2yJnC3vuPpoZF1RqFFWFt0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "08bd298d38f4110a3049cbe1876c1c77a8b4797f", + "rev": "369dccacc0a8214600773b3bbbf68d98a19b74e8", "type": "gitlab" }, "original": { @@ -283,11 +280,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1743774811, - "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "type": "github" }, "original": { @@ -371,11 +368,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -449,11 +446,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -495,24 +492,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "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" - } - }, "fromYaml": { "flake": false, "locked": { @@ -633,11 +612,11 @@ ] }, "locked": { - "lastModified": 1752391422, - "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=", + "lastModified": 1752780124, + "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=", "owner": "nix-community", "repo": "home-manager", - "rev": "c26266790678863cce8e7460fdbf0d80991b1906", + "rev": "c718918222bdb104397762dea67e6b397a7927fe", "type": "github" }, "original": { @@ -838,16 +817,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752683762, - "narHash": "sha256-CVC4bpthYhKk4Qb4mt00SqfJ7CJ4vfTX06pLN2OHa1c=", + "lastModified": 1752620740, + "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa64ec5c1ca6f17746f3defedb988b9248e97616", + "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -887,37 +866,21 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { - "locked": { - "lastModified": 1752308619, - "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1711163522, "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", @@ -933,7 +896,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1750215678, "narHash": "sha256-Rc/ytpamXRf6z8UA2SGa4aaWxUXRbX2MAWIu2C8M+ok=", @@ -949,7 +912,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1725194671, "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", @@ -1004,14 +967,15 @@ "nixpkgs": [ "stylix", "nixpkgs" - ] + ], + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1752479139, - "narHash": "sha256-GXg1mOZdVPeAiMrm1pfG+h4yg2dZ+XHcg/ur6Gelko4=", + "lastModified": 1751320053, + "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=", "owner": "nix-community", "repo": "NUR", - "rev": "e73ef793ac91b183505a7a5122e12ce86da2fe63", + "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670", "type": "github" }, "original": { @@ -1044,10 +1008,10 @@ "nvf_2": { "inputs": { "flake-parts": "flake-parts_4", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "mnw": "mnw", - "nixpkgs": "nixpkgs_4", - "systems": "systems_4" + "nixpkgs": "nixpkgs_3", + "systems": "systems_3" }, "locked": { "lastModified": 1752001027, @@ -1075,7 +1039,7 @@ "nix-systems-aarch64-linux": "nix-systems-aarch64-linux", "nix-systems-x86_64-darwin": "nix-systems-x86_64-darwin", "nix-systems-x86_64-linux": "nix-systems-x86_64-linux", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "rust-flake": "rust-flake", "systems": [ "systems" @@ -1083,11 +1047,11 @@ "true": "true" }, "locked": { - "lastModified": 1750915300, - "narHash": "sha256-rPuCq5BcREVsNtc62WXF05WH319bZvdJqeDFJiWoBH0=", + "lastModified": 1752609340, + "narHash": "sha256-LrcNUiyLOiIgalsP/GsaRh7pe8lpZLRiQHv9jCeJNtQ=", "owner": "juspay", "repo": "omnix", - "rev": "d53458b11aced6939e237141253edab13f26fbed", + "rev": "e967319794c9b9ad7d040dc873eae62adab968f4", "type": "github" }, "original": { @@ -1134,11 +1098,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -1159,14 +1123,14 @@ "lanzaboote": "lanzaboote", "nish": "nish", "nixinate": "nixinate", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nsbm": "nsbm", "nvf": "nvf", "omnix": "omnix", "pre-commit-hooks": "pre-commit-hooks", "stylix": "stylix", - "systems": "systems_6", - "treefmt-nix": "treefmt-nix_2", + "systems": "systems_5", + "treefmt-nix": "treefmt-nix_3", "unstable": "unstable" } }, @@ -1212,18 +1176,17 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1717813066, - "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { @@ -1260,7 +1223,7 @@ "flake-parts": "flake-parts_3", "flake-root": "flake-root", "nix-visualize": "nix-visualize", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "treefmt-nix": "treefmt-nix", "vulnix": "vulnix" }, @@ -1291,7 +1254,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_5", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1299,11 +1262,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1752450546, - "narHash": "sha256-LDZ5+izyjRnctLcxAOul7CVpSTV58NTpUdhYkj0Pq1c=", + "lastModified": 1752752240, + "narHash": "sha256-qSQ6oIJeIb5MX6LRszgqQYB46FOHemKrvrdzf2u+uxM=", "owner": "danth", "repo": "stylix", - "rev": "752b31495507d3a693ad8fdfd0df6f4044fab6a3", + "rev": "40f40bda4269f6e5490c25975069dc61aede6d52", "type": "github" }, "original": { @@ -1388,21 +1351,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1455,11 +1403,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1743296873, - "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", + "lastModified": 1751159871, + "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", + "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", "type": "github" }, "original": { @@ -1509,15 +1457,37 @@ "treefmt-nix_2": { "inputs": { "nixpkgs": [ + "stylix", + "nur", "nixpkgs" ] }, "locked": { - "lastModified": 1750931469, - "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_3": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1752055615, + "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", "type": "github" }, "original": { @@ -1543,11 +1513,11 @@ }, "unstable": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1752687322, + "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a9929b8..a076c9f 100644 --- a/flake.nix +++ b/flake.nix @@ -105,7 +105,6 @@ url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; - # i don't need darwin!!! inputs.darwin.follows = ""; }; @@ -116,7 +115,6 @@ stylix = { url = "github:danth/stylix/release-25.05"; - #url = "github:danth/stylix/993fcabd83d1e0ee5ea038b87041593cc73c1ebe"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -151,8 +149,6 @@ flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; systems.url = "github:nix-systems/default"; - #systems.url = "github:nix-systems/default-linux"; - #systems.url = "github:nix-systems/x86_64-linux"; treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; @@ -162,7 +158,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # my custom programs nish = { url = "github:callumio/nish"; inputs = { diff --git a/modules/nix.nix b/modules/nix.nix index df56701..329b39a 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -1,6 +1,7 @@ {inputs, ...}: { nix = { registry.nixpkgs.flake = inputs.nixpkgs; + registry.unstable.flake = inputs.unstable; gc = { automatic = true; dates = "weekly"; From 50c268a8e2dc865d46e8a8bcf89c411277a61960 Mon Sep 17 00:00:00 2001 From: Callum Leslie Date: Mon, 4 Aug 2025 08:55:52 +0100 Subject: [PATCH 2/8] conform to new cloudflare api key format --- secrets/cloudflare-api.age | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/secrets/cloudflare-api.age b/secrets/cloudflare-api.age index 1ee3de6..60ba28a 100644 --- a/secrets/cloudflare-api.age +++ b/secrets/cloudflare-api.age @@ -1,8 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 /RyXeg p2ROUhWiDQDOjALQnhhf566js8ivYTsgwNfCaaoe6yQ -UnCc2/4lb+PxnrKdAPVqwAyXavFGr8M3NV3+fSSdAU0 --> ssh-ed25519 aSaoJQ hHqpvUCaH5RLAQwTdH1llfF/0aTraXtl25qFDaFhUwk -+4VMHc3PGR9HBlVTw4anbYORQPgFl24WGF5pwmt7w20 ---- qa7ctM764SNg3u/ITk+6DRXbLqF1Lom1xgKysY9DrkE -Z;Q -7k4%#pqvy] ieǺ]ɩi!4=s䉁JfpHs29sF}˪#i8 \ No newline at end of file +-> ssh-ed25519 /RyXeg 9MmkRSN4Pxm/euJsg3CiOmfGURBb6OSPzluA80cYOAE +QYMH4LFbOsK6kIExn68Bxaof+kam3TTbMcHhCJ412KY +-> ssh-ed25519 aSaoJQ bDhF3Ibh5hG/E8kSOMYA2zsixtOrn39YfM8SQOH02Sc +IryhokRkj3Hqb/09850ROdHu45e7ldHVE1yJJXsGjZ8 +--- xn812SYQ+FfSlMJ89BFtjNJZYVz7G1Tl63lhLF9jops +?|8` JE巓T7ۓA5W]ט"'2Ј*`Jɧ`Oq!< \ No newline at end of file From dceece37503f6a3794acbdb33bf575473babe297 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Jul 2025 11:48:36 +0000 Subject: [PATCH 3/8] ci: bump DeterminateSystems/update-flake-lock from 24 to 27 Bumps [DeterminateSystems/update-flake-lock](https://github.com/determinatesystems/update-flake-lock) from 24 to 27. - [Release notes](https://github.com/determinatesystems/update-flake-lock/releases) - [Commits](https://github.com/determinatesystems/update-flake-lock/compare/v24...v27) --- updated-dependencies: - dependency-name: DeterminateSystems/update-flake-lock dependency-version: '27' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/update-flake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-flake.yml b/.github/workflows/update-flake.yml index 72e4eb3..f668fc7 100644 --- a/.github/workflows/update-flake.yml +++ b/.github/workflows/update-flake.yml @@ -14,7 +14,7 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@v30 - name: Update flake.lock - uses: DeterminateSystems/update-flake-lock@v24 + uses: DeterminateSystems/update-flake-lock@v27 with: token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} pr-labels: | From bf2d7d821df8371b908929673a45a89b7056c0f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Jul 2025 11:48:21 +0000 Subject: [PATCH 4/8] ci: bump DeterminateSystems/magic-nix-cache-action from 8 to 13 Bumps [DeterminateSystems/magic-nix-cache-action](https://github.com/determinatesystems/magic-nix-cache-action) from 8 to 13. - [Release notes](https://github.com/determinatesystems/magic-nix-cache-action/releases) - [Commits](https://github.com/determinatesystems/magic-nix-cache-action/compare/v8...v13) --- updated-dependencies: - dependency-name: DeterminateSystems/magic-nix-cache-action dependency-version: '13' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b1443ae..e6e1544 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: uses: jlumbroso/free-disk-space@main with: tool-cache: true - - uses: DeterminateSystems/magic-nix-cache-action@v8 + - uses: DeterminateSystems/magic-nix-cache-action@v13 - uses: cachix/cachix-action@v15 with: name: callumio-public From 2117933a52c0d0a852af9ec37701a85661fce66b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Aug 2025 08:23:48 +0000 Subject: [PATCH 5/8] ci: bump cachix/install-nix-action from 30 to 31 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 30 to 31. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v30...v31) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- .github/workflows/update-flake.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e6e1544..8feef7b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v30 + - uses: cachix/install-nix-action@v31 with: nix_path: nixpkgs=channel:nixos-unstable - name: Free Disk Space diff --git a/.github/workflows/update-flake.yml b/.github/workflows/update-flake.yml index f668fc7..d59245a 100644 --- a/.github/workflows/update-flake.yml +++ b/.github/workflows/update-flake.yml @@ -12,7 +12,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Install Nix - uses: cachix/install-nix-action@v30 + uses: cachix/install-nix-action@v31 - name: Update flake.lock uses: DeterminateSystems/update-flake-lock@v27 with: From 09787eec8fa486eef7ae05bd4f1afcbf748c3d86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Aug 2025 08:23:00 +0000 Subject: [PATCH 6/8] ci: bump cachix/cachix-action from 15 to 16 Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from 15 to 16. - [Release notes](https://github.com/cachix/cachix-action/releases) - [Commits](https://github.com/cachix/cachix-action/compare/v15...v16) --- updated-dependencies: - dependency-name: cachix/cachix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8feef7b..a17f24d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: with: tool-cache: true - uses: DeterminateSystems/magic-nix-cache-action@v13 - - uses: cachix/cachix-action@v15 + - uses: cachix/cachix-action@v16 with: name: callumio-public authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' From 5640ce5d13ca7b6940d61813ab8f2988f3c37f58 Mon Sep 17 00:00:00 2001 From: Callum Leslie Date: Tue, 5 Aug 2025 10:36:07 +0100 Subject: [PATCH 7/8] copy party wooo --- flake.lock | 39 +++++++++++++++++++++++++++++++++++++- flake.nix | 12 ++++++++---- hosts/hermes/copyparty.nix | 34 +++++++++++++++++++++++++++++++++ hosts/hermes/default.nix | 1 + secrets/copyparty-c.age | 7 +++++++ secrets/secrets.nix | 1 + 6 files changed, 89 insertions(+), 5 deletions(-) create mode 100644 hosts/hermes/copyparty.nix create mode 100644 secrets/copyparty-c.age diff --git a/flake.lock b/flake.lock index 908e356..585cf9e 100644 --- a/flake.lock +++ b/flake.lock @@ -121,6 +121,27 @@ "type": "github" } }, + "copyparty": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "unstable" + ] + }, + "locked": { + "lastModified": 1754348197, + "narHash": "sha256-sVl/KDJR7X0bmRc/ccmuAy9HgcQXnnIaiOCWbSGvRPA=", + "owner": "9001", + "repo": "copyparty", + "rev": "b664ebb01f28094749e233ac70795ccd11fed253", + "type": "github" + }, + "original": { + "owner": "9001", + "repo": "copyparty", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1731098351, @@ -475,6 +496,21 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems_2" }, @@ -1008,7 +1044,7 @@ "nvf_2": { "inputs": { "flake-parts": "flake-parts_4", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "mnw": "mnw", "nixpkgs": "nixpkgs_3", "systems": "systems_3" @@ -1114,6 +1150,7 @@ "root": { "inputs": { "agenix": "agenix", + "copyparty": "copyparty", "devour-flake": "devour-flake", "disko": "disko", "firefox-addons": "firefox-addons", diff --git a/flake.nix b/flake.nix index a076c9f..eab8f66 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ } @ inputs: let mods = import ./modules; cLib = import ./lib {inherit (nixpkgs) lib;}; - mkLinuxSystem = mod: + mkLinuxSystem = mod: ovl: nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs cLib;}; modules = @@ -19,7 +19,7 @@ inputs.agenix.nixosModules.default { nixpkgs.config.allowUnfree = true; - nixpkgs.overlays = [self.overlays.default]; + nixpkgs.overlays = [self.overlays.default] ++ ovl; } ] ++ mod @@ -39,8 +39,8 @@ inherit (mods) homeManagerModules nixosModules; # TODO: use ./hosts/ nixosConfigurations = { - artemis = mkLinuxSystem [./hosts/artemis inputs.lanzaboote.nixosModules.lanzaboote]; - hermes = mkLinuxSystem [./hosts/hermes]; + artemis = mkLinuxSystem [./hosts/artemis inputs.lanzaboote.nixosModules.lanzaboote] []; + hermes = mkLinuxSystem [./hosts/hermes inputs.copyparty.nixosModules.default] [inputs.copyparty.overlays.default]; }; diskoConfigurations = {}; # maybe? om.health.default = {nix-version.min-required = "2.18.5";}; @@ -178,5 +178,9 @@ systems.follows = "systems"; }; }; + copyparty = { + url = "github:9001/copyparty"; + inputs.nixpkgs.follows = "unstable"; + }; }; } diff --git a/hosts/hermes/copyparty.nix b/hosts/hermes/copyparty.nix new file mode 100644 index 0000000..8fc9923 --- /dev/null +++ b/hosts/hermes/copyparty.nix @@ -0,0 +1,34 @@ +{config, ...}: let + domain = "files.cleslie.uk"; +in { + services = { + cloudflare-dyndns.domains = [domain]; + copyparty = { + enable = true; + settings = { + i = "127.0.0.1"; + p = [3210]; + }; + accounts = { + c.passwordFile = config.age.secrets.copyparty-c.path; + }; + volumes = { + "/media" = { + path = "/var/lib/media/library"; + access = { + r = "*"; + rw = ["c"]; + }; + }; + }; + }; + caddy.virtualHosts.${domain}.extraConfig = '' + reverse_proxy http://127.0.0.1:3210 + ''; + }; + age.secrets."copyparty-c" = { + file = ../../secrets/copyparty-c.age; + mode = "400"; + owner = "copyparty"; + }; +} diff --git a/hosts/hermes/default.nix b/hosts/hermes/default.nix index d6978bd..6487805 100644 --- a/hosts/hermes/default.nix +++ b/hosts/hermes/default.nix @@ -2,6 +2,7 @@ imports = [ ./hardware-configuration.nix ./configuration.nix + ./copyparty.nix ./ddns.nix ./quassel.nix ./fail2ban.nix diff --git a/secrets/copyparty-c.age b/secrets/copyparty-c.age new file mode 100644 index 0000000..514f9dc --- /dev/null +++ b/secrets/copyparty-c.age @@ -0,0 +1,7 @@ +age-encryption.org/v1 +-> ssh-ed25519 /RyXeg L3snhcjG3XkMDoehtE1UyJ32D8vzLE8+D7ZQp4m+S0w +FqrvB5ve6xLedf2N982uQB7FBRQinubVFSpJ1wj7fBw +-> ssh-ed25519 aSaoJQ AHhV+ob0AO5/jkoNy/138Qjpnq6bgQJOS7gu9NxPagg +5ie/QslRuqJBzOXHWulGIFnZXaPUHBbWhxKJnoCDsXg +--- vhZK1PYh5jncrrXGGWiE0mvDCN/O/Rvh2WGYBBimC8w +/NGOtfmAx}OA}i2t~q ] \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index f66bfbb..9d0b2e5 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -10,6 +10,7 @@ in { "mesh-conf-infra.age".publicKeys = keys.c ++ allSystems; "mesh-conf-cleslie.age".publicKeys = keys.c ++ allSystems; "forgejo-password.age".publicKeys = keys.c ++ [systems.hermes]; + "copyparty-c.age".publicKeys = keys.c ++ [systems.hermes]; "cloudflare-api.age".publicKeys = keys.c ++ [systems.hermes]; "vaultwarden-env.age".publicKeys = keys.c ++ [systems.hermes]; } From f24854615b9630436eac8d7b646c78411cfde49f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 9 Aug 2025 05:15:28 +0000 Subject: [PATCH 8/8] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'agenix': 'github:ryantm/agenix/531beac616433bac6f9e2a19feb8e99a22a66baf?narHash=sha256-9P1FziAwl5%2B3edkfFcr5HeGtQUtrSdk/MksX39GieoA%3D' (2025-06-17) → 'github:ryantm/agenix/9edb1787864c4f59ae5074ad498b6272b3ec308d?narHash=sha256-NA/FT2hVhKDftbHSwVnoRTFhes62%2B7dxZbxj5Gxvghs%3D' (2025-08-05) • Updated input 'copyparty': 'github:9001/copyparty/b664ebb01f28094749e233ac70795ccd11fed253?narHash=sha256-sVl/KDJR7X0bmRc/ccmuAy9HgcQXnnIaiOCWbSGvRPA%3D' (2025-08-04) → 'github:9001/copyparty/392a4db55bc4d27300bff5bc82638513e6c900d3?narHash=sha256-hdw5A2GJQddldh0PWxs9U618aNmGtiIAcT2zHYJZ0to%3D' (2025-08-08) • Updated input 'disko': 'github:nix-community/disko/d5ad4485e6f2edcc06751df65c5e16572877db88?narHash=sha256-PkaR0qmyP9q/MDN3uYa%2BRLeBA0PjvEQiM0rTDDBXkL8%3D' (2025-07-17) → 'github:nix-community/disko/545aba02960caa78a31bd9a8709a0ad4b6320a5c?narHash=sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb%2BmYCodI5uuB8%3D' (2025-07-21) • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/369dccacc0a8214600773b3bbbf68d98a19b74e8?dir=pkgs/firefox-addons&narHash=sha256-TVWYBcNpeQ3fEloryVP9N2yJnC3vuPpoZF1RqFFWFt0%3D' (2025-07-18) → 'gitlab:rycee/nur-expressions/2008f9aa7a5ccde48bfc1de5a919be5898da09c2?dir=pkgs/firefox-addons&narHash=sha256-gXE5lTYMOhpDJo%2BsiLXW/3BzySPmLMD12GVB1QFVbyw%3D' (2025-08-06) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/77826244401ea9de6e3bac47c2db46005e1f30b5?narHash=sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ%3D' (2025-07-01) → 'github:hercules-ci/flake-parts/af66ad14b28a127c5c0f3bbb298218fc63528a18?narHash=sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8%3D' (2025-08-06) • Updated input 'home-manager': 'github:nix-community/home-manager/c718918222bdb104397762dea67e6b397a7927fe?narHash=sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0%3D' (2025-07-17) → 'github:nix-community/home-manager/fc3add429f21450359369af74c2375cb34a2d204?narHash=sha256-oV695RvbAE4%2BR9pcsT9shmp6zE/%2BIZe6evHWX63f2Qg%3D' (2025-07-27) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/32a4e87942101f1c9f9865e04dc3ddb175f5f32e?narHash=sha256-f3pO%2B9lg66mV7IMmmIqG4PL3223TYMlnlw%2Bpnpelbss%3D' (2025-07-15) → 'github:NixOS/nixpkgs/fc756aa6f5d3e2e5666efcf865d190701fef150a?narHash=sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc%3D' (2025-08-08) • Updated input 'omnix': 'github:juspay/omnix/e967319794c9b9ad7d040dc873eae62adab968f4?narHash=sha256-LrcNUiyLOiIgalsP/GsaRh7pe8lpZLRiQHv9jCeJNtQ%3D' (2025-07-15) → 'github:juspay/omnix/d692e7450881cf1f9248307532e021a0345d85d5?narHash=sha256-rZlmYNjd3GYcI0Mf21wc9TB6n3tea0yhVAIkIeBBiLs%3D' (2025-07-29) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/16ec914f6fb6f599ce988427d9d94efddf25fe6d?narHash=sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg%3D' (2025-06-24) → 'github:cachix/pre-commit-hooks.nix/9c52372878df6911f9afc1e2a1391f55e4dfc864?narHash=sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef%2B6fRcofA%3D' (2025-08-05) • Updated input 'stylix': 'github:danth/stylix/40f40bda4269f6e5490c25975069dc61aede6d52?narHash=sha256-qSQ6oIJeIb5MX6LRszgqQYB46FOHemKrvrdzf2u%2BuxM%3D' (2025-07-17) → 'github:danth/stylix/312dec38b2231b21f36903d1bdce96daa11548ff?narHash=sha256-AzAYdZlat002vCjCKWdFpGi2xUaiOU4DtIPnv1nomD8%3D' (2025-08-07) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9?narHash=sha256-19m7P4O/Aw/6%2BCzncWMAJu89JaKeMh3aMle1CNQSIwM%3D' (2025-07-09) → 'github:numtide/treefmt-nix/1298185c05a56bff66383a20be0b41a307f52228?narHash=sha256-B%2B3g9%2B76KlGe34Yk9za8AF3RL%2BlnbHXkLiVHLjYVOAc%3D' (2025-08-06) • Updated input 'unstable': 'github:NixOS/nixpkgs/6e987485eb2c77e5dcc5af4e3c70843711ef9251?narHash=sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo%3D' (2025-07-16) → 'github:NixOS/nixpkgs/c2ae88e026f9525daf89587f3cbee584b92b6134?narHash=sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs%3D' (2025-08-06) --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 585cf9e..760da77 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1750173260, - "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "owner": "ryantm", "repo": "agenix", - "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "type": "github" }, "original": { @@ -129,11 +129,11 @@ ] }, "locked": { - "lastModified": 1754348197, - "narHash": "sha256-sVl/KDJR7X0bmRc/ccmuAy9HgcQXnnIaiOCWbSGvRPA=", + "lastModified": 1754693757, + "narHash": "sha256-hdw5A2GJQddldh0PWxs9U618aNmGtiIAcT2zHYJZ0to=", "owner": "9001", "repo": "copyparty", - "rev": "b664ebb01f28094749e233ac70795ccd11fed253", + "rev": "392a4db55bc4d27300bff5bc82638513e6c900d3", "type": "github" }, "original": { @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1752718651, - "narHash": "sha256-PkaR0qmyP9q/MDN3uYa+RLeBA0PjvEQiM0rTDDBXkL8=", + "lastModified": 1753140376, + "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", "owner": "nix-community", "repo": "disko", - "rev": "d5ad4485e6f2edcc06751df65c5e16572877db88", + "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", "type": "github" }, "original": { @@ -284,11 +284,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1752811437, - "narHash": "sha256-TVWYBcNpeQ3fEloryVP9N2yJnC3vuPpoZF1RqFFWFt0=", + "lastModified": 1754512310, + "narHash": "sha256-gXE5lTYMOhpDJo+siLXW/3BzySPmLMD12GVB1QFVbyw=", "owner": "rycee", "repo": "nur-expressions", - "rev": "369dccacc0a8214600773b3bbbf68d98a19b74e8", + "rev": "2008f9aa7a5ccde48bfc1de5a919be5898da09c2", "type": "gitlab" }, "original": { @@ -368,11 +368,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "type": "github" }, "original": { @@ -648,11 +648,11 @@ ] }, "locked": { - "lastModified": 1752780124, - "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=", + "lastModified": 1753592768, + "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", "owner": "nix-community", "repo": "home-manager", - "rev": "c718918222bdb104397762dea67e6b397a7927fe", + "rev": "fc3add429f21450359369af74c2375cb34a2d204", "type": "github" }, "original": { @@ -853,11 +853,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752620740, - "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", + "lastModified": 1754689972, + "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", + "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", "type": "github" }, "original": { @@ -1083,11 +1083,11 @@ "true": "true" }, "locked": { - "lastModified": 1752609340, - "narHash": "sha256-LrcNUiyLOiIgalsP/GsaRh7pe8lpZLRiQHv9jCeJNtQ=", + "lastModified": 1753830394, + "narHash": "sha256-rZlmYNjd3GYcI0Mf21wc9TB6n3tea0yhVAIkIeBBiLs=", "owner": "juspay", "repo": "omnix", - "rev": "e967319794c9b9ad7d040dc873eae62adab968f4", + "rev": "d692e7450881cf1f9248307532e021a0345d85d5", "type": "github" }, "original": { @@ -1107,11 +1107,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1754416808, + "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864", "type": "github" }, "original": { @@ -1299,11 +1299,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1752752240, - "narHash": "sha256-qSQ6oIJeIb5MX6LRszgqQYB46FOHemKrvrdzf2u+uxM=", + "lastModified": 1754599117, + "narHash": "sha256-AzAYdZlat002vCjCKWdFpGi2xUaiOU4DtIPnv1nomD8=", "owner": "danth", "repo": "stylix", - "rev": "40f40bda4269f6e5490c25975069dc61aede6d52", + "rev": "312dec38b2231b21f36903d1bdce96daa11548ff", "type": "github" }, "original": { @@ -1520,11 +1520,11 @@ ] }, "locked": { - "lastModified": 1752055615, - "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", + "lastModified": 1754492133, + "narHash": "sha256-B+3g9+76KlGe34Yk9za8AF3RL+lnbHXkLiVHLjYVOAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", + "rev": "1298185c05a56bff66383a20be0b41a307f52228", "type": "github" }, "original": { @@ -1550,11 +1550,11 @@ }, "unstable": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": {