diff --git a/flake.lock b/flake.lock index b299b367..97e4f01b 100644 --- a/flake.lock +++ b/flake.lock @@ -31,36 +31,6 @@ "type": "github" } }, - "crane_2": { - "locked": { - "lastModified": 1792350552, - "narHash": "sha256-292lvpvxTGKryKxh3/3tcIVi85CwYGdl4oOi113Sob8=", - "owner": "ipetkov", - "repo": "crane", - "rev": "e675a36b7377bebe41d548388a2501cbb16d380d", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_3": { - "locked": { - "lastModified": 1767461147, - "narHash": "sha256-TH/xTeq/RI+DOzo+c+4F431eVuBpYVwQwBxzURe7kcI=", - "owner": "ipetkov", - "repo": "crane", - "rev": "7d59256814085fd9666a2ae3e774dc5ee216b630", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -77,38 +47,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -127,42 +65,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1790898470, - "narHash": "sha256-zTwuwezD0w3hpga6a6P8emidzAZFyWqlNeRBlpWOOl8=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "024633cd702b10285db5cb19b40ad48d2399ba60", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, - "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "git-hooks-nix": { "inputs": { "flake-compat": "flake-compat", @@ -185,51 +87,6 @@ "type": "github" } }, - "git-hooks-nix_2": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "kfde", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1791909798, - "narHash": "sha256-VAhpCOmrun/KXimYfR8NM88bciKCui7CqHHhThSzgag=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "1ba1dbfe28738c9a71c266be6efa5b89e75491a9", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks-nix_3": { - "inputs": { - "flake-compat": "flake-compat_3", - "gitignore": "gitignore_2", - "nixpkgs": [ - "kfm", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1767281941, - "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -251,12 +108,243 @@ "type": "github" } }, - "gitignore_2": { + "kfde-crane": { + "locked": { + "lastModified": 1792350552, + "narHash": "sha256-292lvpvxTGKryKxh3/3tcIVi85CwYGdl4oOi113Sob8=", + "owner": "ipetkov", + "repo": "crane", + "rev": "e675a36b7377bebe41d548388a2501cbb16d380d", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "rev": "e675a36b7377bebe41d548388a2501cbb16d380d", + "type": "github" + } + }, + "kfde-flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + } + }, + "kfde-flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "kfde-nixpkgs-lib" + ] + }, + "locked": { + "lastModified": 1790898470, + "narHash": "sha256-zTwuwezD0w3hpga6a6P8emidzAZFyWqlNeRBlpWOOl8=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "024633cd702b10285db5cb19b40ad48d2399ba60", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "024633cd702b10285db5cb19b40ad48d2399ba60", + "type": "github" + } + }, + "kfde-git-hooks-nix": { + "inputs": { + "flake-compat": [ + "kfde-flake-compat" + ], + "nixpkgs": [ + "kfde-nixpkgs" + ] + }, + "locked": { + "lastModified": 1791909798, + "narHash": "sha256-VAhpCOmrun/KXimYfR8NM88bciKCui7CqHHhThSzgag=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "1ba1dbfe28738c9a71c266be6efa5b89e75491a9", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "1ba1dbfe28738c9a71c266be6efa5b89e75491a9", + "type": "github" + } + }, + "kfde-nixpkgs": { + "locked": { + "lastModified": 1793136825, + "narHash": "sha256-2pkE69JpFRInaARSczZytcfPw83IL82E2KdhbWGwdMs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f05535a0efcb2134c478d1e88434fadf486d42b5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f05535a0efcb2134c478d1e88434fadf486d42b5", + "type": "github" + } + }, + "kfde-nixpkgs-lib": { + "locked": { + "lastModified": 1790477367, + "narHash": "sha256-oujbxmVKDhci2E4EM3KyAbRUgp5/IsCoiA/LfEF7OOk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "f7cd230690d9fc982d06129f9189b101fddcfa3b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "f7cd230690d9fc982d06129f9189b101fddcfa3b", + "type": "github" + } + }, + "kfde-rust-overlay": { "inputs": { "nixpkgs": [ - "kfm", - "git-hooks-nix", - "nixpkgs" + "kfde-nixpkgs" + ] + }, + "locked": { + "lastModified": 1793174968, + "narHash": "sha256-u5nUf4cewaT36iIzG1s/VECktqUMiZaGF5BsgervsvQ=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "19ecdd08213836b36c4296a3a4f4af5a3d5308db", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "19ecdd08213836b36c4296a3a4f4af5a3d5308db", + "type": "github" + } + }, + "kfde-treefmt-nix": { + "inputs": { + "nixpkgs": [ + "kfde-nixpkgs" + ] + }, + "locked": { + "lastModified": 1791885023, + "narHash": "sha256-C3alQ2MEt0zVrUSho5NUDo3jmhbff72++bfwoqT9Omo=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "0d6d739a833ba9a9c93034862e4a7b061a062a1c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "0d6d739a833ba9a9c93034862e4a7b061a062a1c", + "type": "github" + } + }, + "kfm-crane": { + "locked": { + "lastModified": 1767461147, + "narHash": "sha256-TH/xTeq/RI+DOzo+c+4F431eVuBpYVwQwBxzURe7kcI=", + "owner": "ipetkov", + "repo": "crane", + "rev": "7d59256814085fd9666a2ae3e774dc5ee216b630", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "rev": "7d59256814085fd9666a2ae3e774dc5ee216b630", + "type": "github" + } + }, + "kfm-flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + } + }, + "kfm-flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "kfm-nixpkgs-lib" + ] + }, + "locked": { + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "type": "github" + } + }, + "kfm-git-hooks-nix": { + "inputs": { + "flake-compat": [ + "kfm-flake-compat" + ], + "gitignore": [ + "kfm-gitignore" + ], + "nixpkgs": [ + "kfm-nixpkgs" + ] + }, + "locked": { + "lastModified": 1767281941, + "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", + "type": "github" + } + }, + "kfm-gitignore": { + "inputs": { + "nixpkgs": [ + "kfm-nixpkgs" ] }, "locked": { @@ -270,56 +358,91 @@ "original": { "owner": "hercules-ci", "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" } }, - "kfde": { - "inputs": { - "crane": "crane_2", - "flake-parts": "flake-parts_2", - "git-hooks-nix": "git-hooks-nix_2", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay", - "treefmt-nix": "treefmt-nix" - }, + "kfm-nixpkgs": { "locked": { - "lastModified": 1, - "narHash": "sha256-q3ucXin2GEW4Nw7bcORvvB5nUInEqELn3OM0mqzpGBg=", - "path": "./komorebi-for-kde", - "type": "path" + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "type": "github" }, "original": { - "path": "./komorebi-for-kde", - "type": "path" + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "type": "github" } }, - "kfm": { - "inputs": { - "crane": "crane_3", - "flake-parts": "flake-parts_3", - "git-hooks-nix": "git-hooks-nix_3", - "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay_2", - "treefmt-nix": "treefmt-nix_2" - }, + "kfm-nixpkgs-lib": { "locked": { - "lastModified": 1, - "narHash": "sha256-jkFT/GVbgNTKhtD+3c31FebXk0KyonSlqCPm1WbdTVE=", - "path": "./komorebi-for-mac", - "type": "path" + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "type": "github" }, "original": { - "path": "./komorebi-for-mac", - "type": "path" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "type": "github" + } + }, + "kfm-rust-overlay": { + "inputs": { + "nixpkgs": [ + "kfm-nixpkgs" + ] + }, + "locked": { + "lastModified": 1767581716, + "narHash": "sha256-FUbiUzdrGkLou37OGfb4vCLPnqdSIvtmJBxjh2iljiE=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "1d3f83babdd21e16bf5cfe0f1efcb4f49ee1bc2c", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "1d3f83babdd21e16bf5cfe0f1efcb4f49ee1bc2c", + "type": "github" + } + }, + "kfm-treefmt-nix": { + "inputs": { + "nixpkgs": [ + "kfm-nixpkgs" + ] + }, + "locked": { + "lastModified": 1767468822, + "narHash": "sha256-MpffQxHxmjVKMiQd0Tg2IM/bSjjdQAM+NDcX6yxj7rE=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "d56486eb9493ad9c4777c65932618e9c2d0468fc", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "d56486eb9493ad9c4777c65932618e9c2d0468fc", + "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1793136825, - "narHash": "sha256-2pkE69JpFRInaARSczZytcfPw83IL82E2KdhbWGwdMs=", + "lastModified": 1766870016, + "narHash": "sha256-fHmxAesa6XNqnIkcS6+nIHuEmgd/iZSP/VXxweiEuQw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f05535a0efcb2134c478d1e88434fadf486d42b5", + "rev": "5c2bc52fb9f8c264ed6c93bd20afa2ff5e763dce", "type": "github" }, "original": { @@ -344,124 +467,35 @@ "type": "github" } }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1790477367, - "narHash": "sha256-oujbxmVKDhci2E4EM3KyAbRUgp5/IsCoiA/LfEF7OOk=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "f7cd230690d9fc982d06129f9189b101fddcfa3b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_3": { - "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1766870016, - "narHash": "sha256-fHmxAesa6XNqnIkcS6+nIHuEmgd/iZSP/VXxweiEuQw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5c2bc52fb9f8c264ed6c93bd20afa2ff5e763dce", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "asc": "asc", "crane": "crane", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", - "kfde": "kfde", - "kfm": "kfm", - "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay_3", - "treefmt-nix": "treefmt-nix_3" + "kfde-crane": "kfde-crane", + "kfde-flake-compat": "kfde-flake-compat", + "kfde-flake-parts": "kfde-flake-parts", + "kfde-git-hooks-nix": "kfde-git-hooks-nix", + "kfde-nixpkgs": "kfde-nixpkgs", + "kfde-nixpkgs-lib": "kfde-nixpkgs-lib", + "kfde-rust-overlay": "kfde-rust-overlay", + "kfde-treefmt-nix": "kfde-treefmt-nix", + "kfm-crane": "kfm-crane", + "kfm-flake-compat": "kfm-flake-compat", + "kfm-flake-parts": "kfm-flake-parts", + "kfm-git-hooks-nix": "kfm-git-hooks-nix", + "kfm-gitignore": "kfm-gitignore", + "kfm-nixpkgs": "kfm-nixpkgs", + "kfm-nixpkgs-lib": "kfm-nixpkgs-lib", + "kfm-rust-overlay": "kfm-rust-overlay", + "kfm-treefmt-nix": "kfm-treefmt-nix", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay", + "treefmt-nix": "treefmt-nix" } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "kfde", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1793174968, - "narHash": "sha256-u5nUf4cewaT36iIzG1s/VECktqUMiZaGF5BsgervsvQ=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "19ecdd08213836b36c4296a3a4f4af5a3d5308db", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "kfm", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1767581716, - "narHash": "sha256-FUbiUzdrGkLou37OGfb4vCLPnqdSIvtmJBxjh2iljiE=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "1d3f83babdd21e16bf5cfe0f1efcb4f49ee1bc2c", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -482,48 +516,6 @@ } }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "kfde", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1791885023, - "narHash": "sha256-C3alQ2MEt0zVrUSho5NUDo3jmhbff72++bfwoqT9Omo=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "0d6d739a833ba9a9c93034862e4a7b061a062a1c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "kfm", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1767468822, - "narHash": "sha256-MpffQxHxmjVKMiQd0Tg2IM/bSjjdQAM+NDcX6yxj7rE=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "d56486eb9493ad9c4777c65932618e9c2d0468fc", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_3": { "inputs": { "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index 5a96f716..264b0d41 100644 --- a/flake.nix +++ b/flake.nix @@ -16,10 +16,40 @@ flake = false; }; - # the other platforms' flakes: their inputs and locks are used, their outputs are made with this - # tree as the source (see the imports below) - kfde.url = "path:./komorebi-for-kde"; - kfm.url = "path:./komorebi-for-mac"; + # the other platforms' flakes (komorebi-for-kde/flake.nix, komorebi-for-mac/flake.nix) are not inputs: their + # flake.nix files are imported below and called with these inputs, which are pinned to exactly the + # revisions of their flake.lock (so nothing here pins the content of those directories) + # inputs of komorebi-for-kde, pinned to the revisions in komorebi-for-kde/flake.lock (keep them equal to it) + kfde-nixpkgs.url = "github:NixOS/nixpkgs/f05535a0efcb2134c478d1e88434fadf486d42b5"; + kfde-nixpkgs-lib.url = "github:nix-community/nixpkgs.lib/f7cd230690d9fc982d06129f9189b101fddcfa3b"; + kfde-flake-compat = { url = "github:NixOS/flake-compat/5edf11c44bc78a0d334f6334cdaf7d60d732daab"; flake = false; }; + kfde-flake-parts.url = "github:hercules-ci/flake-parts/024633cd702b10285db5cb19b40ad48d2399ba60"; + kfde-flake-parts.inputs.nixpkgs-lib.follows = "kfde-nixpkgs-lib"; + kfde-crane.url = "github:ipetkov/crane/e675a36b7377bebe41d548388a2501cbb16d380d"; + kfde-rust-overlay.url = "github:oxalica/rust-overlay/19ecdd08213836b36c4296a3a4f4af5a3d5308db"; + kfde-rust-overlay.inputs.nixpkgs.follows = "kfde-nixpkgs"; + kfde-treefmt-nix.url = "github:numtide/treefmt-nix/0d6d739a833ba9a9c93034862e4a7b061a062a1c"; + kfde-treefmt-nix.inputs.nixpkgs.follows = "kfde-nixpkgs"; + kfde-git-hooks-nix.url = "github:cachix/git-hooks.nix/1ba1dbfe28738c9a71c266be6efa5b89e75491a9"; + kfde-git-hooks-nix.inputs.nixpkgs.follows = "kfde-nixpkgs"; + kfde-git-hooks-nix.inputs.flake-compat.follows = "kfde-flake-compat"; + + # inputs of komorebi-for-mac, pinned to the revisions in komorebi-for-mac/flake.lock (keep them equal to it) + kfm-nixpkgs.url = "github:NixOS/nixpkgs/16c7794d0a28b5a37904d55bcca36003b9109aaa"; + kfm-nixpkgs-lib.url = "github:nix-community/nixpkgs.lib/2075416fcb47225d9b68ac469a5c4801a9c4dd85"; + kfm-flake-compat = { url = "github:NixOS/flake-compat/5edf11c44bc78a0d334f6334cdaf7d60d732daab"; flake = false; }; + kfm-flake-parts.url = "github:hercules-ci/flake-parts/a34fae9c08a15ad73f295041fec82323541400a9"; + kfm-flake-parts.inputs.nixpkgs-lib.follows = "kfm-nixpkgs-lib"; + kfm-crane.url = "github:ipetkov/crane/7d59256814085fd9666a2ae3e774dc5ee216b630"; + kfm-rust-overlay.url = "github:oxalica/rust-overlay/1d3f83babdd21e16bf5cfe0f1efcb4f49ee1bc2c"; + kfm-rust-overlay.inputs.nixpkgs.follows = "kfm-nixpkgs"; + kfm-treefmt-nix.url = "github:numtide/treefmt-nix/d56486eb9493ad9c4777c65932618e9c2d0468fc"; + kfm-treefmt-nix.inputs.nixpkgs.follows = "kfm-nixpkgs"; + kfm-git-hooks-nix.url = "github:cachix/git-hooks.nix/f0927703b7b1c8d97511c4116eb9b4ec6645a0fa"; + kfm-git-hooks-nix.inputs.nixpkgs.follows = "kfm-nixpkgs"; + kfm-git-hooks-nix.inputs.flake-compat.follows = "kfm-flake-compat"; + kfm-gitignore = { url = "github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394"; inputs.nixpkgs.follows = "kfm-nixpkgs"; }; + kfm-git-hooks-nix.inputs.gitignore.follows = "kfm-gitignore"; }; outputs = @@ -307,20 +337,32 @@ ( { lib, ... }: let + # the nested flake.nix files are plain attribute sets: import them and call their + # `lib.mkOutputs` with the inputs declared above (same revisions as their own locks). # `self` of a nested flake: its own outputs, with the revision and the path of this one nestedOutputs = name: dir: let + nestedInputs = lib.genAttrs [ + "nixpkgs" + "flake-parts" + "crane" + "rust-overlay" + "treefmt-nix" + "git-hooks-nix" + ] (n: inputs."${name}-${n}"); + mkOutputs = + ((import (self.outPath + "/${dir}/flake.nix")).outputs (nestedInputs // { inherit self; })).lib.mkOutputs; nestedSelf = outputs // lib.filterAttrs (n: _: n == "rev" || n == "dirtyRev") self // { outPath = self.outPath + "/${dir}"; - inputs = inputs.${name}.inputs; + inputs = nestedInputs; }; - outputs = inputs.${name}.lib.mkOutputs { + outputs = mkOutputs { self = nestedSelf; - inputs = inputs.${name}.inputs // { + inputs = nestedInputs // { self = nestedSelf; }; repoRoot = self;