flake.lock: Update

Flake lock file updates: • Updated input 'conduwuit': 'github:girlbossceo/conduwuit/7bf92c8a3710eeff229bd86bc81a89daa94b66d5' (2025-03-18) → 'github:girlbossceo/conduwuit/33c5afe050491988ee8224af25b9b06e892f4b50' (2025-03-21) • Updated input 'crane': 'github:ipetkov/crane/66cb0013f9a99d710b167ad13cbd8cc4e64f2ddb' (2025-03-18) → 'github:ipetkov/crane/70947c1908108c0c551ddfd73d4f750ff2ea67cd' (2025-03-19) • Updated input 'garage': 'github:deuxfleurs-org/garage/6906a4ff12838da2a74bdaeb7e7cd05cd1d69699' (2025-03-17) → 'github:deuxfleurs-org/garage/14d2f2b18da015508d4a1e31b2f014da5188d516' (2025-03-21) • Updated input 'helix': 'github:helix-editor/helix/b7d735ffe66a03ab5970e5f860923aada50d4e4c' (2025-03-20) → 'github:helix-editor/helix/7929c0719d739e248adfd80cd7e5b8e386a43938' (2025-03-27) • Updated input 'home-manager': 'github:nix-community/home-manager/fb74bb76d94a6c55632376c931fc108131260ee9' (2025-03-18) → 'github:nix-community/home-manager/b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52' (2025-03-27) • Updated input 'lix-module': 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=a6da43f8193d9e329bba1795c42590c27966082e' (2025-03-13) → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=fa69ae26cc32dda178117b46487c2165c0e08316' (2025-03-25) • Updated input 'lix-module/lix': '20edd45ae8.tar.gz?narHash=sha256-gJ7QmlwsJ/QdwUjwTjifNo3v7OBQm2N6xa19l3mMWM4%3D&rev=20edd45ae816c73504ddfb9c678756e003ceeafd' (2025-03-13) → '6059cbb031.tar.gz?narHash=sha256-z652gNdFc/95Fheq4DzVObERYRo%2Bj9RdCF6tzkR8r80%3D&rev=6059cbb031e49e05dd5d16208e2e50d3ab2611db' (2025-03-22) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c' (2025-03-17) → 'github:nix-community/nix-index-database/36dc43cb50d5d20f90a28d53abb33a32b0a2aae6' (2025-03-23) • Updated input 'nix-ld': 'github:nix-community/nix-ld/bc1ecb8ca83507c764a3909f02f1acf53c033585' (2025-03-17) → 'github:nix-community/nix-ld/27a5f75260a086f391c0eca38a5e306b9823a0b4' (2025-03-24) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/2b3795787eba0066a2bc8bba7362422e5713840f' (2025-03-18) → 'github:nixos/nixpkgs/8b1bcd4edc0de0a950eb117a37c55294997588b5' (2025-03-27) • Updated input 'nixpkgs-stable': 'github:nixos/nixpkgs/da044451c6a70518db5b730fe277b70f494188f1' (2025-03-18) → 'github:nixos/nixpkgs/d02d88f8de5b882ccdde0465d8fa2db3aa1169f7' (2025-03-25) • Updated input 'nixvim': 'github:nix-community/nixvim/78f6166c23f80bdfbcc8c44b20f7f4132299a33f' (2025-03-17) → 'github:nix-community/nixvim/1c0dd320d9c4f250ac33382e11d370b7abe97622' (2025-03-26) • Updated input 'nixvim/nuschtosSearch': 'github:NuschtOS/search/86e2038290859006e05ca7201425ea5b5de4aecb' (2025-02-02) → 'github:NuschtOS/search/508752835128a3977985a4d5225ff241f7756181' (2025-03-22) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/87f0965f9f5b13fca9f38074eee8369dc767550d' (2025-03-18) → 'github:oxalica/rust-overlay/b4d2dee9d16e7725b71969f28862ded3a94a7934' (2025-03-27) • Updated input 'sops-nix': 'github:Mic92/sops-nix/787afce414bcce803b605c510b60bf43c11f4b55' (2025-03-17) → 'github:Mic92/sops-nix/67566fe68a8bed2a7b1175fdfb0697ed22ae8852' (2025-03-23) • Updated input 'treefmt': 'github:numtide/treefmt-nix/b3b938ab8ba2e8a0ce9ee9b30ccfa5e903ae5753' (2025-03-18) → 'github:numtide/treefmt-nix/29a3d7b768c70addce17af0869f6e2bd8f5be4b7' (2025-03-27) • Updated input 'vscode-extensions': 'github:nix-community/nix-vscode-extensions/32de9a383db6b555ac92877dd8b5b986f4151de7' (2025-03-18) → 'github:nix-community/nix-vscode-extensions/14a6e019c40901428b97cdef2d873c18386c8e7f' (2025-03-27)
workflow: fix typo and don't build on macos
2025-03-27 20:08:54 -04:00 · 2025-03-27 19:19:54 -04:00 · 2025-03-27 19:10:04 -04:00 · 2025-03-27 18:47:25 -04:00 · 2025-03-27 18:47:25 -04:00 · 2025-03-27 18:47:24 -04:00
10 changed files with 122 additions and 94 deletions
--- a/.github/workflows/build-machines-and-homes.yml
+++ b/.github/workflows/build-machines-and-homes.yml
@ -7,12 +7,15 @@ env:
  ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }}
  NIX_CONFIG: |
    show-trace = true
