diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index 7d814d0..8158646 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -29,11 +29,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1723616992, - "narHash": "sha256-jDHYfEECzFwZm4huz7AbPjlH3jJ4/2ns9PddtFA5XMY=", + "lastModified": 1724221791, + "narHash": "sha256-mKX67QPnUybOopVph/LhOV1G/H4EvPxDIfSmbufrVdA=", "owner": "nix-community", "repo": "fenix", - "rev": "7bad6c7ff73b784a9c7de9147626c8d5d5072809", + "rev": "e88b38a5a3834e039d413a88f8150a75ef6453ef", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -150,6 +150,22 @@ "type": "github" } }, + "mynixpkgs": { + "locked": { + "lastModified": 1723661844, + "narHash": "sha256-XWwdNzOsWPlDVFkQvZKGuzBXBxBwWYzyoDQcbNIkDiA=", + "owner": "anthonycicc", + "repo": "nixpkgs", + "rev": "329ab81c77c782f3ddac34613f1d4aa0db3de3d2", + "type": "github" + }, + "original": { + "owner": "anthonycicc", + "ref": "patch-1", + "repo": "nixpkgs", + "type": "github" + } + }, "nix-flake-tests": { "locked": { "lastModified": 1677844186, @@ -194,11 +210,11 @@ ] }, "locked": { - "lastModified": 1723352546, - "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=", + "lastModified": 1723950649, + "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06", + "rev": "392828aafbed62a6ea6ccab13728df2e67481805", "type": "github" }, "original": { @@ -252,11 +268,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1723400004, - "narHash": "sha256-L1B0feXYWM/oaGaJAegVsDAWLVBtEcqcZ4gI+/cnYjY=", + "lastModified": 1723990833, + "narHash": "sha256-Xr3IMc+/xaU+XcVFamzqQA5hVxdd8My1X2TQlYBRmr8=", "owner": "NixNeovim", "repo": "NixNeovimPlugins", - "rev": "4a812c5ad6926af25c52c4db3610ce669919e1e1", + "rev": "ab8f221f069eee5f95bd1503a4518ca8f322c60f", "type": "github" }, "original": { @@ -282,16 +298,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723661844, - "narHash": "sha256-XWwdNzOsWPlDVFkQvZKGuzBXBxBwWYzyoDQcbNIkDiA=", - "owner": "anthonycicc", + "lastModified": 1724243746, + "narHash": "sha256-NNe2UQPr8ZA7AKnehn1JNH/pA6mK8pAhPqT0AxWNrig=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "329ab81c77c782f3ddac34613f1d4aa0db3de3d2", + "rev": "ab13423a4167ad7ab7095ca7cbac70dd6231d9ca", "type": "github" }, "original": { - "owner": "anthonycicc", - "ref": "patch-1", + "owner": "nixos", "repo": "nixpkgs", "type": "github" } @@ -360,6 +375,7 @@ "fenix": "fenix", "flake-utils": "flake-utils", "home-manager": "home-manager", + "mynixpkgs": "mynixpkgs", "nix-index-database": "nix-index-database", "nixneovim": "nixneovim", "nixneovimplugins": "nixneovimplugins", @@ -371,11 +387,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1723561310, - "narHash": "sha256-a3KMMsIDvdo+ClLabh5wfJoa17YTSvy2wDLb8yZCXvc=", + "lastModified": 1724153119, + "narHash": "sha256-WxpvDJDttkINkXmUA/W5o11lwLPYhATAgu0QUAacZ2g=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "78c2bdce860dbd996a8083224d01a96660dd6a15", + "rev": "3723e5910c14f0ffbd13de474b8a8fcc74db04ce", "type": "github" }, "original": { @@ -414,11 +430,11 @@ ] }, "locked": { - "lastModified": 1722997267, - "narHash": "sha256-8Pncp8IKd0f0N711CRrCGTC4iLfBE+/5kaMqyWxnYic=", + "lastModified": 1723774846, + "narHash": "sha256-m53hVat6XXiKooV1oUDEMnPcdNKqSn/kAW+g8juSq84=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d720bf3cebac38c2426d77ee2e59943012854cb8", + "rev": "519f4892641bc04a6ac7c2d260cc68356f9ae90f", "type": "github" }, "original": { @@ -484,11 +500,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1723031177, - "narHash": "sha256-bjiFmTOpd42a15NTtn8taQxUzCD+7+XbR+HklijsVO4=", + "lastModified": 1723818372, + "narHash": "sha256-dxRAONapqZRIlNfDyh/RVh011pdklBEDr92OsJizkAA=", "owner": "dj95", "repo": "zjstatus", - "rev": "e1e3b566268fbf6c80d6544f38b06368d23b4b46", + "rev": "671e0d12737cd8b269ca4408cfc67295ad3760b7", "type": "github" }, "original": { diff --git a/nix/home-manager/flake.nix b/nix/home-manager/flake.nix index 59dd5f6..dd94858 100644 --- a/nix/home-manager/flake.nix +++ b/nix/home-manager/flake.nix @@ -8,7 +8,8 @@ inputs = { # Specify the source of Home Manager and Nixpkgs. - nixpkgs = {url = "github:anthonycicc/nixpkgs/patch-1";}; + mynixpkgs = {url = "github:anthonycicc/nixpkgs/patch-1";}; + nixpkgs = {url = "github:nixos/nixpkgs";}; flake-utils.url = "github:numtide/flake-utils"; # not directly used, but common source for the several flakes that do use it home-manager = { url = "github:nix-community/home-manager"; @@ -58,6 +59,7 @@ outputs = inputs @ { self, + mynixpkgs, nixpkgs, home-manager, nix-index-database, @@ -86,6 +88,7 @@ then inputs.wezterm.packages.${prev.system}.default else prev.wezterm; }) + (_final: prev: {inherit (mynixpkgs.legacyPackages.${prev.system}) gql;}) nixneovimplugins.overlays.default fenix.overlays.default ];