diff --git a/flake.lock b/flake.lock index 83beac4..2264c3f 100644 --- a/flake.lock +++ b/flake.lock @@ -99,14 +99,16 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1600939014, - "narHash": "sha256-KAE8spJnWmnFy1H1QVyRa2fA/09MxbZgjzvilqBhCPY=", + "lastModified": 1600992519, + "narHash": "sha256-Y9wlciB/g1QUquVpTZXQq23I5r8qJ4nZArfczTYBo24=", "owner": "nix-community", "repo": "home-manager", - "rev": "690d93c22a8812c303a52786022f3f0441dfd06a", + "rev": "abfb4cde51856dbee909f373b59cd941f51c2170", "type": "github" }, "original": { @@ -118,24 +120,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1600573085, - "narHash": "sha256-w5SGosyuTbFCBoUzgy2gyVcxYxRUvZ6SgHsRIPkZXgI=", - "path": "/nix/store/4abah8x1z3lna1k70mm2zpms62g0kf08-source", - "rev": "1179840f9a88b8a548f4b11d1a03aa25a790c379", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1600573085, - "narHash": "sha256-w5SGosyuTbFCBoUzgy2gyVcxYxRUvZ6SgHsRIPkZXgI=", + "lastModified": 1600834745, + "narHash": "sha256-JblQ+Io/P6oZVzMk0QhpsMNPaYDMjFaLh+lSuu7Pd5c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1179840f9a88b8a548f4b11d1a03aa25a790c379", + "rev": "daaa0e33505082716beb52efefe3064f0332b521", "type": "github" }, "original": { @@ -145,22 +134,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1600791342, - "narHash": "sha256-rHcPneff0ktF2Jhmh8kd+NqP1SaHa6uU2YJx1kyG1qQ=", - "owner": "NixOS", - "repo": "nixpkgs-channels", - "rev": "6ec10fc77e56b9f848930f129833cfbbac736e4f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-20.03", - "repo": "nixpkgs-channels", - "type": "github" - } - }, "nur": { "locked": { "lastModified": 1600942119, @@ -184,7 +157,9 @@ "flake-utils": "flake-utils_2", "gitignore-nix-src": "gitignore-nix-src", "hindent-src": "hindent-src", - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1600939022, @@ -205,7 +180,7 @@ "inputs": { "flake-utils": "flake-utils", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nur": "nur", "pre-commit-hooks": "pre-commit-hooks" } diff --git a/flake.nix b/flake.nix index f93d3eb..d219e42 100644 --- a/flake.nix +++ b/flake.nix @@ -3,13 +3,19 @@ inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.home-manager.url = "github:nix-community/home-manager/master"; + inputs.home-manager = { + url = "github:nix-community/home-manager/master"; + inputs.nixpkgs.follows = "nixpkgs"; + }; inputs.nur.url = "github:nix-community/NUR/master"; - inputs.pre-commit-hooks.url = - # "github:Myhlamaeus/pre-commit-hooks.nix/feat/flake"; - "github:Myhlamaeus/pre-commit-hooks.nix/8d48a4cd434a6a6cc8f2603b50d2c0b2981a7c55"; + inputs.pre-commit-hooks = { + url = + # "github:Myhlamaeus/pre-commit-hooks.nix/feat/flake"; + "github:Myhlamaeus/pre-commit-hooks.nix/8d48a4cd434a6a6cc8f2603b50d2c0b2981a7c55"; + inputs.nixpkgs.follows = "nixpkgs"; + }; outputs = { self, nixpkgs, flake-utils, home-manager, nur, pre-commit-hooks }: let