From a055ebeaba05dfc2e969924e2a1076d754a0c2f1 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 26 May 2025 11:13:37 +0200 Subject: [PATCH 01/17] Make `paperless` work again --- modules/paperless/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/paperless/default.nix b/modules/paperless/default.nix index eea062d..f0ad8f3 100644 --- a/modules/paperless/default.nix +++ b/modules/paperless/default.nix @@ -16,6 +16,7 @@ pdfa_image_compression = "lossless"; invalidate_digital_signatures = true; }; + PAPERLESS_URL = "https://paper.sisko.wg.aciceri.dev"; }; }; @@ -33,6 +34,12 @@ }; extraConfig = '' client_max_body_size 50000M; + proxy_redirect off; + proxy_set_header Host $host:$server_port; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $server_name; + proxy_set_header X-Forwarded-Proto $scheme; ''; serverAliases = [ "paper.sisko.zt.aciceri.dev" ]; }; From 912ab8105a16a194098b51f192364c7a7803800b Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 26 May 2025 11:13:44 +0200 Subject: [PATCH 02/17] Disable `deprecated-features` --- modules/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nix/default.nix b/modules/nix/default.nix index ef46e63..a66b56f 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -35,7 +35,7 @@ # "mlabs.cachix.org-1:gStKdEqNKcrlSQw5iMW6wFCj3+b+1ASpBVY2SYuNV2M=" "nixfleet:Bud23440n6mMTmgq/7U+mk91zlLjnx2X3lQQrCBCCU4=" ]; - deprecated-features = [ "url-literals" ]; + # deprecated-features = [ "url-literals" ]; }; nixPath = [ "nixpkgs=${fleetFlake.inputs.nixpkgs}" ]; From 33175c575774c996ba6f5273bce9cccbbd5e4141 Mon Sep 17 00:00:00 2001 From: Seven of Nine Date: Mon, 26 May 2025 15:02:07 +0000 Subject: [PATCH 03/17] 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/96e078c646b711aee04b82ba01aefbff87004ded' (2025-04-26) → 'github:ryantm/agenix/4835b1dc898959d8547a871ef484930675cb47f1' (2025-05-18) • Updated input 'catppuccin': 'github:catppuccin/nix/a5db9e41a4dccfa5ffe38e6f1841a5f9ad5c5c04' (2025-05-02) → 'github:catppuccin/nix/0ba11b12be81f0849a89ed17ab635164ea8f0112' (2025-05-24) • Updated input 'disko': 'github:nix-community/disko/d0c543d740fad42fe2c035b43c9d41127e073c78' (2025-04-28) → 'github:nix-community/disko/a894f2811e1ee8d10c50560551e50d6ab3c392ba' (2025-05-26) • Updated input 'dream2nix': 'github:nix-community/dream2nix/8ce6284ff58208ed8961681276f82c2f8f978ef4' (2024-12-25) → 'github:nix-community/dream2nix/6fd6d9188f32efd1e1656b3c3e63a67f9df7b636' (2025-05-19) • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/66bb2d7a4df96d0c1e63648850b7aed1b2e8d683' (2025-05-03) → 'github:nix-community/emacs-overlay/e048433838750a5fd9036e56dd8f59affa6d676b' (2025-05-26) • Updated input 'emacs-overlay/nixpkgs': 'github:NixOS/nixpkgs/f02fddb8acef29a8b32f10a335d44828d7825b78' (2025-05-01) → 'github:NixOS/nixpkgs/063f43f2dbdef86376cc29ad646c45c46e93234c' (2025-05-23) • Updated input 'emacs-overlay/nixpkgs-stable': 'github:NixOS/nixpkgs/bf3287dac860542719fe7554e21e686108716879' (2025-05-02) → 'github:NixOS/nixpkgs/f09dede81861f3a83f7f06641ead34f02f37597f' (2025-05-23) • Updated input 'git-hooks-nix': 'github:cachix/git-hooks.nix/dcf5072734cb576d2b0c59b2ac44f5050b5eac82' (2025-03-22) → 'github:cachix/git-hooks.nix/80479b6ec16fefd9c1db3ea13aeb038c60530f46' (2025-05-16) • Updated input 'homeManager': 'github:nix-community/home-manager/c0962eeeabfb8127713f859ec8a5f0e86dead0f2' (2025-05-03) → 'github:nix-community/home-manager/d23d20f55d49d8818ac1f1b2783671e8a6725022' (2025-05-26) • Updated input 'lanzaboote': 'github:nix-community/lanzaboote/995637eb3ab78eac33f8ee6b45cc2ecd5ede12ba' (2025-04-21) → 'github:nix-community/lanzaboote/2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85' (2025-05-12) • Updated input 'lanzaboote/crane': 'github:ipetkov/crane/bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5' (2025-03-09) → 'github:ipetkov/crane/dfd9a8dfd09db9aad544c4d3b6c47b12562544a5' (2025-05-03) • Updated input 'lanzaboote/flake-parts': 'github:hercules-ci/flake-parts/f4330d22f1c5d2ba72d3d22df5597d123fdb60a9' (2025-03-07) → 'github:hercules-ci/flake-parts/c621e8422220273271f52058f618c94e405bb0f5' (2025-04-01) • Updated input 'lanzaboote/pre-commit-hooks-nix': 'github:cachix/pre-commit-hooks.nix/b5a62751225b2f62ff3147d0a334055ebadcd5cc' (2025-03-07) → 'github:cachix/pre-commit-hooks.nix/fa466640195d38ec97cf0493d6d6882bc4d14969' (2025-05-06) • Updated input 'lanzaboote/rust-overlay': 'github:oxalica/rust-overlay/c777dc8a1e35407b0e80ec89817fe69970f4e81a' (2025-03-10) → 'github:oxalica/rust-overlay/5b07506ae89b025b14de91f697eba23b48654c52' (2025-05-12) • Updated input 'lix': 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=4e84fd9a0061a04627ec6962c0ed08c2ad0b8a7f' (2025-05-02) → 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=dbff52bfbc48ead789888bf24422d0ef6f7ba9a8' (2025-05-25) • Updated input 'lix-module': 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=fa69ae26cc32dda178117b46487c2165c0e08316' (2025-03-25) → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=3c23c6ae2aecc1f76ae7993efe1a78b5316f0700' (2025-05-19) • Updated input 'mobile-nixos': 'github:NixOS/mobile-nixos/6679fd7a8dd4ccf4aa538b82216723861cfe61a2' (2025-04-05) → 'github:NixOS/mobile-nixos/6e249e58b5d8166738ebcfd401f05f7496049dd3' (2025-05-25) • Updated input 'nix-on-droid': 'github:nix-community/nix-on-droid/5d88ff2519e4952f8d22472b52c531bb5f1635fc' (2024-09-06) → 'github:nix-community/nix-on-droid/40b8c7465f78887279a0a3c743094fa6ea671ab1' (2025-05-16) • Updated input 'nixosHardware': 'github:NixOS/nixos-hardware/72081c9fbbef63765ae82bff9727ea79cc86bd5b' (2025-04-29) → 'github:NixOS/nixos-hardware/11f2d9ea49c3e964315215d6baa73a8d42672f06' (2025-05-22) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/f02fddb8acef29a8b32f10a335d44828d7825b78' (2025-05-01) → 'github:NixOS/nixpkgs/063f43f2dbdef86376cc29ad646c45c46e93234c' (2025-05-23) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/29ec5026372e0dec56f890e50dbe4f45930320fd' (2025-05-02) → 'github:numtide/treefmt-nix/1f3f7b784643d488ba4bf315638b2b0a4c5fb007' (2025-05-26) --- flake.lock | 130 ++++++++++++++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/flake.lock b/flake.lock index 474c3aa..c3bbb09 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1745630506, - "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", + "lastModified": 1747575206, + "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", "owner": "ryantm", "repo": "agenix", - "rev": "96e078c646b711aee04b82ba01aefbff87004ded", + "rev": "4835b1dc898959d8547a871ef484930675cb47f1", "type": "github" }, "original": { @@ -26,11 +26,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1746175539, - "narHash": "sha256-/wjcn1CDQqOhwOoYKS8Xp0KejrdXSJZQMF1CbbrVtMw=", + "lastModified": 1748080874, + "narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=", "owner": "catppuccin", "repo": "nix", - "rev": "a5db9e41a4dccfa5ffe38e6f1841a5f9ad5c5c04", + "rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112", "type": "github" }, "original": { @@ -41,11 +41,11 @@ }, "crane": { "locked": { - "lastModified": 1741481578, - "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", + "lastModified": 1746291859, + "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", "owner": "ipetkov", "repo": "crane", - "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", + "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", "type": "github" }, "original": { @@ -83,11 +83,11 @@ ] }, "locked": { - "lastModified": 1745812220, - "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=", + "lastModified": 1748225455, + "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", "owner": "nix-community", "repo": "disko", - "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78", + "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", "type": "github" }, "original": { @@ -103,11 +103,11 @@ "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1735160684, - "narHash": "sha256-n5CwhmqKxifuD4Sq4WuRP/h5LO6f23cGnSAuJemnd/4=", + "lastModified": 1747658429, + "narHash": "sha256-qZWuEdxmPx818qR61t3mMozJOvZSmTRUDPU4L3JeGgE=", "owner": "nix-community", "repo": "dream2nix", - "rev": "8ce6284ff58208ed8961681276f82c2f8f978ef4", + "rev": "6fd6d9188f32efd1e1656b3c3e63a67f9df7b636", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1746240489, - "narHash": "sha256-DWMG7jkpxrEGzTZZerDqaxT8X983tibFGfNeoWtX1yU=", + "lastModified": 1748248657, + "narHash": "sha256-zqhc7qyoRmgZpkvjocYEui9xYlzL90nqPf40zADGruM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "66bb2d7a4df96d0c1e63648850b7aed1b2e8d683", + "rev": "e048433838750a5fd9036e56dd8f59affa6d676b", "type": "github" }, "original": { @@ -191,11 +191,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -282,11 +282,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1746243165, - "narHash": "sha256-DQycVmlyLQNLjLJ/FzpokVmbxGQ8HjQQ4zN4nyq2vII=", + "lastModified": 1748227609, + "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", "owner": "nix-community", "repo": "home-manager", - "rev": "c0962eeeabfb8127713f859ec8a5f0e86dead0f2", + "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", "type": "github" }, "original": { @@ -448,11 +448,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1745271491, - "narHash": "sha256-4GAHjus6JRpYHVROMIhFIz/sgLDF/klBM3UHulbSK9s=", + "lastModified": 1747056319, + "narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "995637eb3ab78eac33f8ee6b45cc2ecd5ede12ba", + "rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1746186329, - "narHash": "sha256-MLz0MjeVCaqvIvf5szUwNwYEiXC/lKWL0I2VS+6V/e0=", + "lastModified": 1748182888, + "narHash": "sha256-tm3yi3KL+KjMnLZFXKR1ioI/Rk8DIa2n1NNE6I99BpU=", "ref": "refs/heads/main", - "rev": "4e84fd9a0061a04627ec6962c0ed08c2ad0b8a7f", - "revCount": 17824, + "rev": "dbff52bfbc48ead789888bf24422d0ef6f7ba9a8", + "revCount": 17946, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1742945498, - "narHash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=", + "lastModified": 1747667424, + "narHash": "sha256-7EICjbmG6lApWKhFtwvZovdcdORY1CEe6/K7JwtpYfs=", "ref": "refs/heads/main", - "rev": "fa69ae26cc32dda178117b46487c2165c0e08316", - "revCount": 138, + "rev": "3c23c6ae2aecc1f76ae7993efe1a78b5316f0700", + "revCount": 144, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -505,11 +505,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1743812405, - "narHash": "sha256-BedQ9Z3+nqtp9BRjHjJNPUeLIMVbTsP3Udbz0b1cUn0=", + "lastModified": 1748200777, + "narHash": "sha256-ELbQ7Apk0QzfhO8WjQIqEBuN2bEnGQHNxeiOSx/mU38=", "owner": "NixOS", "repo": "mobile-nixos", - "rev": "6679fd7a8dd4ccf4aa538b82216723861cfe61a2", + "rev": "6e249e58b5d8166738ebcfd401f05f7496049dd3", "type": "github" }, "original": { @@ -554,11 +554,11 @@ "nmd": "nmd" }, "locked": { - "lastModified": 1725658585, - "narHash": "sha256-P29z4Gt89n5ps1U7+qmIrj0BuRXGZQSIaOe2+tsPgfw=", + "lastModified": 1747382160, + "narHash": "sha256-nlHPjA5GH4wdwnAoOzCt7BVLUKtIAAW2ClNGz2OxTrs=", "owner": "nix-community", "repo": "nix-on-droid", - "rev": "5d88ff2519e4952f8d22472b52c531bb5f1635fc", + "rev": "40b8c7465f78887279a0a3c743094fa6ea671ab1", "type": "github" }, "original": { @@ -569,11 +569,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1745955289, - "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -647,11 +647,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1746183838, - "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", + "lastModified": 1748037224, + "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bf3287dac860542719fe7554e21e686108716879", + "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", "type": "github" }, "original": { @@ -711,11 +711,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1746141548, - "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -742,11 +742,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1746141548, - "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -821,11 +821,11 @@ ] }, "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "lastModified": 1746537231, + "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "type": "github" }, "original": { @@ -906,11 +906,11 @@ ] }, "locked": { - "lastModified": 1741573199, - "narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=", + "lastModified": 1747017456, + "narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a", + "rev": "5b07506ae89b025b14de91f697eba23b48654c52", "type": "github" }, "original": { @@ -1009,11 +1009,11 @@ ] }, "locked": { - "lastModified": 1746216483, - "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", + "lastModified": 1748243702, + "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", + "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", "type": "github" }, "original": { From 0a8e49517d6af14cb95d50b36394902ac0ac14b9 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 26 May 2025 17:32:59 +0200 Subject: [PATCH 04/17] Re-enable MLabs cache --- modules/nix/default.nix | 4 ++-- secrets/nix-netrc.age | Bin 1558 -> 1739 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nix/default.nix b/modules/nix/default.nix index a66b56f..c580579 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -25,14 +25,14 @@ "https://cache.iog.io" "https://cache.lix.systems" "https://nix-community.cachix.org" - # "https://mlabs.cachix.org" + "https://mlabs.cachix.org" "http://sisko.wg.aciceri.dev:8081/nixfleet" ]; trusted-public-keys = [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - # "mlabs.cachix.org-1:gStKdEqNKcrlSQw5iMW6wFCj3+b+1ASpBVY2SYuNV2M=" + "mlabs.cachix.org-1:gStKdEqNKcrlSQw5iMW6wFCj3+b+1ASpBVY2SYuNV2M=" "nixfleet:Bud23440n6mMTmgq/7U+mk91zlLjnx2X3lQQrCBCCU4=" ]; # deprecated-features = [ "url-literals" ]; diff --git a/secrets/nix-netrc.age b/secrets/nix-netrc.age index 7b0438f51792139cfc5411d21633bbda8cd428b9..f2dd53c210997ed9f05d3288615896cfae9fa8fc 100644 GIT binary patch delta 1657 zcmbQnbDDR8PJNzBWu=dgms47RcWGf(c%@lVxk-j$o^yJUvtL?3PO5o+RZfP#c4She zBbR@GYeYaqsiU?_k+w@xaDb0zh+$e(ZkmgiYowF2X=sjrxVy7YnrnVwIhU@TLUD11 zZfc5=si~o*f_7O-P@bcLcTS*hMp9*WplSM^VWPppKdwPgTW>SE!g@0gWWPw+)Yo>Af z#E;_PmY#0uC5fg1CXt0E-o-_RK5m7f=>^9Ae*RwC1r>g&UL~2Pk=iLmULM(8LBZZx z2F7k4&IO)+<(A1AMcQF`>BU*OXA;~B-n!}Bc+9W4?I zOS4S0LkkUxj6+QUAzsF z@|?m$b2IY1i?w~jb8}PtD_lxVy-V`4qx@YbpJf!UuZ$=xs_^%(3N`Ra%5!y(s!BJ` z3d=Jv3v&u73orL9H8l(H^Ye7^iONmqvh;Ea^UEx@^zbwF%rq?u%Xjs0bqv4Tucn($&>fs0xelDGSccj0g_Sw}>z^Ep*L`$_yz9snRbuH_|uC zGqp&qcQSA<49zg~T85 z;$_1B-dSz!`!&b%@r%o;Z+)US)G$rHKi@fmCHioSm{Weeerm`3_!5)P?^Yf9|H%1+ zfYnsS9ecNL=Xv@1K6~QP&FXbwCzj;#CVXGr)c$?Vg2_9jn?tghE-aRMUG&%Ix{j~K z&xa20jckKEojg{b5U&q1?8z{*5%&D|I|D_wYERc*n@xk@v_O4GHvPx0H zljcV=7lhr|cUpw^)>UECby=d#cK=!}vfSqs2wF{7ko?8_-FDRyNnPv5{;@2Zc9|Z! zqT}7}dAZ?x#ZeEw2gjCgpUbnEy=PaIKYNJcl+r!Y#%f0wzLP9w~AcjlJAjKOFY#%;no#AKu-; zC9s?8OajMB`>;?U=L?S+`D(=z*Cef+!1Hs}iI@eSEu`$T-|f8eHf2NeQ@5#)=S;43 za^JV-;Sv3X>?{GU!jmR@-zl8DuHt$<|ATEM6PGIfH&`S*(a&+o;<&k`99xe+s961} zwM}zZ!OkBZtzxnNCPt>N)!Z`Ep~%#oY2WM6??=|Zmk}yd^IA96uwYl9seNivK(6zo zjPMhjMpNUK_q|bnbZzdz=CgNO4K*2dUR(GnGWU@7hF|kvD)QEzvgJ;h*el!jisNW9 z_wD++^}A0T*qLlROR?aqXyBU(T~c0QEn9t`|1iIDuw&)pb9d{*W@ z!<_J2v&5OFs;mmQt8}Dz*Cd|{2c}+ICA~&zk0kTSK&H`{&$Yo zZk2!KzGwGs{?27NeBT2Pt$x*i@g(mT?vsb~_9VQX8FZ%J%`@U(!JBJ>i{?!{&f{(A zSt!-CCSdc0u+>Ix{;$3pF!b%;c}BOl;i_Q5`I`|Xe~!!l4wbJiPk2(fqfVcHEzb`@ z#_6249g)*-?EfjT{q+yUCV`)EOIY6=s^dF9d5PHLJURX+Pp4RYev`2>H6z_C{q|x0 zlW&vybc9~~ncJ;4vAn+Ih1=B9l%;$kXD9Bdn!Eebvd)0qEbiow`>ZbUaoIk-vLfl< zwS?{7X)diP^E|fvYxBRzqxy8iy$`SB_HDcU++maW;$GH^z9p$Y7g(#_yt2G`#g$_} z?>qne+1{)@W%_1M#SO(4cTSlcdeO8YB~MxQ#W5?!kB$@d3oAq2{ptfU&J-MpdB5j& zNY&1;Buj=5i895-H>LK)#wh&zkskalLv?A5p<1EG4Eg3NaS7H_E>TH8*PF)t7u|gO zmUKX-!y*AgpKbFlmhYQlQae|nYNhjW&JT(!3LZZ?+40y$cfz%Bt5zqr^EZ}vPLY!A Mcy3^By+hFj06$XRX8-^I delta 1475 zcmX@jJB??8PJM`Tae=#suX9jUcu}6KnSX?Pn6qDmWwyItP+(e0W>RU8qp^i$aa3Wh zBbQHBNkpQhxn)sQv0t{2d#XoZiL;lJfp0`|NxoyTM|q&3kx8X#xuaKUI+w1ULUD11 zZfc5=si~o*f_7O-P@bbgdT>T+ZmMBsL1BQaiL0rli(7H2dswnlX}E<+vV~)qzjIhY zs#{obW|d(vSD8~qo@s4d;~B-nLxUqSQ!=Z( zvZ{&J%L(wT%Jq-P z$S(IS@N_LoaZB+v%s0#C($&>fFpKaHG7R)L^bB-1$P3EMbMy~&@~jLi^a>A3GjOtW zarUgJ4@oW3_9^!_;7XV-xgdF==m80aw}GCQS6@tZ%`khR`?gC1L;4JyJ{WZOG1<5tjO6eg2K-3>VJq)Kpumf8w$IKhHOBR!b@f zAIn&n{Qu!!@7D`=)i-+xxt{Q!(Cu-@1GY_!fCYZf~%4_v8A_K~)l7%D>c26=tqA{5@mQ?ekBT z>}jl@acxf+b9i05g{B1~`=-}RybI?2$bWiIzG?e2!?uV6lkYf1T-nzYoVsE0+6O;F zR$o2hw!L=R;}z*9BL0iQ{DvGvO+_KDe6(`rqU@HT2mvM>&mtpGbr5V z+VVx^;*N-@by2SM4bK-}P|z{iRXVdYM0s)TwBrq0>*{^gGM?m|mJehli|$?_zGr|J3K zZOfh0EY~k$WO$Y0T&2gmNX5srM=O&f;Oe1ZX@ji0zQ-jpHt|{V^Qc!;1?~J8ad>4( zb?W-6!#*-ko6f0QRjaEhnVu}0Tch$~+i%}X)@SnSA8r?zQB_@Emc!8Y;*{GftvjDM ZCq6uv)S6Nn!fl(pCQR^^LH{uoQvejKi**11 From 23b18548997057e84cecddf9dfaa511a265d9c7f Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 28 May 2025 10:07:38 +0200 Subject: [PATCH 05/17] Add `pdflatex` used by Emacs for exporting org files to pdf --- hmModules/emacs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hmModules/emacs/default.nix b/hmModules/emacs/default.nix index ccaccea..ffd5c5a 100644 --- a/hmModules/emacs/default.nix +++ b/hmModules/emacs/default.nix @@ -49,6 +49,7 @@ in copilot-language-server.fhs math-preview emacs-lsp-booster + texlive.combined.scheme-full ] ++ (with hunspellDicts; [ en_US-large From 0c91357de8a4d55f47e6676b8214663916449c35 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 28 May 2025 10:08:00 +0200 Subject: [PATCH 06/17] Re-enable `url-literals` --- modules/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nix/default.nix b/modules/nix/default.nix index c580579..26f40d5 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -35,7 +35,7 @@ "mlabs.cachix.org-1:gStKdEqNKcrlSQw5iMW6wFCj3+b+1ASpBVY2SYuNV2M=" "nixfleet:Bud23440n6mMTmgq/7U+mk91zlLjnx2X3lQQrCBCCU4=" ]; - # deprecated-features = [ "url-literals" ]; + deprecated-features = [ "url-literals" ]; # despite a warning saying that this option doesn't exist it seems to work }; nixPath = [ "nixpkgs=${fleetFlake.inputs.nixpkgs}" ]; From 41656bdf55f29bd25304e0e2640850df4358d0e3 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 28 May 2025 12:02:46 +0200 Subject: [PATCH 07/17] Bump inputs --- flake.lock | 130 ++++++++++++++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/flake.lock b/flake.lock index 474c3aa..57c9178 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1745630506, - "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", + "lastModified": 1747575206, + "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", "owner": "ryantm", "repo": "agenix", - "rev": "96e078c646b711aee04b82ba01aefbff87004ded", + "rev": "4835b1dc898959d8547a871ef484930675cb47f1", "type": "github" }, "original": { @@ -26,11 +26,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1746175539, - "narHash": "sha256-/wjcn1CDQqOhwOoYKS8Xp0KejrdXSJZQMF1CbbrVtMw=", + "lastModified": 1748080874, + "narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=", "owner": "catppuccin", "repo": "nix", - "rev": "a5db9e41a4dccfa5ffe38e6f1841a5f9ad5c5c04", + "rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112", "type": "github" }, "original": { @@ -41,11 +41,11 @@ }, "crane": { "locked": { - "lastModified": 1741481578, - "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", + "lastModified": 1746291859, + "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", "owner": "ipetkov", "repo": "crane", - "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", + "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", "type": "github" }, "original": { @@ -83,11 +83,11 @@ ] }, "locked": { - "lastModified": 1745812220, - "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=", + "lastModified": 1748225455, + "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", "owner": "nix-community", "repo": "disko", - "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78", + "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", "type": "github" }, "original": { @@ -103,11 +103,11 @@ "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1735160684, - "narHash": "sha256-n5CwhmqKxifuD4Sq4WuRP/h5LO6f23cGnSAuJemnd/4=", + "lastModified": 1747658429, + "narHash": "sha256-qZWuEdxmPx818qR61t3mMozJOvZSmTRUDPU4L3JeGgE=", "owner": "nix-community", "repo": "dream2nix", - "rev": "8ce6284ff58208ed8961681276f82c2f8f978ef4", + "rev": "6fd6d9188f32efd1e1656b3c3e63a67f9df7b636", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1746240489, - "narHash": "sha256-DWMG7jkpxrEGzTZZerDqaxT8X983tibFGfNeoWtX1yU=", + "lastModified": 1748309015, + "narHash": "sha256-NVgo/saT8uehYYwwhzWrTTFlpH0icR2E3tHHKsUouJ4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "66bb2d7a4df96d0c1e63648850b7aed1b2e8d683", + "rev": "0fba546d9aa235fc726fe9c8c3bb703e918c14c4", "type": "github" }, "original": { @@ -191,11 +191,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -282,11 +282,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1746243165, - "narHash": "sha256-DQycVmlyLQNLjLJ/FzpokVmbxGQ8HjQQ4zN4nyq2vII=", + "lastModified": 1748391243, + "narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=", "owner": "nix-community", "repo": "home-manager", - "rev": "c0962eeeabfb8127713f859ec8a5f0e86dead0f2", + "rev": "f5b12be834874f7661db4ced969a621ab2d57971", "type": "github" }, "original": { @@ -448,11 +448,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1745271491, - "narHash": "sha256-4GAHjus6JRpYHVROMIhFIz/sgLDF/klBM3UHulbSK9s=", + "lastModified": 1747056319, + "narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "995637eb3ab78eac33f8ee6b45cc2ecd5ede12ba", + "rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1746186329, - "narHash": "sha256-MLz0MjeVCaqvIvf5szUwNwYEiXC/lKWL0I2VS+6V/e0=", + "lastModified": 1748388700, + "narHash": "sha256-abzcNgnyZTX84EjRu6KAAauDv61OkTRRDc+jB8BxrBE=", "ref": "refs/heads/main", - "rev": "4e84fd9a0061a04627ec6962c0ed08c2ad0b8a7f", - "revCount": 17824, + "rev": "fda93021ca8bf43de1e43c223b439b41c3990e4c", + "revCount": 17958, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1742945498, - "narHash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=", + "lastModified": 1747667424, + "narHash": "sha256-7EICjbmG6lApWKhFtwvZovdcdORY1CEe6/K7JwtpYfs=", "ref": "refs/heads/main", - "rev": "fa69ae26cc32dda178117b46487c2165c0e08316", - "revCount": 138, + "rev": "3c23c6ae2aecc1f76ae7993efe1a78b5316f0700", + "revCount": 144, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -505,11 +505,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1743812405, - "narHash": "sha256-BedQ9Z3+nqtp9BRjHjJNPUeLIMVbTsP3Udbz0b1cUn0=", + "lastModified": 1748200777, + "narHash": "sha256-ELbQ7Apk0QzfhO8WjQIqEBuN2bEnGQHNxeiOSx/mU38=", "owner": "NixOS", "repo": "mobile-nixos", - "rev": "6679fd7a8dd4ccf4aa538b82216723861cfe61a2", + "rev": "6e249e58b5d8166738ebcfd401f05f7496049dd3", "type": "github" }, "original": { @@ -554,11 +554,11 @@ "nmd": "nmd" }, "locked": { - "lastModified": 1725658585, - "narHash": "sha256-P29z4Gt89n5ps1U7+qmIrj0BuRXGZQSIaOe2+tsPgfw=", + "lastModified": 1747382160, + "narHash": "sha256-nlHPjA5GH4wdwnAoOzCt7BVLUKtIAAW2ClNGz2OxTrs=", "owner": "nix-community", "repo": "nix-on-droid", - "rev": "5d88ff2519e4952f8d22472b52c531bb5f1635fc", + "rev": "40b8c7465f78887279a0a3c743094fa6ea671ab1", "type": "github" }, "original": { @@ -569,11 +569,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1745955289, - "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -647,11 +647,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1746183838, - "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", + "lastModified": 1748037224, + "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bf3287dac860542719fe7554e21e686108716879", + "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", "type": "github" }, "original": { @@ -711,11 +711,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1746141548, - "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -742,11 +742,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1746141548, - "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -821,11 +821,11 @@ ] }, "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "lastModified": 1746537231, + "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "type": "github" }, "original": { @@ -906,11 +906,11 @@ ] }, "locked": { - "lastModified": 1741573199, - "narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=", + "lastModified": 1747017456, + "narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a", + "rev": "5b07506ae89b025b14de91f697eba23b48654c52", "type": "github" }, "original": { @@ -1009,11 +1009,11 @@ ] }, "locked": { - "lastModified": 1746216483, - "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", + "lastModified": 1748243702, + "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", + "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", "type": "github" }, "original": { From 6bdf2e95c1470377ea5f06e1efcb4f627808615d Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 28 May 2025 13:58:17 +0200 Subject: [PATCH 08/17] Remove `impure-derivations` (not experimental anymore?) --- modules/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 26f40d5..e8dedc8 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -41,7 +41,7 @@ nixPath = [ "nixpkgs=${fleetFlake.inputs.nixpkgs}" ]; extraOptions = '' - experimental-features = nix-command flakes impure-derivations + experimental-features = nix-command flakes builders-use-substitutes = true ''; From 197463cc08da1b2f048f8b493d7d96efb62d2a41 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 28 May 2025 14:44:07 +0200 Subject: [PATCH 09/17] Test `push-to-cache` script --- .forgejo/workflows/build.yaml | 4 +++- checks/default.nix | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index a2224c0..6edae8f 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -16,6 +16,8 @@ jobs: chmod 600 ~/.ssh/id_ed25519 ssh-keyscan github.com >> ~/.ssh/known_hosts - name: Build with nix (x86_64-linux) - run: nix-fast-build --no-nom --systems "x86_64-linux aarch64-linux" --attic-cache "nixfleet" --skip-cached --result-file result.json || true + run: nix-fast-build --no-nom --systems "x86_64-linux aarch64-linux" --skip-cached --result-file result.json || true + - name: Push to cache + run: nix run .#push-to-cache -- nixfleet - name: Report checks run: report-checks diff --git a/checks/default.nix b/checks/default.nix index ae2c491..9030d41 100644 --- a/checks/default.nix +++ b/checks/default.nix @@ -11,7 +11,7 @@ ]; perSystem = - { config, ... }: + { config, pkgs, ... }: { treefmt.config = { projectRootFile = ".git/config"; @@ -42,6 +42,18 @@ package = config.treefmt.build.wrapper; }; }; + packages.push-to-cache = + let + allChecks = with self.checks; x86_64-linux // aarch64-linux; + checks = builtins.removeAttrs allChecks [ "push-to-cache" ]; + in + pkgs.writeShellScriptBin "push-to-cache.sh" '' + attic push $1 --stdin --jobs 64 << EOF + ${lib.concatStringsSep "\n" ( + builtins.map (builtins.unsafeDiscardStringContext) (builtins.attrValues checks) + )} + EOF + ''; }; flake.checks = @@ -49,7 +61,9 @@ build = _: nc: nc.config.system.build.toplevel; in { - x86_64-linux = lib.mapAttrs build { inherit (self.nixosConfigurations) picard pike kirk; }; + x86_64-linux = (lib.mapAttrs build { inherit (self.nixosConfigurations) picard pike kirk; }) // { + inherit (self.checks.x86_64-linux) push-to-cache; + }; aarch64-linux = lib.mapAttrs build { inherit (self.nixosConfigurations) sisko; # pbp; }; From c6f951a347a7939a43279f4dc00ec05a537a133e Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 28 May 2025 14:58:53 +0200 Subject: [PATCH 10/17] Re-enable `--attic-cache` in `nix-fast-build` --- .forgejo/workflows/build.yaml | 4 +--- checks/default.nix | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 6edae8f..a2224c0 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -16,8 +16,6 @@ jobs: chmod 600 ~/.ssh/id_ed25519 ssh-keyscan github.com >> ~/.ssh/known_hosts - name: Build with nix (x86_64-linux) - run: nix-fast-build --no-nom --systems "x86_64-linux aarch64-linux" --skip-cached --result-file result.json || true - - name: Push to cache - run: nix run .#push-to-cache -- nixfleet + run: nix-fast-build --no-nom --systems "x86_64-linux aarch64-linux" --attic-cache "nixfleet" --skip-cached --result-file result.json || true - name: Report checks run: report-checks diff --git a/checks/default.nix b/checks/default.nix index 9030d41..f82204c 100644 --- a/checks/default.nix +++ b/checks/default.nix @@ -61,9 +61,7 @@ build = _: nc: nc.config.system.build.toplevel; in { - x86_64-linux = (lib.mapAttrs build { inherit (self.nixosConfigurations) picard pike kirk; }) // { - inherit (self.checks.x86_64-linux) push-to-cache; - }; + x86_64-linux = (lib.mapAttrs build { inherit (self.nixosConfigurations) picard pike kirk; }); aarch64-linux = lib.mapAttrs build { inherit (self.nixosConfigurations) sisko; # pbp; }; From 650c787cdcfe12db7940121446912d55b0819d1c Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 28 May 2025 16:30:08 +0200 Subject: [PATCH 11/17] Connect `picard` to the MLabs VPN --- hosts/default.nix | 1 + hosts/picard/default.nix | 1 + modules/wireguard-mlabs/default.nix | 15 +++++++++++++++ secrets/secrets.nix | 6 ++++++ secrets/wireguard-mlabs-private-key.age | 12 ++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 modules/wireguard-mlabs/default.nix create mode 100644 secrets/wireguard-mlabs-private-key.age diff --git a/hosts/default.nix b/hosts/default.nix index efdd865..170cd88 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -89,6 +89,7 @@ "forgejo-runners-token".owner = "nixuser"; "forgejo-nix-access-tokens".owner = "nixuser"; "nix-netrc" = { }; + "wireguard-mlabs-private-key" = { }; }; }; diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 02271ff..bf4c0c7 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -41,6 +41,7 @@ "prometheus-exporters" "zerotier" "alloy" + "wireguard-mlabs" ] ++ [ ./disko.nix ]; diff --git a/modules/wireguard-mlabs/default.nix b/modules/wireguard-mlabs/default.nix new file mode 100644 index 0000000..2d583f7 --- /dev/null +++ b/modules/wireguard-mlabs/default.nix @@ -0,0 +1,15 @@ +{ config, ... }: +{ + networking.wireguard.interfaces.wg1 = { + ips = [ "10.10.1.1/32" ]; + peers = [ + { + publicKey = "A4u2Rt5WEMHOAc6YpDABkqAy2dzzFLH9Gn8xWcKaPQQ="; + allowedIPs = [ "10.10.0.0/16" ]; + endpoint = "vpn.staging.mlabs.city:51820"; + persistentKeepalive = 25; + } + ]; + privateKeyFile = config.age.secrets.wireguard-mlabs-private-key.path; + }; +} diff --git a/secrets/secrets.nix b/secrets/secrets.nix index fd1bca9..8646ff3 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -164,6 +164,12 @@ with keys.users; picard kirk ]; + "wireguard-mlabs-private-key.age".publicKeys = [ + ccr-ssh + picard + pike + kirk + ]; # WireGuard "picard-wireguard-private-key.age".publicKeys = [ diff --git a/secrets/wireguard-mlabs-private-key.age b/secrets/wireguard-mlabs-private-key.age new file mode 100644 index 0000000..363e217 --- /dev/null +++ b/secrets/wireguard-mlabs-private-key.age @@ -0,0 +1,12 @@ +age-encryption.org/v1 +-> ssh-ed25519 Zh7Kmw 1pcva3l9KyvXlzWJVeul63s1xnL2yEMzuB1R73IdKlA +TDDa9yQYXrqFS+MCEeqCcQ/27zu3WytSmU5MBNyQTIk +-> ssh-ed25519 /WmILg z9/JeIxSpzndNP+1fwfdRfKYTaNp7wVITCkF7wwayEs +8PlFDHZbA0Z/3svhPWGE/sHfsMNmuXrdP6Qf0FhLMmc +-> ssh-ed25519 OYRzvQ Tk0mN20c8199ZvTY6jXY6ExSXGR3kb4qtnj8HkPj1xY +5SGMhFzIE98NgNw7bnnivVTvuKtBtJdf/2jAjJUSKl8 +-> ssh-ed25519 /yLdGQ 8J4LLlxtMFW8fALPGUk/NaHIJ59bo9tKe5TGiGAvYhk +sgE0SQi169mEtltDWIb4ZZaXKUXORyiKhmOZsNOiqKU +--- sWbCYolqfqwIsja6nNdyPBcOeM/Qq5GninMokUvK4xE +ʼngz{4 X? +A e"v\Ho,m}bq$h:fGkF=#0q \ No newline at end of file From 5fa324bfa2e1db738be456cc99c9a2daca6524d3 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 28 May 2025 20:33:11 +0200 Subject: [PATCH 12/17] Enable `unison` on `pike` --- hosts/pike/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/pike/default.nix b/hosts/pike/default.nix index c1c2579..bd39cf3 100644 --- a/hosts/pike/default.nix +++ b/hosts/pike/default.nix @@ -89,6 +89,7 @@ "pantalaimon" "gimp" "jellyfin" + "unison" ]; extraGroups = [ "plugdev" ]; backupPaths = [ ]; From 908508743bfef1e30e6f4dd0562ca4efab9de770 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 29 May 2025 10:42:13 +0200 Subject: [PATCH 13/17] Move Nginx virtual hosts to relative modules --- modules/home-assistant/default.nix | 13 ++++ modules/immich/default.nix | 12 ++++ modules/sisko-proxy/default.nix | 104 +---------------------------- 3 files changed, 27 insertions(+), 102 deletions(-) diff --git a/modules/home-assistant/default.nix b/modules/home-assistant/default.nix index 086e8e7..3801ed8 100644 --- a/modules/home-assistant/default.nix +++ b/modules/home-assistant/default.nix @@ -163,6 +163,19 @@ in config.services.home-assistant.configDir ]; + services.nginx.virtualHosts."home.aciceri.dev" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:${builtins.toString config.services.home-assistant.config.http.server_port}"; + proxyWebsockets = true; + }; + extraConfig = '' + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + ''; + }; + # virtualisation.oci-containers = { # backend = "podman"; # containers.homeassistant = { diff --git a/modules/immich/default.nix b/modules/immich/default.nix index bf93484..505d325 100644 --- a/modules/immich/default.nix +++ b/modules/immich/default.nix @@ -22,4 +22,16 @@ fsType = "ext4"; options = [ "bind" ]; }; + + services.nginx.virtualHosts."photos.aciceri.dev" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:${builtins.toString config.services.immich.port}"; + proxyWebsockets = true; + }; + extraConfig = '' + client_max_body_size 50000M; + ''; + }; } diff --git a/modules/sisko-proxy/default.nix b/modules/sisko-proxy/default.nix index 19b32b5..2a79fec 100644 --- a/modules/sisko-proxy/default.nix +++ b/modules/sisko-proxy/default.nix @@ -1,105 +1,5 @@ -{ config, ... }: { imports = [ ../nginx-base ]; - services.nginx.virtualHosts = { - localhost.listen = [ { addr = "127.0.0.1"; } ]; - "home.aciceri.dev" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:${builtins.toString config.services.home-assistant.config.http.server_port}"; - proxyWebsockets = true; - }; - extraConfig = '' - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - ''; - }; - "home.sisko.aciceri.dev" = { - forceSSL = true; - useACMEHost = "aciceri.dev"; - locations."/" = { - proxyPass = "http://localhost:${builtins.toString config.services.home-assistant.config.http.server_port}"; - proxyWebsockets = true; - }; - extraConfig = '' - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - ''; - }; - "photos.aciceri.dev" = { - extraConfig = '' - client_max_body_size 50000M; - ''; - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:${builtins.toString config.services.immich.port}"; - proxyWebsockets = true; - }; - }; - # "${config.services.nextcloud.hostName}" = { - # forceSSL = true; - # enableACME = true; - # }; - # "sevenofnix.aciceri.dev" = { - # forceSSL = true; - # enableACME = true; - # locations."/" = { - # proxyPass = "http://10.1.1.2:${builtins.toString config.services.buildbot-master.port}"; - # proxyWebsockets = true; - # }; - # }; - }; - - # services.oauth2_proxy = { - # enable = true; - # provider = "oidc"; - # reverseProxy = true; - # # replaces following options with .keyFile - - # clientID = "shouldThisBePrivate?"; - # clientSecret = "thisShouldBePrivate"; - # cookie.secret = "thisShouldBePrivate00000"; - - # email.domains = [ "*" ]; - # extraConfig = { - # # custom-sign-in-logo = "${../../lib/mlabs-logo.svg}"; - # # scope = "user:email"; - # # banner = "MLabs Status"; - # # whitelist-domain = ".status.staging.mlabs.city"; - # oidc-issuer-url = "http://127.0.0.1:5556/dex"; - # }; - # # redirectURL = "https://status.staging.mlabs.city/oauth2/callback"; - # # keyFile = config.age.secrets.status-oauth2-secrets.path; - # # cookie.domain = ".status.staging.mlabs.city"; - # nginx = { - # virtualHosts = [ - # "search.aciceri.dev" - # ]; - # }; - # }; - - # services.dex = { - # enable = true; - # settings = { - # issuer = "http://127.0.0.1:5556/dex"; - # storage = { - # type = "postgres"; - # config.host = "/var/run/postgresql"; - # }; - # web = { - # http = "127.0.0.1:5556"; - # }; - # enablePasswordDB = true; - # staticClients = [ - # { - # # id = "oidcclient"; - # # name = "client"; - # # redirecturis = [ "https://login.aciceri.dev/callback" ]; - # # secretfile = "/etc/dex/oidcclient"; # the content of `secretfile` will be written into to the config as `secret`. - # } - # ]; - # }; - # }; + # TODO this file can be probably deleted now + # each module defining a virtualHost should import nginx-base } From 12b731ef9aa51f5ca73ef02809128f681a51b966 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 29 May 2025 15:33:16 +0200 Subject: [PATCH 14/17] Allow forwarding all traffic --- modules/wireguard-server/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/wireguard-server/default.nix b/modules/wireguard-server/default.nix index a02ccad..3b4b8bb 100644 --- a/modules/wireguard-server/default.nix +++ b/modules/wireguard-server/default.nix @@ -2,6 +2,7 @@ config, lib, vpn, + pkgs, ... }: { @@ -17,5 +18,13 @@ publicKey = vpnConfig.publicKey; allowedIPs = [ "${vpnConfig.ip}/32" ]; }) vpn; + + postSetup = '' + ${lib.getExeo' pkgs.iptables "iptables"} -t nat -A POSTROUTING -s 10.100.0.0/24 -o enP4p65s0 -j MASQUERADE + ''; + + postShutdown = '' + ${lib.getExe' pkgs.iptables "iptables"} -t nat -D POSTROUTING -s 10.100.0.0/24 -o enP4p65s0 -j MASQUERADE + ''; }; } From 4e90abc309e78b334d1fbba59a416119a293c33b Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 29 May 2025 15:34:51 +0200 Subject: [PATCH 15/17] Allow full tunnel --- modules/wireguard-client/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/wireguard-client/default.nix b/modules/wireguard-client/default.nix index 352aa40..28bc943 100644 --- a/modules/wireguard-client/default.nix +++ b/modules/wireguard-client/default.nix @@ -13,6 +13,7 @@ { publicKey = vpn.sisko.publicKey; allowedIPs = [ "10.100.0.0/24" ]; + # allowedIPs = [ "0.0.0.0/24" ]; # Uncomment for full tunnel endpoint = "vpn.aciceri.dev:51820"; persistentKeepalive = 25; } From 7303969233aec9a6a48546dfd561dc2263be72a3 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 29 May 2025 15:45:05 +0200 Subject: [PATCH 16/17] Fix typo --- modules/wireguard-server/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/wireguard-server/default.nix b/modules/wireguard-server/default.nix index 3b4b8bb..efb9b41 100644 --- a/modules/wireguard-server/default.nix +++ b/modules/wireguard-server/default.nix @@ -20,7 +20,7 @@ }) vpn; postSetup = '' - ${lib.getExeo' pkgs.iptables "iptables"} -t nat -A POSTROUTING -s 10.100.0.0/24 -o enP4p65s0 -j MASQUERADE + ${lib.getExe' pkgs.iptables "iptables"} -t nat -A POSTROUTING -s 10.100.0.0/24 -o enP4p65s0 -j MASQUERADE ''; postShutdown = '' From f4278559f9b7d8525f3045109dc986505ed7cc2d Mon Sep 17 00:00:00 2001 From: Seven of Nine Date: Tue, 3 Jun 2025 09:42:50 +0000 Subject: [PATCH 17/17] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/a894f2811e1ee8d10c50560551e50d6ab3c392ba' (2025-05-26) → 'github:nix-community/disko/58d6e5a83fff9982d57e0a0a994d4e5c0af441e4' (2025-06-02) • Updated input 'dream2nix': 'github:nix-community/dream2nix/6fd6d9188f32efd1e1656b3c3e63a67f9df7b636' (2025-05-19) → 'github:nix-community/dream2nix/e92dacdc57acaa6b2ae79592c1a62c2340931410' (2025-06-02) • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/0fba546d9aa235fc726fe9c8c3bb703e918c14c4' (2025-05-27) → 'github:nix-community/emacs-overlay/78278b770d2c83657657da569544cf20eccee0ef' (2025-06-03) • Updated input 'emacs-overlay/nixpkgs': 'github:NixOS/nixpkgs/62b852f6c6742134ade1abdd2a21685fd617a291' (2025-05-25) → 'github:NixOS/nixpkgs/910796cabe436259a29a72e8d3f5e180fc6dfacc' (2025-05-31) • Updated input 'emacs-overlay/nixpkgs-stable': 'github:NixOS/nixpkgs/f09dede81861f3a83f7f06641ead34f02f37597f' (2025-05-23) → 'github:NixOS/nixpkgs/78d9f40fd6941a1543ffc3ed358e19c69961d3c1' (2025-06-01) • Updated input 'flakeParts': 'github:hercules-ci/flake-parts/c621e8422220273271f52058f618c94e405bb0f5' (2025-04-01) → 'github:hercules-ci/flake-parts/49f0870db23e8c1ca0b5259734a02cd9e1e371a1' (2025-06-01) • Updated input 'flakeParts/nixpkgs-lib': 'github:nix-community/nixpkgs.lib/e4822aea2a6d1cdd36653c134cacfd64c97ff4fa' (2025-03-30) → 'github:nix-community/nixpkgs.lib/656a64127e9d791a334452c6b6606d17539476e2' (2025-06-01) • Updated input 'homeManager': 'github:nix-community/home-manager/f5b12be834874f7661db4ced969a621ab2d57971' (2025-05-28) → 'github:nix-community/home-manager/cb809ec1ff15cf3237c6592af9bbc7e4d983e98c' (2025-06-03) • Updated input 'lix': 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=fda93021ca8bf43de1e43c223b439b41c3990e4c' (2025-05-27) → 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=019b17f4e93c098f99a9bc691be1f1c4df026c7d' (2025-06-02) • Updated input 'nixosHardware': 'github:NixOS/nixos-hardware/11f2d9ea49c3e964315215d6baa73a8d42672f06' (2025-05-22) → 'github:NixOS/nixos-hardware/fc7c4714125cfaa19b048e8aaf86b9c53e04d853' (2025-06-03) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/62b852f6c6742134ade1abdd2a21685fd617a291' (2025-05-25) → 'github:NixOS/nixpkgs/910796cabe436259a29a72e8d3f5e180fc6dfacc' (2025-05-31) --- flake.lock | 68 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 57c9178..3a7c64e 100644 --- a/flake.lock +++ b/flake.lock @@ -83,11 +83,11 @@ ] }, "locked": { - "lastModified": 1748225455, - "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", + "lastModified": 1748832438, + "narHash": "sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A=", "owner": "nix-community", "repo": "disko", - "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", + "rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4", "type": "github" }, "original": { @@ -103,11 +103,11 @@ "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1747658429, - "narHash": "sha256-qZWuEdxmPx818qR61t3mMozJOvZSmTRUDPU4L3JeGgE=", + "lastModified": 1748838242, + "narHash": "sha256-wORL3vLIJdBF8hz73yuD7DVsrbOvFgtH96hQIetXhfg=", "owner": "nix-community", "repo": "dream2nix", - "rev": "6fd6d9188f32efd1e1656b3c3e63a67f9df7b636", + "rev": "e92dacdc57acaa6b2ae79592c1a62c2340931410", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1748309015, - "narHash": "sha256-NVgo/saT8uehYYwwhzWrTTFlpH0icR2E3tHHKsUouJ4=", + "lastModified": 1748941793, + "narHash": "sha256-HncwK05hos0Z5SSjVF5CtZjwMTn56xjWq08fRIdKBms=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0fba546d9aa235fc726fe9c8c3bb703e918c14c4", + "rev": "78278b770d2c83657657da569544cf20eccee0ef", "type": "github" }, "original": { @@ -245,11 +245,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1748821116, + "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", "type": "github" }, "original": { @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1748391243, - "narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=", + "lastModified": 1748925027, + "narHash": "sha256-BJ0qRIdvt5aeqm3zg/5if7b5rruG05zrSX3UpLqjDRk=", "owner": "nix-community", "repo": "home-manager", - "rev": "f5b12be834874f7661db4ced969a621ab2d57971", + "rev": "cb809ec1ff15cf3237c6592af9bbc7e4d983e98c", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1748388700, - "narHash": "sha256-abzcNgnyZTX84EjRu6KAAauDv61OkTRRDc+jB8BxrBE=", + "lastModified": 1748893954, + "narHash": "sha256-Vj1GHarIzlJI3We5KnYcAQlSjn++fx7/lKRaiIVz3tg=", "ref": "refs/heads/main", - "rev": "fda93021ca8bf43de1e43c223b439b41c3990e4c", - "revCount": 17958, + "rev": "019b17f4e93c098f99a9bc691be1f1c4df026c7d", + "revCount": 17982, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -569,11 +569,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1747900541, - "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", + "lastModified": 1748942041, + "narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", + "rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853", "type": "github" }, "original": { @@ -632,11 +632,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", "type": "github" }, "original": { @@ -647,11 +647,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1748037224, - "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", + "lastModified": 1748810746, + "narHash": "sha256-1na8blYvU1F6HLwx/aFjrhUqpqZ0SCsnqqW9n2vXvok=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", + "rev": "78d9f40fd6941a1543ffc3ed358e19c69961d3c1", "type": "github" }, "original": { @@ -711,11 +711,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -742,11 +742,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": {