-    extra-substituters = https://cdn.cy7.sh/main
-    extra-trusted-public-keys = main:Ku31HoEWcBtfggge2VGj+QTkVrQuIwRIMGyfV/5VQP0=
    experimental-features = nix-command flakes
    accept-flake-config = true
    system-features = nixos-test benchmark big-parallel kvm
+    secret-key-files = /home/runner/cache-priv-key.pem
+    extra-substituters = https://nixcache.cy7.sh
+    extra-trusted-public-keys = nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8=
  TERM: ansi
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets. AWS_SECRET_ACCESS_KEY }}
 jobs:
  build-machines:
    strategy:
@ -36,16 +39,14 @@ jobs:
          remove-codeql: 'true'
          remove-docker-images: 'true'
          build-mount-path: /nix
+      - name: setup binary cache key
+        run: echo "${{ secrets.NIX_CACHE_SECRET_KEY }}" >> /home/runner/cache-priv-key.pem
      - name: Install Nix
        uses: cachix/install-nix-action@v30
      - name: Sync repository
        uses: actions/checkout@v4
        with:
          persist-credentials: false
-      - name: setup attic
-        run: |
-          nix profile install github:zhaofengli/attic
-          attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
      - name: build
        run: |
          package=".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel"
@ -53,10 +54,7 @@ jobs:
      - name: cache
        if: always()
        run: |
-          package=".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel"
-          derivation="$(nix path-info --derivation "$package")"
-          cache="$(nix-store --query --requisites --include-outputs "$derivation")"
-          xargs attic push main <<< "$cache"
+          nix copy ".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel" --to "s3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem"
  build-homes:
    strategy:
      fail-fast: false
@ -80,16 +78,14 @@ jobs:
          remove-codeql: 'true'
          remove-docker-images: 'true'
          build-mount-path: /nix
+      - name: setup binary cache key
+        run: echo "${{ secrets.NIX_CACHE_SECRET_KEY }}" >> /home/runner/cache-priv-key.pem
      - name: Install Nix
        uses: cachix/install-nix-action@v30
      - name: Sync repository
        uses: actions/checkout@v4
        with:
          persist-credentials: false
-      - name: setup attic
-        run: |
-          nix profile install github:zhaofengli/attic
-          attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
      - name: build
        run: |
          package=".#homeConfigurations."${{ matrix.home }}".activationPackage"
@ -97,7 +93,4 @@ jobs:
      - name: cache
        if: always()
        run: |
