From 6bc87978615d0e060714b7336c5f842138062bc8 Mon Sep 17 00:00:00 2001 From: Chris Kruining Date: Sun, 1 Sep 2024 23:15:39 +0200 Subject: [PATCH] another attempt on plasma-manager --- flake.lock | 27 ++++----------------------- flake.nix | 1 + modules/options.nix | 1 - 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 5196c2f..fe552ba 100644 --- a/flake.lock +++ b/flake.lock @@ -423,27 +423,6 @@ } }, "home-manager_3": { - "inputs": { - "nixpkgs": [ - "plasma-manager", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_4": { "inputs": { "nixpkgs": [ "stylix", @@ -667,7 +646,9 @@ }, "plasma-manager": { "inputs": { - "home-manager": "home-manager_3", + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs" ] @@ -728,7 +709,7 @@ "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_3", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_4", + "home-manager": "home-manager_3", "nixpkgs": "nixpkgs_4", "systems": "systems_3" }, diff --git a/flake.nix b/flake.nix index be97380..02a402a 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ plasma-manager = { url = "github:nix-community/plasma-manager"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; }; nixvim = { diff --git a/modules/options.nix b/modules/options.nix index 970e28c..bda200c 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -47,7 +47,6 @@ in home-manager = { useGlobalPkgs = true; useUserPackages = true; - extraSpecialArgs = { inherit inputs; }; sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager inputs.nixvim.homeManagerModules.nixvim