diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml index 8d94149..59006f6 100644 --- a/.github/workflows/update-flake-lock.yml +++ b/.github/workflows/update-flake-lock.yml @@ -11,30 +11,10 @@ jobs: createPullRequest: runs-on: ubuntu-latest steps: - - uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2 - with: - ssh-key: ${{ secrets.SSH_DEPLOY_KEY }} - + - uses: actions/checkout@v4 - name: Install Nix - uses: cachix/install-nix-action@53fb48f556dd912c4814b24ee8059a9c91c82b18 + uses: cachix/install-nix-action@v30 with: - enable_kvm: true - extra_nix_config: | - show-trace = true - 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= - + github_access_token: ${{ secrets.GITHUB_TOKEN }} - name: Update flake.lock - run: | - git config --global user.email "github-actions[bot]@users.noreply.github.com" - git config --global user.name "github-actions[bot]" - nix flake update --commit-lock-file - - - name: Create PR - uses: peter-evans/create-pull-request@98106d3f2b65918a6591f9e155117b7219ff7e51 - with: - title: nix flake update + uses: DeterminateSystems/update-flake-lock@v24 diff --git a/flake.lock b/flake.lock index de286b8..5670748 100644 --- a/flake.lock +++ b/flake.lock @@ -1027,11 +1027,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743259260, - "narHash": "sha256-ArWLUgRm1tKHiqlhnymyVqi5kLNCK5ghvm06mfCl4QY=", + "lastModified": 1743076231, + "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb0e0f21f15c559d2ac7633dc81d079d1caf5f5f", + "rev": "6c5963357f3c1c840201eda129a99d455074db04", "type": "github" }, "original": { @@ -1043,11 +1043,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1742692082, + "narHash": "sha256-s3XOULQj7BVO7myY5V4Sob0tRZ7nRpwEOIzXg/MkD/Q=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "a09310bc940f245e51b1ffea68731244ca38f2bd", "type": "github" }, "original": { @@ -1138,11 +1138,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1743259260, - "narHash": "sha256-ArWLUgRm1tKHiqlhnymyVqi5kLNCK5ghvm06mfCl4QY=", + "lastModified": 1743076231, + "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eb0e0f21f15c559d2ac7633dc81d079d1caf5f5f", + "rev": "6c5963357f3c1c840201eda129a99d455074db04", "type": "github" }, "original": { @@ -1202,11 +1202,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1743259260, - "narHash": "sha256-ArWLUgRm1tKHiqlhnymyVqi5kLNCK5ghvm06mfCl4QY=", + "lastModified": 1743076231, + "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb0e0f21f15c559d2ac7633dc81d079d1caf5f5f", + "rev": "6c5963357f3c1c840201eda129a99d455074db04", "type": "github" }, "original": { @@ -1218,11 +1218,11 @@ }, "nixpkgs_16": { "locked": { - "lastModified": 1743259260, - "narHash": "sha256-ArWLUgRm1tKHiqlhnymyVqi5kLNCK5ghvm06mfCl4QY=", + "lastModified": 1743076231, + "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb0e0f21f15c559d2ac7633dc81d079d1caf5f5f", + "rev": "6c5963357f3c1c840201eda129a99d455074db04", "type": "github" }, "original": { @@ -1234,11 +1234,11 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1743259260, - "narHash": "sha256-ArWLUgRm1tKHiqlhnymyVqi5kLNCK5ghvm06mfCl4QY=", + "lastModified": 1743076231, + "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb0e0f21f15c559d2ac7633dc81d079d1caf5f5f", + "rev": "6c5963357f3c1c840201eda129a99d455074db04", "type": "github" }, "original": { @@ -1249,6 +1249,22 @@ } }, "nixpkgs_18": { + "locked": { + "lastModified": 1743076231, + "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6c5963357f3c1c840201eda129a99d455074db04", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_19": { "locked": { "lastModified": 1740547748, "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=", @@ -1330,11 +1346,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1743259260, - "narHash": "sha256-ArWLUgRm1tKHiqlhnymyVqi5kLNCK5ghvm06mfCl4QY=", + "lastModified": 1743076231, + "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb0e0f21f15c559d2ac7633dc81d079d1caf5f5f", + "rev": "6c5963357f3c1c840201eda129a99d455074db04", "type": "github" }, "original": { @@ -1378,11 +1394,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1743343031, - "narHash": "sha256-cBhTGErBVy9jmlvH1/B+LF1dncZouofdFoOgz+CTEzU=", + "lastModified": 1743256265, + "narHash": "sha256-1GJtabBAEwSkwKgSBe+osLCYwcRr5zx5H7ipuoVkO/4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7dbd61d5167a183bfb5a29fb9248cdee6d7ca2e", + "rev": "5dab1e63b3efccf767a54b0b978b41fe7410aff0", "type": "github" }, "original": { @@ -1512,6 +1528,7 @@ "nvim-github-theme": "nvim-github-theme", "rust-overlay": "rust-overlay_4", "sops-nix": "sops-nix", + "treefmt": "treefmt", "vscode-extensions": "vscode-extensions" } }, @@ -1562,11 +1579,11 @@ ] }, "locked": { - "lastModified": 1743302122, - "narHash": "sha256-VWyaUfBY49kjN29N140INa9LEW0YIgAr+OEJRdbKfnQ=", + "lastModified": 1743215516, + "narHash": "sha256-52qbrkG65U1hyrQWltgHTgH4nm0SJL+9TWv2UDCEPNI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "15c2a7930e04efc87be3ebf1b5d06232e635e24b", + "rev": "524463199fdee49338006b049bc376b965a2cfed", "type": "github" }, "original": { @@ -1583,11 +1600,11 @@ ] }, "locked": { - "lastModified": 1743302122, - "narHash": "sha256-VWyaUfBY49kjN29N140INa9LEW0YIgAr+OEJRdbKfnQ=", + "lastModified": 1743215516, + "narHash": "sha256-52qbrkG65U1hyrQWltgHTgH4nm0SJL+9TWv2UDCEPNI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "15c2a7930e04efc87be3ebf1b5d06232e635e24b", + "rev": "524463199fdee49338006b049bc376b965a2cfed", "type": "github" }, "original": { @@ -1722,10 +1739,28 @@ "type": "github" } }, + "treefmt": { + "inputs": { + "nixpkgs": "nixpkgs_18" + }, + "locked": { + "lastModified": 1742303424, + "narHash": "sha256-2R7cGdcA2npQQcIWu2cTlU63veTzwVZe78BliIuJT00=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "b3b938ab8ba2e8a0ce9ee9b30ccfa5e903ae5753", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "vscode-extensions": { "inputs": { "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_18" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1742262692, diff --git a/flake.nix b/flake.nix index 0aa7f34..1facc24 100644 --- a/flake.nix +++ b/flake.nix @@ -4,20 +4,51 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; - sops-nix.url = "github:Mic92/sops-nix"; - home-manager.url = "github:nix-community/home-manager"; - lanzaboote.url = "github:nix-community/lanzaboote/master"; - nixvim.url = "github:nix-community/nixvim"; - flake-parts.url = "github:hercules-ci/flake-parts"; - rust-overlay.url = "github:oxalica/rust-overlay"; - conduwuit.url = "github:girlbossceo/conduwuit"; - lix-module.url = "git+https://git.lix.systems/lix-project/nixos-module"; - nix-ld.url = "github:nix-community/nix-ld"; - nil.url = "github:oxalica/nil"; - vscode-extensions.url = "github:nix-community/nix-vscode-extensions/"; - nix-index-database.url = "github:nix-community/nix-index-database"; - attic.url = "github:zhaofengli/attic"; - garage.url = "github:deuxfleurs-org/garage"; + sops-nix = { + url = "github:Mic92/sops-nix"; + }; + home-manager = { + url = "github:nix-community/home-manager"; + }; + treefmt = { + url = "github:numtide/treefmt-nix"; + }; + lanzaboote = { + url = "github:nix-community/lanzaboote/master"; + }; + nixvim = { + url = "github:nix-community/nixvim"; + }; + flake-parts = { + url = "github:hercules-ci/flake-parts"; + }; + rust-overlay = { + url = "github:oxalica/rust-overlay"; + }; + conduwuit = { + url = "github:girlbossceo/conduwuit"; + }; + lix-module = { + url = "git+https://git.lix.systems/lix-project/nixos-module"; + }; + nix-ld = { + url = "github:nix-community/nix-ld"; + }; + nil = { + url = "github:oxalica/nil"; + }; + vscode-extensions = { + url = "github:nix-community/nix-vscode-extensions/"; + }; + nix-index-database = { + url = "github:nix-community/nix-index-database"; + }; + attic = { + url = "github:zhaofengli/attic"; + }; + garage = { + url = "github:deuxfleurs-org/garage"; + }; nvim-github-theme = { url = "github:projekt0n/github-nvim-theme";