diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index c0f42fe..6fa511f 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -28,6 +28,8 @@ jobs: os: native-x86_64 - system: telperion os: native-x86_64 + - system: shadowfax + os: native-x86_64 runs-on: ${{ matrix.os }} env: PATH: ${{ format('{0}:{1}', '/run/current-system/sw/bin', env.PATH) }} @@ -46,55 +48,8 @@ jobs: - name: Garbage collect build dependencies run: nix-collect-garbage - - name: Build previous ${{ matrix.system }} system - shell: bash - run: | - nix build git+https://git.hsn.dev/jahanson/mochi#top.${{ matrix.system }} \ - -v --log-format raw --profile ./profile - name: Build new ${{ matrix.system }} system shell: bash run: | nix build ".#top.${{ matrix.system }}" --profile ./profile --fallback -v \ > >(tee stdout.log) 2> >(tee /tmp/nix-build-err.log >&2) - - name: Check for build failure - if: failure() - run: | - drv=$(grep "For full logs, run" /tmp/nix-build-err.log | grep -oE "/nix/store/.*.drv") - if [ -n $drv ]; then - nix log $drv - echo $drv - fi - exit 1 - - name: Diff profile - id: diff - run: | - nix profile diff-closures --profile ./profile - delimiter="$(openssl rand -hex 16)" - echo "diff<<${delimiter}" >> "${GITHUB_OUTPUT}" - nix profile diff-closures --profile ./profile | perl -pe 's/\e\[[0-9;]*m(?:\e\[K)?//g' >> "${GITHUB_OUTPUT}" - echo "${delimiter}" >> "${GITHUB_OUTPUT}" - # - name: Comment report in pr - # uses: https://github.com/marocchino/sticky-pull-request-comment@v2 - # with: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # header: ".#top.${{ matrix.system }}" - # message: | - # ### Report for `${{ matrix.system }}` - - # Version changes
- # 
 ${{ steps.diff.outputs.diff }}