-          package=".#homeConfigurations."${{ matrix.home }}".activationPackage"
-          derivation="$(nix path-info --derivation "$package")"
-          cache="$(nix-store --query --requisites --include-outputs "$derivation")"
-          xargs attic push main <<< "$cache"
+          nix copy ".#homeConfigurations."${{ matrix.home }}".activationPackage" --to "s3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem"
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@ -10,10 +10,11 @@ env:
  ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }}
  NIX_CONFIG: |
    show-trace = true
-    extra-substituters = https://cdn.cy7.sh/main
-    extra-trusted-public-keys = main:Ku31HoEWcBtfggge2VGj+QTkVrQuIwRIMGyfV/5VQP0=
    experimental-features = nix-command flakes
    accept-flake-config = true
+    secret-key-files = /home/runner/cache-priv-key.pem
+    extra-substituters = https://nixcache.cy7.sh
+    extra-trusted-public-keys = nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8=
  TERM: ansi
 jobs:
  build-packages:
@ -25,27 +26,23 @@ jobs:
        os:
          - ubuntu-latest
          - ubuntu-24.04-arm
-          - macos-latest
-          - macos-13
+          # - macos-latest
+          # - macos-13
    runs-on: ${{ matrix.os }}
    steps:
+      - name: setup binary cache key
+        run: echo "${{ secrets.NIX_CACHE_SECRET_KEY }}" >> /home/runner/cache-priv-key.pem
      - name: Install Nix
        uses: cachix/install-nix-action@v30
      - name: Sync repository
        uses: actions/checkout@v4
        with:
          persist-credentials: false
-      - name: setup attic
-        run: |
-          nix profile install github:zhaofengli/attic
-          attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
      - run: nix build -L ${{ matrix.package }}
      - name: cache result
        if: always()
        run: |
-          derivation="$(nix path-info --derivation "${{ matrix.package }}")"
-          cache="$(nix-store --query --requisites --include-outputs "$derivation")"
-          xargs attic push main <<< "$cache"
+          nix copy "${{ matrix.package }}" --to "s3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem"
      - name: prepare tarball to upload
        run: nix run github:nixos/nixpkgs#gnutar hcvf result.tar result
      - name: upload result
--- a/.sops.yaml
+++ b/.sops.yaml
@ -123,3 +123,8 @@ creation_rules:
      - age:
          - *chunk
          - *cy
