diff --git a/flake.lock b/flake.lock index 175549b..844b2b6 100644 --- a/flake.lock +++ b/flake.lock @@ -2,9 +2,7 @@ "nodes": { "caarlos0-nur": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1687665384, @@ -20,31 +18,6 @@ "type": "github" } }, - "crane": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nekowinston-nur", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1676846788, - "narHash": "sha256-XLsHLgXyMdliMeAXuzdGP+TXBaV44kG1RPTUHNOs6Jk=", - "owner": "ipetkov", - "repo": "crane", - "rev": "953b70da2813fb882c39890f2514e7db76fc8843", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "v0.11.3", - "repo": "crane", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -52,11 +25,11 @@ ] }, "locked": { - "lastModified": 1689188243, - "narHash": "sha256-v3EDlWWLBQ+LIRWZ03jd8bnvHLyNae6iaqd03rbYhwo=", + "lastModified": 1689516967, + "narHash": "sha256-sFAa33wkQHanmij/uhfGduIDK8z4dJAita/rK6u9pvE=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "2ad716c2786dabf8f458ae1e7d343775d3acc65c", + "rev": "61662a63bfe1726588c1da6b412df86d8ca94d63", "type": "github" }, "original": { @@ -81,38 +54,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -150,12 +91,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -192,11 +136,11 @@ ] }, "locked": { - "lastModified": 1689134369, - "narHash": "sha256-0G9dutIvhS/WUr3Awcnqw71g8EVVvvkOhVDnDDbY4Fw=", + "lastModified": 1689495092, + "narHash": "sha256-yZu2j5FpLZEPhJQQutMCPTxa1VMigLPabLYvLTq6ASM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e42fb59768f0305085abde0dd27ab5e0cc15420c", + "rev": "2f84579a70b8c74e5ebb37299a0c3ba279f09382", "type": "github" }, "original": { @@ -205,41 +149,16 @@ "type": "github" } }, - "icat": { - "inputs": { - "nixpkgs": [ - "nekowinston-nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688930064, - "narHash": "sha256-9HeztRRQyfFJPYUW/3Ryi0leFMcTUsT9P1aofc/A/VA=", - "owner": "nekowinston", - "repo": "icat", - "rev": "3a266a28051e6cd9bdb844becf79862a73da1c73", - "type": "github" - }, - "original": { - "owner": "nekowinston", - "repo": "icat", - "type": "github" - } - }, "nekowinston-nur": { "inputs": { - "crane": "crane", - "flake-compat": "flake-compat_3", - "icat": "icat", - "nixpkgs": "nixpkgs", - "wezterm-src": "wezterm-src" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1689223512, - "narHash": "sha256-PRcSsKjSwTF55a8MBmyWpQDvZ4yqgkkQR9p5nD3x5R0=", + "lastModified": 1689577374, + "narHash": "sha256-l3ptfx4QsXKCSj7u3NUEsvw+PVSiJo7Tr7D8AM5jWNY=", "owner": "nekowinston", "repo": "nur", - "rev": "6ca86f16df67fd89873cbbf130ab93f077c17de8", + "rev": "8202ce8e8477e9301e7e8d9008fe16f162b2a4dc", "type": "github" }, "original": { @@ -255,11 +174,11 @@ ] }, "locked": { - "lastModified": 1688874465, - "narHash": "sha256-BUwl+tq40EjkufTZkqf3lWFzxOA/mYBTHz+p5uJtjaY=", + "lastModified": 1689479461, + "narHash": "sha256-Ak+PTYdmfOQEmcOsOEnrwqdP0HP20PLraRwpjSAzSeE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "757114749d4613cf71f3748e780a1be8a67a5d3c", + "rev": "22fa44b7f14684d184733fb26a628f3878ff7aaf", "type": "github" }, "original": { @@ -270,9 +189,7 @@ }, "nix-vscode-extensions": { "inputs": { - "flake-compat": [ - "flake-compat" - ], + "flake-compat": [], "flake-utils": [ "flake-utils" ], @@ -281,11 +198,11 @@ ] }, "locked": { - "lastModified": 1689213562, - "narHash": "sha256-DLfhfolM9XSvWcSYtW1VT9wf5TQw0CgksIvbCjmpqHw=", + "lastModified": 1689645892, + "narHash": "sha256-hF6KdY2HpcbIErSt5GRgFb6g9IpaZa6GY4EoR0v2g44=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "53ee5380756e60bef84d4bf03d2cf55f49d69bb5", + "rev": "0fa35c4774a4ac3fe31fdbc4f6822d8b2f440d0c", "type": "github" }, "original": { @@ -296,11 +213,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1689078114, - "narHash": "sha256-osG8BrX5RpKJ7wH+vI6auOU+ctvNOblT4XXCgknK47c=", + "lastModified": 1685677062, + "narHash": "sha256-zoHF7+HNwNwne2XEomphbdc4Y8tdWT16EUxUTXpOKpQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6cc7ff8fee93789bc871a267ab876c3fca042cb", + "rev": "95be94370d09f97f6af6a1df1eb9649b5260724e", "type": "github" }, "original": { @@ -328,17 +245,65 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1689168768, - "narHash": "sha256-mCw3LPg2jJkapvJpkd1IZ8k0IJlSG2ECvz3vcOAu+Uo=", + "lastModified": 1689373857, + "narHash": "sha256-mtBksyvhhT98Zsm9tYHuMKuLwUKDwv+BGTl6K5nOGhY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "dfdbcc428f365071f0ca3888f6ec8c25c3792885", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1689534811, + "narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6fd9edc94426a3c050ad589c8f033b5ca55454c7", + "rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1685866647, + "narHash": "sha256-4jKguNHY/edLYImB+uL8jKPL/vpfOvMmSlLAGfxSrnY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a53a3bec10deef6e1cc1caba5bc60f53b959b1e8", + "type": "github" + }, + "original": { + "owner": "NixOS", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" @@ -346,11 +311,11 @@ }, "nur": { "locked": { - "lastModified": 1689230218, - "narHash": "sha256-Mq03DaQyFbFILI8pccTBnfhxCtiPX2+ekTcUIvxRtzM=", + "lastModified": 1689642505, + "narHash": "sha256-Xn2y9CHStXtl1dOFoSfCRRDB6/vGiFTTB9X6kGw69UE=", "owner": "nix-community", "repo": "nur", - "rev": "81d9847783198d506dd0a0566eafe2be0feaa961", + "rev": "0c89ba379bdbcd48cf05f79372dc9918f9de0390", "type": "github" }, "original": { @@ -361,26 +326,18 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": [ - "flake-compat" - ], - "flake-utils": [ - "flake-utils" - ], + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_4", + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1688596063, - "narHash": "sha256-9t7RxBiKWHygsqXtiNATTJt4lim/oSYZV3RG8OjDDng=", + "lastModified": 1689553106, + "narHash": "sha256-RFFf6BbpqQB0l1ehAbgri9g9MGZkAY9UdiNotD9fG8Y=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "c8d18ba345730019c3faf412c96a045ade171895", + "rev": "87589fa438dd6d5b8c7c1c6ab2ad69e4663bb51f", "type": "github" }, "original": { @@ -393,47 +350,19 @@ "inputs": { "caarlos0-nur": "caarlos0-nur", "darwin": "darwin", - "flake-compat": "flake-compat", "flake-parts": "flake-parts", "flake-utils": "flake-utils", "home-manager": "home-manager", "nekowinston-nur": "nekowinston-nur", "nix-index-database": "nix-index-database", "nix-vscode-extensions": "nix-vscode-extensions", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nur": "nur", "pre-commit-hooks": "pre-commit-hooks", "sops": "sops", "swayfx": "swayfx" } }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "nekowinston-nur", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "nekowinston-nur", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1676437770, - "narHash": "sha256-mhJye91Bn0jJIE7NnEywGty/U5qdELfsT8S+FBjTdG4=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "a619538647bd03e3ee1d7b947f7c11ff289b376e", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops": { "inputs": { "nixpkgs": [ @@ -444,11 +373,11 @@ ] }, "locked": { - "lastModified": 1689149796, - "narHash": "sha256-3FCUdayBHcxk6BZOxEIfa5UxbXNQzTc/VlN7ociI2Dw=", + "lastModified": 1689534977, + "narHash": "sha256-EB4hasmjKgetTR0My2bS5AwELZFIQ4zANLqHKi7aVXg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "88b964df6981e4844c07be8c192aa6bdca768a10", + "rev": "bd695cc4d0a5e1bead703cc1bec5fa3094820a81", "type": "github" }, "original": { @@ -459,9 +388,7 @@ }, "swayfx": { "inputs": { - "flake-compat": [ - "flake-compat" - ], + "flake-compat": [], "nixpkgs": [ "nixpkgs" ] @@ -495,22 +422,19 @@ "type": "github" } }, - "wezterm-src": { - "flake": false, + "systems_2": { "locked": { - "lastModified": 1689096450, - "narHash": "sha256-dxdbCywgu2CqO3jDG3Yr+XPm01QSflg/1CiEs6zYhFs=", - "ref": "refs/heads/main", - "rev": "523660c19222d157969cf073709436050747478b", - "revCount": 7304, - "submodules": true, - "type": "git", - "url": "https://github.com/wez/wezterm" + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" }, "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/wez/wezterm" + "owner": "nix-systems", + "repo": "default", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index e3e83c5..155ad49 100644 --- a/flake.nix +++ b/flake.nix @@ -2,45 +2,34 @@ description = "nekowinston's hm flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; darwin.url = "github:lnl7/nix-darwin"; darwin.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nur.url = "github:nix-community/nur"; - nekowinston-nur.url = "github:nekowinston/nur"; caarlos0-nur.url = "github:caarlos0/nur"; - caarlos0-nur.inputs.nixpkgs.follows = "nixpkgs"; + nekowinston-nur.url = "github:nekowinston/nur"; nix-vscode-extensions = { url = "github:nix-community/nix-vscode-extensions"; - inputs.flake-compat.follows = "flake-compat"; + inputs.flake-compat.follows = ""; inputs.flake-utils.follows = "flake-utils"; inputs.nixpkgs.follows = "nixpkgs"; }; - sops.url = "github:Mic92/sops-nix"; - sops.inputs.nixpkgs.follows = "nixpkgs"; - sops.inputs.nixpkgs-stable.follows = "nixpkgs"; - nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; - - swayfx.url = "github:willpower3309/swayfx"; - swayfx.inputs.flake-compat.follows = "flake-compat"; + nix-index-database.url = "github:Mic92/nix-index-database"; + sops.inputs.nixpkgs-stable.follows = "nixpkgs"; + sops.inputs.nixpkgs.follows = "nixpkgs"; + sops.url = "github:Mic92/sops-nix"; + swayfx.inputs.flake-compat.follows = ""; swayfx.inputs.nixpkgs.follows = "nixpkgs"; + swayfx.url = "github:willpower3309/swayfx"; - pre-commit-hooks = { - url = "github:cachix/pre-commit-hooks.nix"; - inputs.flake-compat.follows = "flake-compat"; - inputs.flake-utils.follows = "flake-utils"; - inputs.nixpkgs-stable.follows = "nixpkgs"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - flake-compat.url = "github:edolstra/flake-compat"; - flake-compat.flake = false; - flake-utils.url = "github:numtide/flake-utils"; flake-parts.url = "github:hercules-ci/flake-parts"; + flake-utils.url = "github:numtide/flake-utils"; + pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; }; outputs = {flake-parts, ...} @ inputs: let @@ -115,7 +104,7 @@ }; nixConfig = { - extra-trusted-substituters = [ + extra-substituters = [ "https://cache.garnix.io" "https://mic92.cachix.org" "https://nekowinston.cachix.org" diff --git a/machines/lib.nix b/machines/lib.nix index a740668..5057d09 100644 --- a/machines/lib.nix +++ b/machines/lib.nix @@ -9,8 +9,9 @@ nekowinston = inputs.nekowinston-nur.packages.${prev.system}; }; }; - sway-unwrapped = inputs.swayfx.packages.${prev.system}.default; + nekowinston-nur = import inputs.nekowinston-nur; nix-vscode-extensions = inputs.nix-vscode-extensions.extensions.${prev.system}; + sway-unwrapped = inputs.swayfx.packages.${prev.system}.default; }) inputs.nekowinston-nur.overlays.default ];