diff --git a/flake.lock b/flake.lock index 764e529b..404d71af 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1654230545, - "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=", + "lastModified": 1654953433, + "narHash": "sha256-TwEeh4r50NdWHFAHQSyjCk2cZxgwUfcCCAJOhPdXB28=", "owner": "nixos", "repo": "nixpkgs", - "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec", + "rev": "90cd5459a1fd707819b9a3fb9c852beaaac3b79a", "type": "github" }, "original": { diff --git a/nixos/common.nix b/nixos/common.nix index dab12059..bbc0f976 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -11,7 +11,8 @@ let extendedLib = import ../modules/lib/stdlib-extended.nix pkgs.lib; - hmModule' = types.submoduleWith { + hmModule = types.submoduleWith { + description = "Home Manager module"; specialArgs = { lib = extendedLib; osConfig = config; @@ -38,16 +39,6 @@ let }; }) ] ++ cfg.sharedModules; - } // { - description = "Home Manager module"; - }; - - # TODO: hack until https://github.com/NixOS/nixpkgs/pull/173621 lands - hmModule = hmModule' // { - substSubModules = m: - hmModule'.substSubModules m // { - inherit (hmModule') description; - }; }; in {