+  - path_regex: secrets/cache-priv-key.pem
+    key_groups:
+      - age:
+          - *yt
+          - *cy
--- a/flake.lock
+++ b/flake.lock
@ -131,11 +131,11 @@
        "rocksdb": "rocksdb"
      },
      "locked": {
-        "lastModified": 1742266954,
-        "narHash": "sha256-PoVjZXR24r1WPyWWK+DZDAlVr4otn/BcxY7/jd8fehM=",
+        "lastModified": 1742567657,
+        "narHash": "sha256-p513FwDJl1J8fCpUFbAeZTb0ONbEmn2r5kGFBc9siUw=",
        "owner": "girlbossceo",
        "repo": "conduwuit",
-        "rev": "7bf92c8a3710eeff229bd86bc81a89daa94b66d5",
+        "rev": "33c5afe050491988ee8224af25b9b06e892f4b50",
        "type": "github"
      },
      "original": {
@ -146,11 +146,11 @@
    },
    "crane": {
      "locked": {
-        "lastModified": 1742317686,
-        "narHash": "sha256-ScJYnUykEDhYeCepoAWBbZWx2fpQ8ottyvOyGry7HqE=",
+        "lastModified": 1742394900,
+        "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "66cb0013f9a99d710b167ad13cbd8cc4e64f2ddb",
+        "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd",
        "type": "github"
      },
      "original": {
@ -361,11 +361,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742243551,
-        "narHash": "sha256-hp2tKtJHW/vbiIT4hRhP8cfZEACAWZ92lCdaO9WEi2E=",
+        "lastModified": 1742547966,
+        "narHash": "sha256-AJfw+XRaRyrlpb9Wy6rVz44JePy0AXWPECXVPBnrOfI=",
        "owner": "deuxfleurs-org",
        "repo": "garage",
-        "rev": "6906a4ff12838da2a74bdaeb7e7cd05cd1d69699",
+        "rev": "14d2f2b18da015508d4a1e31b2f014da5188d516",
        "type": "github"
      },
      "original": {
@ -459,11 +459,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742479163,
-        "narHash": "sha256-YC0zdGyZMu7seA2Jm1mxtcxE4lSeVwvCPMfWzJ8+o/c=",
+        "lastModified": 1743094823,
+        "narHash": "sha256-ZWBc4zCMlJXn5u6JN9lZLOasIaTqxc6RHEKP7w6Ktq4=",
        "owner": "helix-editor",
        "repo": "helix",
-        "rev": "b7d735ffe66a03ab5970e5f860923aada50d4e4c",
+        "rev": "7929c0719d739e248adfd80cd7e5b8e386a43938",
        "type": "github"
      },
      "original": {
@ -479,11 +479,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742305478,
-        "narHash": "sha256-iYCinzZnnUeCkZ031qGRwPdwRsqW6o9Y0MgGpA7Zva4=",
+        "lastModified": 1743097780,
+        "narHash": "sha256-5tUbaMBKYbfTe/4aXACxmiXG22TgwPBNcfZ8Kg3rt+g=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "fb74bb76d94a6c55632376c931fc108131260ee9",
+        "rev": "b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52",
        "type": "github"
      },
      "original": {
@ -590,11 +590,11 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1741888409,
-        "narHash": "sha256-gJ7QmlwsJ/QdwUjwTjifNo3v7OBQm2N6xa19l3mMWM4=",
-        "rev": "20edd45ae816c73504ddfb9c678756e003ceeafd",
+        "lastModified": 1742622332,
+        "narHash": "sha256-z652gNdFc/95Fheq4DzVObERYRo+j9RdCF6tzkR8r80=",
+        "rev": "6059cbb031e49e05dd5d16208e2e50d3ab2611db",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/20edd45ae816c73504ddfb9c678756e003ceeafd.tar.gz?rev=20edd45ae816c73504ddfb9c678756e003ceeafd"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/6059cbb031e49e05dd5d16208e2e50d3ab2611db.tar.gz?rev=6059cbb031e49e05dd5d16208e2e50d3ab2611db"
      },
      "original": {
        "type": "tarball",
@ -613,11 +613,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741894565,
-        "narHash": "sha256-2FD0NDJbEjUHloVrtEIms5miJsj1tvQCc/0YK5ambyc=",
+        "lastModified": 1742945498,
+        "narHash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=",
        "ref": "refs/heads/main",
-        "rev": "a6da43f8193d9e329bba1795c42590c27966082e",
-        "revCount": 136,
+        "rev": "fa69ae26cc32dda178117b46487c2165c0e08316",
+        "revCount": 138,
        "type": "git",
        "url": "https://git.lix.systems/lix-project/nixos-module"
      },
@ -737,11 +737,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742174123,
-        "narHash": "sha256-pDNzMoR6m1ZSJToZQ6XDTLVSdzIzmFl1b8Pc3f7iV6Y=",
+        "lastModified": 1742701275,
+        "narHash": "sha256-AulwPVrS9859t+eJ61v24wH/nfBEIDSXYxlRo3fL/SA=",
        "owner": "nix-community",
        "repo": "nix-index-database",
-        "rev": "2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c",
+        "rev": "36dc43cb50d5d20f90a28d53abb33a32b0a2aae6",
        "type": "github"
      },
      "original": {
@ -757,11 +757,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742204505,
-        "narHash": "sha256-sHBzuG9K/VrvOrcLd9GwoCLaQZDVedi/00YmFfdKq/A=",
+        "lastModified": 1742804816,
+        "narHash": "sha256-oRNAhQwybNM5IUeGLR/4APdiec3t8t3vuWALEGg0t/Q=",
        "owner": "nix-community",
        "repo": "nix-ld",
-        "rev": "bc1ecb8ca83507c764a3909f02f1acf53c033585",
+        "rev": "27a5f75260a086f391c0eca38a5e306b9823a0b4",
        "type": "github"
      },
      "original": {
@ -804,11 +804,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1742268799,
-        "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
+        "lastModified": 1742937945,
+        "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "da044451c6a70518db5b730fe277b70f494188f1",
+        "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
        "type": "github"
      },
      "original": {
@ -868,11 +868,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1742276595,
-        "narHash": "sha256-bsg9y3NoMGu0jgTI5XbxvzQFc9JtZB51i500WlVws80=",
+        "lastModified": 1743082947,
+        "narHash": "sha256-wZ/bfXu9x025oNa4pVcwYbgVRSl2tf/izZTegPSljUQ=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "2b3795787eba0066a2bc8bba7362422e5713840f",
+        "rev": "8b1bcd4edc0de0a950eb117a37c55294997588b5",
        "type": "github"
      },
      "original": {
@ -893,11 +893,11 @@
        "nuschtosSearch": "nuschtosSearch"
      },
      "locked": {
-        "lastModified": 1742255305,
-        "narHash": "sha256-XxygfriVXQt+5Iqh6AOjZL5Aes5dH2xzVKpHpL8pDQg=",
+        "lastModified": 1742991302,
+        "narHash": "sha256-5S+qnc5ijgFWlAWS9+L7uAgpDnL0RtVEDhVpHWGoavA=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "78f6166c23f80bdfbcc8c44b20f7f4132299a33f",
+        "rev": "1c0dd320d9c4f250ac33382e11d370b7abe97622",
        "type": "github"
      },
      "original": {
@ -916,11 +916,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738508923,
-        "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
+        "lastModified": 1742659553,
+        "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
+        "rev": "508752835128a3977985a4d5225ff241f7756181",
        "type": "github"
      },
      "original": {
@ -1038,11 +1038,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742265167,
-        "narHash": "sha256-RB0UEF9IXIgwuuBFC+s9H4rDyvmMZePHlBAK4vRAwf4=",
+        "lastModified": 1743042789,
+        "narHash": "sha256-yPlxN0r3pQjUIwyX/qeWSTdpHjWy/AfmM0PK1bYkO18=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "87f0965f9f5b13fca9f38074eee8369dc767550d",
+        "rev": "b4d2dee9d16e7725b71969f28862ded3a94a7934",
        "type": "github"
      },
      "original": {
@ -1058,11 +1058,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742239755,
-        "narHash": "sha256-ptn8dR4Uat3UUadGYNnB7CIH9SQm8mK69D2A/twBUXQ=",
+        "lastModified": 1742700801,
+        "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "787afce414bcce803b605c510b60bf43c11f4b55",
+        "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852",
        "type": "github"
      },
      "original": {
@ -1108,11 +1108,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742303424,
-        "narHash": "sha256-2R7cGdcA2npQQcIWu2cTlU63veTzwVZe78BliIuJT00=",
+        "lastModified": 1743081648,
+        "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "b3b938ab8ba2e8a0ce9ee9b30ccfa5e903ae5753",
+        "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7",
        "type": "github"
      },
      "original": {
@ -1131,11 +1131,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742262692,
-        "narHash": "sha256-kCuy1Fld1vFmor6SZ48DdtiLv9/zUhW8lCaTA+Py+es=",
+        "lastModified": 1743040433,
+        "narHash": "sha256-OskUn34vJJdealUG1rdOdnpBEBRfJfw9vKeqNyZKs+s=",
        "owner": "nix-community",
        "repo": "nix-vscode-extensions",
-        "rev": "32de9a383db6b555ac92877dd8b5b986f4151de7",
+        "rev": "14a6e019c40901428b97cdef2d873c18386c8e7f",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -111,11 +111,11 @@
  nixConfig = {
    extra-substituters = [
      "https://nix-community.cachix.org"
-      "https://cdn.cy7.sh/main"
+      "https://nixcache.cy7.sh"
    ];
    extra-trusted-public-keys = [
      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "main:Ku31HoEWcBtfggge2VGj+QTkVrQuIwRIMGyfV/5VQP0="
+      "nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8="
    ];
  };

--- a/hosts/chunk/default.nix
+++ b/hosts/chunk/default.nix
@ -184,7 +184,6 @@
  security.sudo.enable = true;
  security.sudo.wheelNeedsPassword = false;

-  programs.gnupg.agent.enable = true;
  programs.git.enable = true;

  my.caddy.enable = true;
@ -192,8 +191,5 @@
  # container stuff
  my.containerization.enable = true;

-  my.roundcube.enable = true;
-  my.zipline.enable = true;
-  my.searx.enable = true;
  my.attic.enable = true;
 }
