diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index d5f644e..1cf950b 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -23,11 +23,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1728973961, - "narHash": "sha256-Jkqaw9O7WXTf5SHrK7xr9HpVU/mEPVg0Sp6s3AENC90=", + "lastModified": 1729375822, + "narHash": "sha256-bRo4xVwUhvJ4Gz+OhWMREFMdBOYSw4Yi1Apj01ebbug=", "owner": "nix-community", "repo": "fenix", - "rev": "d6a9ff4d1e60c347a23bc96ccdb058d37a810541", + "rev": "2853e7d9b5c52a148a9fb824bfe4f9f433f557ab", "type": "github" }, "original": { @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1729027341, - "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", + "lastModified": 1729459288, + "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", + "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", "type": "github" }, "original": { @@ -144,6 +144,22 @@ "type": "github" } }, + "miseNixPkgs": { + "locked": { + "lastModified": 1729161044, + "narHash": "sha256-H3tzH48tGPj4ZzLX2m7bsBwvtzUR/yiynefahkc6C74=", + "owner": "konradmalik", + "repo": "nixpkgs", + "rev": "198957524ffeca414d2dc92e9cd6448a646a5e0b", + "type": "github" + }, + "original": { + "owner": "konradmalik", + "ref": "mise", + "repo": "nixpkgs", + "type": "github" + } + }, "nix-flake-tests": { "locked": { "lastModified": 1677844186, @@ -188,11 +204,11 @@ ] }, "locked": { - "lastModified": 1728790083, - "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", + "lastModified": 1729394935, + "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", + "rev": "04f8a11f247ba00263b060fbcdc95484fd046104", "type": "github" }, "original": { @@ -246,11 +262,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1728829310, - "narHash": "sha256-Bwy4gh8b8ZXuiTAsveY93sMlEpfCLA2ciI3AoLpp03Q=", + "lastModified": 1729434130, + "narHash": "sha256-0b23Ko4EcXHLrbZUK8Pd/oUGZQy9ulsg9g76DiIGW/s=", "owner": "NixNeovim", "repo": "NixNeovimPlugins", - "rev": "747a6da6950ee5a04beeea7ac0c53b78bd54c2ae", + "rev": "38d7b0a3dfc7d3cd247deeac13d6c4a17ae93c66", "type": "github" }, "original": { @@ -276,11 +292,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729098676, - "narHash": "sha256-pi9xRenQI9FE95oWjVihLs+GGuvE+yZev4SmCgglN1Q=", + "lastModified": 1729475264, + "narHash": "sha256-UomFmaokBHdzQcgagQEq09Dd5NJhKdn9+h92vyt04BQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2c26988772f4cab8c742231e4cc3f4ffddf3b87", + "rev": "aca8144f8aeca1044ad6bc29ad9cae0bd12dfb19", "type": "github" }, "original": { @@ -289,6 +305,22 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1726238386, + "narHash": "sha256-3//V84fYaGVncFImitM6lSAliRdrGayZLdxWlpcuGk0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "01f064c99c792715054dc7a70e4c1626dbbec0c3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nmd": { "flake": false, "locked": { @@ -353,6 +385,7 @@ "fenix": "fenix", "flake-utils": "flake-utils", "home-manager": "home-manager", + "miseNixPkgs": "miseNixPkgs", "nix-index-database": "nix-index-database", "nixneovim": "nixneovim", "nixneovimplugins": "nixneovimplugins", @@ -364,11 +397,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1728921748, - "narHash": "sha256-BOCZ5osPOMh2BPHnkK4sVdTGj7sn47rBn1nxjrzWe5U=", + "lastModified": 1729255720, + "narHash": "sha256-yODOuZxBkS0UfqMa6nmbqNbVfIbsu0tYLbV5vZzmsqI=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "0319586ef2a2636f6d6b891690b7ebebf4337c85", + "rev": "72b214fbfbe6f7b95a7877b962783bd42062cc0a", "type": "github" }, "original": { @@ -443,9 +476,7 @@ "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay", "zlib": "zlib" }, diff --git a/nix/home-manager/flake.nix b/nix/home-manager/flake.nix index 3c47bd0..99a7682 100644 --- a/nix/home-manager/flake.nix +++ b/nix/home-manager/flake.nix @@ -9,6 +9,7 @@ inputs = { # Specify the source of Home Manager and Nixpkgs. nixpkgs = {url = "github:nixos/nixpkgs";}; + miseNixPkgs = {url = "github:konradmalik/nixpkgs/mise";}; 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"; @@ -50,7 +51,7 @@ wezterm = { url = "github:wez/wezterm?dir=nix"; inputs = { - nixpkgs.follows = "nixpkgs"; + # nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; }; }; @@ -66,6 +67,7 @@ zjstatus, fenix, wezterm, + miseNixPkgs, ... }: let supportedSystems = ["aarch64-darwin" "x86_64-linux"]; @@ -86,7 +88,7 @@ then inputs.wezterm.packages.${prev.system}.default else prev.wezterm; }) - # TODO (_final: prev: {inherit (mynixpkgs.legacyPackages.${prev.system}) gql;}) - Actually cool and useful trick + (_final: prev: {inherit (miseNixPkgs.legacyPackages.${prev.system}) mise;}) nixneovimplugins.overlays.default fenix.overlays.default ];