diff --git a/flake.lock b/flake.lock index 9051d5c..97e1db2 100644 --- a/flake.lock +++ b/flake.lock @@ -60,17 +60,14 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -126,11 +123,11 @@ ] }, "locked": { - "lastModified": 1733389730, - "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -143,7 +140,9 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat", - "flake-parts": "flake-parts", + "flake-parts": [ + "flake-parts" + ], "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" @@ -168,11 +167,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733470866, - "narHash": "sha256-OSIG4k3SttKzxPodsHUxEEWB0mNSe0/UFKiDm9UDvUU=", + "lastModified": 1733560578, + "narHash": "sha256-HM6Aax+02r2H2iQdvc5TQDVPUqaejR3dE0ygHQtnpCM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c77dab3ae5c71a5eaef539968ebfb13dce79b0ea", + "rev": "5c8a2cab3f0db78dd804a8a221c489b77c85e165", "type": "github" }, "original": { @@ -181,6 +180,18 @@ "type": "indirect" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1710695816, @@ -198,12 +209,23 @@ } }, "nur": { + "inputs": { + "flake-parts": [ + "flake-parts" + ], + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": [ + "treefmt-nix" + ] + }, "locked": { - "lastModified": 1733484765, - "narHash": "sha256-6CeTGuVXapUBajXoP0XH54SoLKc+/oM5KYzh7JhunPw=", + "lastModified": 1733589916, + "narHash": "sha256-ZHjk/6caiSypWWPeN0PhRhDpgwvB36f2aLZYOtfBlzo=", "owner": "nix-community", "repo": "nur", - "rev": "99df7e8fe0425045be076f3b7f9f26cc6348cefc", + "rev": "8b6de353ee0f4cb1d12fae5abf0b3003c51677c0", "type": "github" }, "original": { @@ -222,11 +244,11 @@ ] }, "locked": { - "lastModified": 1733410572, + "lastModified": 1733578387, "narHash": "sha256-XkMZGeqg0GCRoSXvMcaHP7bdvWPRZxCK1sw1ASsc16E=", "owner": "pjones", "repo": "plasma-manager", - "rev": "92721d7402526599366d00e242813798e9914970", + "rev": "2a64e173f1effdcc86e25cba0601e8feedf89115", "type": "github" }, "original": { @@ -265,12 +287,14 @@ "root": { "inputs": { "disko": "disko", + "flake-parts": "flake-parts", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs", "nur": "nur", "plasma-manager": "plasma-manager", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "treefmt-nix": "treefmt-nix" } }, "rust-overlay": { @@ -332,6 +356,26 @@ "repo": "default", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733440889, + "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 0590e00..56db461 100644 --- a/flake.nix +++ b/flake.nix @@ -18,16 +18,25 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable-small"; - nur.url = "github:nix-community/nur"; + flake-parts.url = "github:hercules-ci/flake-parts"; - disko.url = "github:nix-community/disko?ref=v1.9.0"; - disko.inputs.nixpkgs.follows = "nixpkgs"; + nur.url = "github:nix-community/nur"; + nur.inputs.nixpkgs.follows = "nixpkgs"; + nur.inputs.flake-parts.follows = "flake-parts"; + nur.inputs.treefmt-nix.follows = "treefmt-nix"; sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; + treefmt-nix.url = "github:numtide/treefmt-nix"; + treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; + + disko.url = "github:nix-community/disko?ref=v1.9.0"; + disko.inputs.nixpkgs.follows = "nixpkgs"; + lanzaboote.url = "github:nix-community/lanzaboote?ref=v0.4.1"; lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; + lanzaboote.inputs.flake-parts.follows = "flake-parts"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -93,7 +102,7 @@ mkPkgs = { pkgs, - extraOverlays ? [ nur.overlay ], + extraOverlays ? [ nur.overlays.default ], }: import pkgs { inherit system;