--- a/hosts/chunk/garage.nix
+++ b/hosts/chunk/garage.nix
@ -10,6 +10,11 @@
        api_bind_addr = "[::]:3900";
        root_domain = "s3.cy7.sh";
      };
+      s3_web = {
+        bind_addr = "[::]:3902";
+        root_domain = ".web.cy7.sh";
+        add_host_to_metrics = true;
+      };
      admin.api_bind_addr = "[::]:3903";
      rpc_bind_addr = "[::]:3901";
      replication_factor = 1;
@ -33,5 +38,12 @@
      import common
      reverse_proxy localhost:3903
    '';
+    "*.web.cy7.sh" = {
+      serverAliases = [ "nixcache.cy7.sh" ];
+      extraConfig = ''
+        import common
+        reverse_proxy localhost:3902
+      '';
+    };
  };
 }
--- a/hosts/chunk/rclone.nix
+++ b/hosts/chunk/rclone.nix
@ -14,17 +14,18 @@ let
        --config ${config.sops.secrets."rclone/config".path} \
        --allow-other \
        --cache-dir /var/cache/rclone \
-        --transfers 32 \
+        --transfers 16 \
        --vfs-cache-mode full \
        --vfs-cache-min-free-space 5G \
        --dir-cache-time 30d \
        --no-checksum \
        --no-modtime \
        --vfs-fast-fingerprint \
