diff --git a/flake.lock b/flake.lock index 02f4635..3869ceb 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1687665384, - "narHash": "sha256-XARNmyXnmcWeBwfN5YXhiOWHsE3pPojasE1C2OieO7o=", + "lastModified": 1692390679, + "narHash": "sha256-4EhjUzaNRc63ngpTpxod9Z4sQQqPoIpPErZ0uRp3h2Q=", "owner": "caarlos0", "repo": "nur", - "rev": "854c0826e775f5f44cc317c724ac6343c7c5d616", + "rev": "528c9cb69bd3d1e6e19e9ffe70cd78cd4075c5b1", "type": "github" }, "original": { @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1691963303, - "narHash": "sha256-zqvt4N4Ic06BrGo02itCIPTEKzVnGT0BtGbIr+aUGqE=", + "lastModified": 1692248770, + "narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "3fcd83783a1e2ddad0f14821da4186a95bc76c50", + "rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b", "type": "github" }, "original": { @@ -110,11 +110,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -187,11 +187,11 @@ ] }, "locked": { - "lastModified": 1692222899, - "narHash": "sha256-dHrv+lMUKFXLnzc/yYhEpNr34JYG8gwD4eH6qcrScFI=", + "lastModified": 1693187908, + "narHash": "sha256-cTcNpsqi1llmUFl9bmCdD0mTyfjhBrNFPhu2W12WXzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "2471d965a3522025157a790fc49c3567fd56e26e", + "rev": "8bde7a651b94ba30bd0baaa9c4a08aae88cc2e92", "type": "github" }, "original": { @@ -208,11 +208,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1692169395, - "narHash": "sha256-kSMv426umcKU6tsmkkdc17NpODYh7+JW2/4IqnsN3wA=", + "lastModified": 1693292700, + "narHash": "sha256-yrNZ3v80A5G4up0V9jHByU5POFHI6gxYZCYv/4zXGeY=", "owner": "nekowinston", "repo": "nur", - "rev": "59d396643d3d98f952825ec5b38a682578e9d74f", + "rev": "9060b8dfd0e1fed8d7df093c7c6f3181a5044042", "type": "github" }, "original": { @@ -228,11 +228,11 @@ ] }, "locked": { - "lastModified": 1691897365, - "narHash": "sha256-jvWIU4ht3YAmF8TDVM2Ps2+Gf4MtNGLL1zEWQZdTrzU=", + "lastModified": 1693107069, + "narHash": "sha256-5dVXPchyvzmytanlwXHcmeQP9AfO/98Q6V+QtsMl5vQ=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f4d70d098f066a30c7087144063dca179495f7d6", + "rev": "53d40cf1bea235658ef8f6e8b8a1d033e2ecbfff", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1692235382, - "narHash": "sha256-T+mR2Jh9x2S94VzuRJxorRUcEIShuXtECCzvmbLRuyY=", + "lastModified": 1693271890, + "narHash": "sha256-3aWxvCFnV3s8enoeFwYoUvzmY5qm5r3HGmq9Kohrd9o=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "953c8a9f3ecafdea6cdcd112d997f4a23cf50b7f", + "rev": "92e2fd2dd62aea7abd71cc7be129f0dd1955fa79", "type": "github" }, "original": { @@ -317,11 +317,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1691654369, - "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", + "lastModified": 1693003285, + "narHash": "sha256-5nm4yrEHKupjn62MibENtfqlP6pWcRTuSKrMiH9bLkc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", + "rev": "5690c4271f2998c304a45c91a0aeb8fb69feaea7", "type": "github" }, "original": { @@ -333,11 +333,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1692174805, - "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=", + "lastModified": 1693158576, + "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e", + "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780", "type": "github" }, "original": { @@ -365,11 +365,11 @@ }, "nur": { "locked": { - "lastModified": 1692237263, - "narHash": "sha256-B+P6HJyHm4xNVdFG3eEY2Uu0br7DVr1r3EYQPPnOo2U=", + "lastModified": 1693313869, + "narHash": "sha256-gz72Ya7qOLUZ6PHJY7shAlJRTvrv7EG9bK3YJ6/EZ/0=", "owner": "nix-community", "repo": "nur", - "rev": "6bdd89c5f8922468eab362e2206901e30b742259", + "rev": "af03fbc52348a0bdb1c331e6a0a0f8661f192841", "type": "github" }, "original": { @@ -387,11 +387,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1692203373, - "narHash": "sha256-St6Ie93YMi8ugwnbIFLuse7KE9f7nwmwT+fo86Mk/8Y=", + "lastModified": 1692274144, + "narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "3e3d45c1f26e212abe24188ece996871d94618d8", + "rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa", "type": "github" }, "original": { @@ -429,11 +429,11 @@ ] }, "locked": { - "lastModified": 1691892594, - "narHash": "sha256-Lt9/WUnI/ZqBYnHOC3n6Lg5jTfd/ZI+39jZx5HmolSQ=", + "lastModified": 1693102271, + "narHash": "sha256-JuxJYl7zZ9FUOA/3Az5OPYWQfH9Y8SvtqqFnPKB6zUw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c638e10caf94caaa97fb1df74e3bb467dc9b92db", + "rev": "1aac4029cfbc529f8b39c96d29fe1d09338f9110", "type": "github" }, "original": { @@ -474,11 +474,11 @@ ] }, "locked": { - "lastModified": 1690650806, - "narHash": "sha256-38x1YjoxUZiSmE0e6TuLG/t7gZquR/dYZOlsgJ69jZI=", + "lastModified": 1692761739, + "narHash": "sha256-TyNaDdt/X0YByliGO34IPsjgAoNDjnZjmP1RAEHAZlg=", "owner": "willpower3309", "repo": "swayfx", - "rev": "c47aa61c64925c72722dfbfa01cd47643a92c7d9", + "rev": "13eeea5ed5f569eb8a9af329af8a7f6b4b0b114e", "type": "github" }, "original": { diff --git a/machines/common/shared/nix.nix b/machines/common/shared/nix.nix index cd83dd8..5d2f3c4 100644 --- a/machines/common/shared/nix.nix +++ b/machines/common/shared/nix.nix @@ -3,7 +3,10 @@ inputs, pkgs, ... -}: { +}: let + inherit (lib) filterAttrs mkForce; + flakes = filterAttrs (name: value: value ? outputs) inputs; +in { nixpkgs.config.allowUnfree = true; nix = { gc.automatic = true; @@ -17,8 +20,12 @@ warn-dirty = false; } // ((import ../../../flake.nix).nixConfig); + registry = + builtins.mapAttrs + (name: v: {flake = v;}) + flakes; }; # set nixPath to the flake nixpkgs without channels - environment.variables.NIX_PATH = lib.mkForce "nixpkgs=${inputs.nixpkgs.outPath}"; + environment.variables.NIX_PATH = mkForce "nixpkgs=${inputs.nixpkgs.outPath}"; }