From 09b6e25b2b32a867420b00ae9692abf200a087fa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 22:47:18 -0500 Subject: [PATCH 1/5] flake.lock: Update (#23) 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/65a441502c9382d41ada1adbc9bd31d6c9b00fe2?narHash=sha256-snPBgTqwn3FPZVdFC5yt7Bnk3squim1vZOZ8CObWykk%3D' (2024-12-13) → 'github:nix-community/disko/0141aabed359f063de7413f80d906e1d98c0c123?narHash=sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0%3D' (2025-01-14) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/ba9f7942037ac78a690eb7e2c15f4869c9515eb4?narHash=sha256-YKr7RhOtFFl7metHJ2oWmPF5//mlvasFr1jJ0gLdNyQ%3D' (2025-01-13) → 'github:nixos/nixpkgs/69b5cebd7cc197ee5885fa694465039c42a5c8dc?narHash=sha256-j9ysmoP7UJUEZdA1/Gjqa8zsx5gaq35PxRsaTBwgoWk%3D' (2025-01-15) • Updated input 'nixpkgs-garage': 'github:cything/nixpkgs/616be0a7b830a10d0874d569aabd40034c9151aa?narHash=sha256-KpbFF8d5cqcBF7%2Bm5fXDcPn%2BADg3kURbX49JGx18NXU%3D' (2025-01-12) → 'github:cything/nixpkgs/97f27249297bf5fbc563014ae9d4884dee27f1e0?narHash=sha256-A7knAvBOwoM5X7oNdIOKvuXYtXJpuR4O8iKHIk8EwOI%3D' (2025-01-15) • Updated input 'nixvim': 'github:nix-community/nixvim/a54b752259ff16d340d270928ee603b4b9599192?narHash=sha256-dXvzw4LmupgZb2VfwclzygiIyfqjnmKhTdjHDun2rDg%3D' (2025-01-13) → 'github:nix-community/nixvim/5b068e7f8f2b6beaa1fafe0c8b3604b63bcccc2d?narHash=sha256-gb3ujURRlI/D5Jc8PUDOpJr8RyrTwnDDIDtnQK4upso%3D' (2025-01-15) Co-authored-by: github-actions[bot] --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 7110280..89484ba 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1734088167, - "narHash": "sha256-snPBgTqwn3FPZVdFC5yt7Bnk3squim1vZOZ8CObWykk=", + "lastModified": 1736864502, + "narHash": "sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0=", "owner": "nix-community", "repo": "disko", - "rev": "65a441502c9382d41ada1adbc9bd31d6c9b00fe2", + "rev": "0141aabed359f063de7413f80d906e1d98c0c123", "type": "github" }, "original": { @@ -360,11 +360,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736789786, - "narHash": "sha256-YKr7RhOtFFl7metHJ2oWmPF5//mlvasFr1jJ0gLdNyQ=", + "lastModified": 1736966948, + "narHash": "sha256-j9ysmoP7UJUEZdA1/Gjqa8zsx5gaq35PxRsaTBwgoWk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ba9f7942037ac78a690eb7e2c15f4869c9515eb4", + "rev": "69b5cebd7cc197ee5885fa694465039c42a5c8dc", "type": "github" }, "original": { @@ -392,11 +392,11 @@ }, "nixpkgs-garage": { "locked": { - "lastModified": 1736657901, - "narHash": "sha256-KpbFF8d5cqcBF7+m5fXDcPn+ADg3kURbX49JGx18NXU=", + "lastModified": 1736921030, + "narHash": "sha256-A7knAvBOwoM5X7oNdIOKvuXYtXJpuR4O8iKHIk8EwOI=", "owner": "cything", "repo": "nixpkgs", - "rev": "616be0a7b830a10d0874d569aabd40034c9151aa", + "rev": "97f27249297bf5fbc563014ae9d4884dee27f1e0", "type": "github" }, "original": { @@ -437,11 +437,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736784172, - "narHash": "sha256-dXvzw4LmupgZb2VfwclzygiIyfqjnmKhTdjHDun2rDg=", + "lastModified": 1736964246, + "narHash": "sha256-gb3ujURRlI/D5Jc8PUDOpJr8RyrTwnDDIDtnQK4upso=", "owner": "nix-community", "repo": "nixvim", - "rev": "a54b752259ff16d340d270928ee603b4b9599192", + "rev": "5b068e7f8f2b6beaa1fafe0c8b3604b63bcccc2d", "type": "github" }, "original": { From ff3df361986260228b028d6deefb977b583bfe03 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 16 Jan 2025 11:01:55 -0500 Subject: [PATCH 2/5] nvim undotree and direnv --- home/nixvim/default.nix | 1 + home/yt/ytnix.nix | 5 +++++ home/zsh/default.nix | 1 + 3 files changed, 7 insertions(+) diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 2b4e354..d90b5dd 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -190,5 +190,6 @@ plugins.web-devicons.enable = true; plugins.auto-save.enable = true; plugins.indent-blankline.enable = true; + plugins.undotree.enable = true; }; } diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 67f448d..8a725fe 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -138,4 +138,9 @@ }; services.gnome-keyring.enable = true; + + programs.direnv = { + enable = true; + nix-direnv.enable = true; + }; } diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 2dd2a84..c1df4e8 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -116,4 +116,5 @@ programs.zoxide.enableZshIntegration = true; programs.eza.enableZshIntegration = true; programs.nix-index.enableZshIntegration = false; + programs.direnv.enableZshIntegration = false; } From 5cec9ded21444d2fd5ab7daaca8b26818a91845c Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 15 Jan 2025 00:52:18 -0500 Subject: [PATCH 3/5] test this pls --- .github/workflows/build-and-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index 8e5aaa3..bcc72e1 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -10,7 +10,7 @@ jobs: - .#attic-client - .#attic-server - .#conduwuit - - "github:cything/nixpkgs/9a35d495d2f49eee003b57265228844bb48c933e#nixosTests.garage.with-3node-replication1_x" + - "github:cything/nixpkgs/97f27249297bf5fbc563014ae9d4884dee27f1e0#nixosTests.garage.with-3node-replication1_x" runs-on: ubuntu-latest steps: - uses: DeterminateSystems/nix-installer-action@main From 2358acda6c6429d0d6ce053fab634111f461e93b Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 15 Jan 2025 01:15:30 -0500 Subject: [PATCH 4/5] cachix breaks now --- .github/workflows/build-and-cache.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index bcc72e1..d61201f 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -17,10 +17,6 @@ jobs: with: logger: pretty - uses: DeterminateSystems/magic-nix-cache-action@main - - uses: cachix/cachix-action@v15 - with: - name: cything - authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: Setup Attic cache uses: ryanccn/attic-action@v0 with: From dcfe09e0a85ddb5a525687be44f223f04f8ca8bd Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 16 Jan 2025 11:04:19 -0500 Subject: [PATCH 5/5] test new build --- .github/workflows/build-and-cache.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index d61201f..1afa4b0 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -11,6 +11,7 @@ jobs: - .#attic-server - .#conduwuit - "github:cything/nixpkgs/97f27249297bf5fbc563014ae9d4884dee27f1e0#nixosTests.garage.with-3node-replication1_x" + - ".#nixosConfigurations.livecd.config.system.build.isoImage" runs-on: ubuntu-latest steps: - uses: DeterminateSystems/nix-installer-action@main @@ -25,3 +26,11 @@ jobs: token: ${{ secrets.ATTIC_TOKEN }} - uses: actions/checkout@v4 - run: nix build '${{ matrix.package }}' + - name: Compress Build Craft + run: | + tar cvf "./$(date -I).tar" ./result/* + - uses: actions/upload-artifact@v4 + with: + path: ./*.tar + overwrite: true + retention-days: 7days