-        --vfs-read-chunk-size 4M \
-        --vfs-read-chunk-streams 32 \
-        --sftp-concurrency 128 \
+        --vfs-read-chunk-size 16M \
+        --vfs-read-chunk-streams 16 \
+        --sftp-concurrency 64 \
        --sftp-chunk-size 255k \
+        --buffer-size 0 \
        ${remote} ${mount}
    '';
    ExecStop = "${lib.getExe' pkgs.fuse "fusermount"} -zu ${mount}";
--- a/hosts/common.nix
+++ b/hosts/common.nix
@ -11,11 +11,11 @@
      ];
      trusted-public-keys = [
        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        "main:Ku31HoEWcBtfggge2VGj+QTkVrQuIwRIMGyfV/5VQP0="
+        "nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8="
      ];
      extra-substituters = [
        "https://nix-community.cachix.org"
-        "https://cdn.cy7.sh/main"
+        "https://nixcache.cy7.sh"
      ];
    };
    channel.enable = false;
--- a/secrets/cache-priv-key.pem
+++ b/secrets/cache-priv-key.pem
@ -0,0 +1,24 @@
+{
+	"data": "ENC[AES256_GCM,data:IVRg3IqrlV1Cy3xwyVszhUnRzbWP3OSb/XZF1H0N30eKL8d0DxFGngC5qMgRcmSs203/QL3w0fENp1u0f8tVajqJVlzLjlsiQrMdtXmiMv0LKO7E+aj4UZ0wMchB0XgSVUWrKUXxZrA=,iv:3GtA07yuAAI++RsLSwY3U62k1iG9+hvkGn45HjFt/Gk=,tag:PJ13CrjcE06KMC383txqHw==,type:str]",
+	"sops": {
+		"kms": null,
+		"gcp_kms": null,
+		"azure_kv": null,
+		"hc_vault": null,
+		"age": [
+			{
+				"recipient": "age1sy0at69err83qyml2vqu8xvwjccfws447aaadfvacj2qluw3p45s2mtrw8",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVdkxBV3NSL1NDRjhPanpZ\nWTQwUmJmTExNOG0xZ1l1M2ZUSlFaTWdzS2hvCkdNT0dmK3FhcC85RE1mQmN1Uncw\nU1A4Znk1Vnk3RmY1UWdBY21VdnRZdWMKLS0tIHhTYUVUeTZsYkJFWk5LdnNDWlc5\ndDFDMUN2RmN0MDNXclpEMFA5Z0F5M0kKsLgc2D73RPNdTo4q7hBPGcBVPGwY73g+\nqQZbkVVzKPHo814ivwIVFYv+i5Qvf+p985Rko/fQ98GxW0G5c9Qfkg==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age10h6pg5qdpc4t0rpmksfv788a57f04n83zgqaezkjjn65nkhv547s0vxfdn",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuZ3B4czExQVZxNUJGNk1X\nbE9Md1Z6blM1S2xhb3VLT0JWbUpjSkxxS1U0Cm41bmt5Rk9LVTJFbVRFT2xxM01i\nTGUyYVU2RWdzRUhBVmNsTzJZWmh6cFUKLS0tIFlXVHQrcTVvbnptRitQVkVXRHBJ\nTjIxVXFvRmRQbUFHRXFjbFIva1IxVG8KciKyUdNjec7ocuKVX8KflMVPKpf/tEVr\nTxudivOoQ0XaqyPVi3cWDpuk2IAWUuJDxjmEctE6JgPtQvs1GsKCdg==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2025-03-27T20:37:28Z",
+		"mac": "ENC[AES256_GCM,data:35iUoodcjvIn+VAE20f2sHFaTh3+aqCYQ4HalWdVz4eUSkVNcdXs2uqOZtFv3MszDiH9izM84OyHwykudJ99QE3B/NwpfIoKQaU6Qg5X/g/rC1meffMaZwcASVbepjznahbTKmJqeSrMeybrBIV+6FaSjWXn0+D72GEEM1vgH9c=,iv:N2CbttHJsczm37qdapOCrlNeSSgsZBDlvWyvUpa3mkk=,tag:btniVwaVS9h4jDo4IM2wcA==,type:str]",
+		"pgp": null,
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.9.4"
+	}
+}
Author	SHA1	Message	Date
cy	c91fe9cb71	flake.lock: Update Flake lock file updates: • Updated input 'conduwuit': 'github:girlbossceo/conduwuit/7bf92c8a3710eeff229bd86bc81a89daa94b66d5' (2025-03-18) → 'github:girlbossceo/conduwuit/33c5afe050491988ee8224af25b9b06e892f4b50' (2025-03-21) • Updated input 'crane': 'github:ipetkov/crane/66cb0013f9a99d710b167ad13cbd8cc4e64f2ddb' (2025-03-18) → 'github:ipetkov/crane/70947c1908108c0c551ddfd73d4f750ff2ea67cd' (2025-03-19) • Updated input 'garage': 'github:deuxfleurs-org/garage/6906a4ff12838da2a74bdaeb7e7cd05cd1d69699' (2025-03-17) → 'github:deuxfleurs-org/garage/14d2f2b18da015508d4a1e31b2f014da5188d516' (2025-03-21) • Updated input 'helix': 'github:helix-editor/helix/b7d735ffe66a03ab5970e5f860923aada50d4e4c' (2025-03-20) → 'github:helix-editor/helix/7929c0719d739e248adfd80cd7e5b8e386a43938' (2025-03-27) • Updated input 'home-manager': 'github:nix-community/home-manager/fb74bb76d94a6c55632376c931fc108131260ee9' (2025-03-18) → 'github:nix-community/home-manager/b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52' (2025-03-27) • Updated input 'lix-module': 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=a6da43f8193d9e329bba1795c42590c27966082e' (2025-03-13) → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=fa69ae26cc32dda178117b46487c2165c0e08316' (2025-03-25) • Updated input 'lix-module/lix': '`20edd45ae8`.tar.gz?narHash=sha256-gJ7QmlwsJ/QdwUjwTjifNo3v7OBQm2N6xa19l3mMWM4%3D&rev=20edd45ae816c73504ddfb9c678756e003ceeafd' (2025-03-13) → '`6059cbb031`.tar.gz?narHash=sha256-z652gNdFc/95Fheq4DzVObERYRo%2Bj9RdCF6tzkR8r80%3D&rev=6059cbb031e49e05dd5d16208e2e50d3ab2611db' (2025-03-22) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c' (2025-03-17) → 'github:nix-community/nix-index-database/36dc43cb50d5d20f90a28d53abb33a32b0a2aae6' (2025-03-23) • Updated input 'nix-ld': 'github:nix-community/nix-ld/bc1ecb8ca83507c764a3909f02f1acf53c033585' (2025-03-17) → 'github:nix-community/nix-ld/27a5f75260a086f391c0eca38a5e306b9823a0b4' (2025-03-24) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/2b3795787eba0066a2bc8bba7362422e5713840f' (2025-03-18) → 'github:nixos/nixpkgs/8b1bcd4edc0de0a950eb117a37c55294997588b5' (2025-03-27) • Updated input 'nixpkgs-stable': 'github:nixos/nixpkgs/da044451c6a70518db5b730fe277b70f494188f1' (2025-03-18) → 'github:nixos/nixpkgs/d02d88f8de5b882ccdde0465d8fa2db3aa1169f7' (2025-03-25) • Updated input 'nixvim': 'github:nix-community/nixvim/78f6166c23f80bdfbcc8c44b20f7f4132299a33f' (2025-03-17) → 'github:nix-community/nixvim/1c0dd320d9c4f250ac33382e11d370b7abe97622' (2025-03-26) • Updated input 'nixvim/nuschtosSearch': 'github:NuschtOS/search/86e2038290859006e05ca7201425ea5b5de4aecb' (2025-02-02) → 'github:NuschtOS/search/508752835128a3977985a4d5225ff241f7756181' (2025-03-22) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/87f0965f9f5b13fca9f38074eee8369dc767550d' (2025-03-18) → 'github:oxalica/rust-overlay/b4d2dee9d16e7725b71969f28862ded3a94a7934' (2025-03-27) • Updated input 'sops-nix': 'github:Mic92/sops-nix/787afce414bcce803b605c510b60bf43c11f4b55' (2025-03-17) → 'github:Mic92/sops-nix/67566fe68a8bed2a7b1175fdfb0697ed22ae8852' (2025-03-23) • Updated input 'treefmt': 'github:numtide/treefmt-nix/b3b938ab8ba2e8a0ce9ee9b30ccfa5e903ae5753' (2025-03-18) → 'github:numtide/treefmt-nix/29a3d7b768c70addce17af0869f6e2bd8f5be4b7' (2025-03-27) • Updated input 'vscode-extensions': 'github:nix-community/nix-vscode-extensions/32de9a383db6b555ac92877dd8b5b986f4151de7' (2025-03-18) → 'github:nix-community/nix-vscode-extensions/14a6e019c40901428b97cdef2d873c18386c8e7f' (2025-03-27)	2025-03-27 20:08:54 -04:00
cy	9dbc689e14	workflow: fix typo and don't build on macos	2025-03-27 19:19:54 -04:00
cy	7c8bc5a1f6	rclone: limit sftp-concurrency to 64 and remove OOMScoreAdjust workaround	2025-03-27 19:10:04 -04:00
cy	ec1f55aece	sops: add binary cache priv key	2025-03-27 18:47:25 -04:00
cy	789e0b7597	try to fix rclone memory issue; also disable OOM for now	2025-03-27 18:47:25 -04:00
cy	1ac785fba4	use s3 nix cache	2025-03-27 18:47:24 -04:00
cy	8c3f3a4dff	workflow: use new s3 nix cache add cache priv and pub key add cache priv key to /home/runner workflow: use new cache for build-packages	2025-03-27 18:47:15 -04:00
cy	aea2a217c2	chunk: remove unused stuff	2025-03-27 13:24:37 -04:00