- # - name: Push to Cachix - # if: success() - # env: - # CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} - # run: nix build ".#top.${{ matrix.system }}" --json | jq -r .[].drvPath | cachix push hsndev - nix-build-success: - if: ${{ always() }} - needs: - - nix-build - name: Nix Build Successful - runs-on: docker - steps: - - if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }} - name: Check matrix status - run: exit 1 diff --git a/flake.lock b/flake.lock index cbc2a8e..c683613 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1725377834, - "narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=", + "lastModified": 1726219040, + "narHash": "sha256-u/2xSCp/7sE7XViv6QR2jMw7Rrx/PXJtmeVLYv+Qbpo=", "owner": "nix-community", "repo": "disko", - "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", + "rev": "4ef99d8ec41369b6fbe83479b5566c2b8856972c", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -153,24 +153,6 @@ "inputs": { "systems": "systems_4" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_5" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -200,26 +182,6 @@ "type": "github" } }, - "ghostty": { - "inputs": { - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", - "zig": "zig" - }, - "locked": { - "lastModified": 1725551137, - "narHash": "sha256-UuWJJ93rcBTp/mG8P5VmM+Z3IrUeWcSsPqmws/ehAw4=", - "ref": "refs/heads/main", - "rev": "a3aa5463a1417bb052a07386108956dfae271b43", - "revCount": 7197, - "type": "git", - "url": "ssh://git@github.com/ghostty-org/ghostty" - }, - "original": { - "type": "git", - "url": "ssh://git@github.com/ghostty-org/ghostty" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -227,11 +189,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1725703823, + "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", "type": "github" }, "original": { @@ -243,11 +205,11 @@ }, "impermanence": { "locked": { - "lastModified": 1724489415, - "narHash": "sha256-ey8vhwY/6XCKoh7fyTn3aIQs7WeYSYtLbYEG87VCzX4=", + "lastModified": 1725690722, + "narHash": "sha256-4qWg9sNh5g1qPGO6d/GV2ktY+eDikkBTbWSg5/iD2nY=", "owner": "nix-community", "repo": "impermanence", - "rev": "c7f5b394397398c023000cf843986ee2571a1fd7", + "rev": "63f4d0443e32b0dd7189001ee1894066765d18a5", "type": "github" }, "original": { @@ -258,7 +220,7 @@ }, "krewfile": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] @@ -294,7 +256,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "flakey-profile": "flakey-profile", "lix": "lix", "nixpkgs": [ @@ -363,11 +325,11 @@ ] }, "locked": { - "lastModified": 1725161148, - "narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=", + "lastModified": 1725765290, + "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "32058e9138248874773630c846563b1a78ee7a5b", + "rev": "642275444c5a9defce57219c944b3179bf2adaa9", "type": "github" }, "original": { @@ -401,17 +363,17 @@ "nix-vscode-extensions": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1725500139, - "narHash": "sha256-drJz8wZ5RORqtPMnYOMZAQZ43SfrMxMnH5EmQMlVV3A=", + "lastModified": 1726277723, + "narHash": "sha256-/Dk8qrBs9XE2kS3bbvKaq+EZTH9lTsSrkxx/MdTQZ4s=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "33839dcc1d5a9243fb5c18ed72b0e200501b31ff", + "rev": "42c1ec06e709349f11bec2b3c61a75018bd6b9b9", "type": "github" }, "original": { @@ -422,11 +384,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725477728, - "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", + "lastModified": 1725885300, + "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", + "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", "type": "github" }, "original": { @@ -438,11 +400,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725826545, - "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=", + "lastModified": 1725930920, + "narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9", + "rev": "44a71ff39c182edaf25a7ace5c9454e7cba2c658", "type": "github" }, "original": { @@ -482,27 +444,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1705957679, - "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1721524707, - "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", + "lastModified": 1725762081, + "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", + "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", "type": "github" }, "original": { @@ -514,27 +460,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "lastModified": 1726062873, + "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable_2": { - "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f", "type": "github" }, "original": { @@ -582,11 +512,11 @@ }, "nur": { "locked": { - "lastModified": 1725554528, - "narHash": "sha256-adxS5UCDN0H0onUlktE6lWkxmxB59gWkay+1sbTuoTo=", + "lastModified": 1726269590, + "narHash": "sha256-yX2QaeYiNBwxGDbS8K47gaTFvkQZnXoWeprT0t1YpIE=", "owner": "nix-community", "repo": "NUR", - "rev": "1cf6027546907c5ce7b0c6e21b0f507236eaf830", + "rev": "d5ca1c1ab45028f8e1234d2e856c7c23c0c5e111", "type": "github" }, "original": { @@ -682,7 +612,6 @@ "root": { "inputs": { "disko": "disko", - "ghostty": "ghostty", "home-manager": "home-manager", "impermanence": "impermanence", "krewfile": "krewfile", @@ -692,7 +621,7 @@ "nix-vscode-extensions": "nix-vscode-extensions", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable_2", + "nixpkgs-unstable": "nixpkgs-unstable", "nixvirt-git": "nixvirt-git", "nur": "nur", "sops-nix": "sops-nix", @@ -745,14 +674,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1725540166, - "narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=", + "lastModified": 1726218807, + "narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d9d781523a1463965cd1e1333a306e70d9feff07", + "rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", "type": "github" }, "original": { @@ -821,21 +750,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "talhelper": { "inputs": { "flake-parts": "flake-parts", @@ -844,11 +758,11 @@ ] }, "locked": { - "lastModified": 1725423288, - "narHash": "sha256-m5jTeaENGYCsOLyv80GT4H/MlerqIyHYPTrFBttpKpU=", + "lastModified": 1726276199, + "narHash": "sha256-uZoBfCxaRTmIF6zNkt2KBwVUM7kMhEtIAMtdtBwjtzs=", "owner": "budimanjojo", "repo": "talhelper", - "rev": "d563d79baecff1c5c7de2d9ae12a029c2a782e6f", + "rev": "cbe04c75b0f04aad29fc662b86be4cb87474f837", "type": "github" }, "original": { @@ -881,7 +795,7 @@ }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_2" }, "locked": { @@ -897,31 +811,6 @@ "repo": "nixos-vscode-server", "type": "github" } - }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty" - ], - "flake-utils": "flake-utils", - "nixpkgs": [ - "ghostty", - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1717848532, - "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 43ce6c1..3d10deb 100644 --- a/flake.nix +++ b/flake.nix @@ -80,9 +80,11 @@ }; # ghostty - 👻 - ghostty = { - url = "git+ssh://git@github.com/ghostty-org/ghostty"; - }; + # ghostty = { + # url = "git+ssh://git@github.com/ghostty-org/ghostty"; + # }; + # just manually installing it, private repo gives me a lot of headaches.disko + # nix profile install git+ssh://git@github.com/ghostty-org/ghostty vscode-server.url = "github:nix-community/nixos-vscode-server"; @@ -96,7 +98,7 @@ }; outputs = - { self, nixpkgs, sops-nix, home-manager, nix-vscode-extensions, impermanence, disko, talhelper, lix-module, ghostty, vscode-server, krewfile, ... } @ inputs: + { self, nixpkgs, sops-nix, home-manager, nix-vscode-extensions, impermanence, disko, talhelper, lix-module, vscode-server, krewfile, ... } @ inputs: let forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" diff --git a/nixos/home/jahanson/workstation.nix b/nixos/home/jahanson/workstation.nix index 4a1ea65..6bf1162 100644 --- a/nixos/home/jahanson/workstation.nix +++ b/nixos/home/jahanson/workstation.nix @@ -41,7 +41,6 @@ with config; [ #apps (unstable.flameshot.override { enableWlrSupport = true; }) - inputs.ghostty.packages.${pkgs.system}.default mods obsidian parsec-bin