From cedfad483a21e0b9a96d9a78818fa47829a9a8f1 Mon Sep 17 00:00:00 2001 From: kat Date: Sun, 17 Jul 2022 18:14:11 -0700 Subject: [PATCH] refactor: unify home-manager config --- darwin/base/home.nix | 17 ----------------- nixos/base/home.nix | 22 ---------------------- system/home.nix | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 39 deletions(-) delete mode 100644 darwin/base/home.nix delete mode 100644 nixos/base/home.nix create mode 100644 system/home.nix diff --git a/darwin/base/home.nix b/darwin/base/home.nix deleted file mode 100644 index 96ab0336..00000000 --- a/darwin/base/home.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ meta, config, inputs, tf, lib, ... }: with lib; { - options.home-manager.users = mkOption { - type = types.attrsOf (types.submoduleWith { - modules = singleton meta.modules.home; - specialArgs = { - inherit inputs tf meta; - nixos = config; - }; - }); - }; - config = { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - }; - }; -} diff --git a/nixos/base/home.nix b/nixos/base/home.nix deleted file mode 100644 index 35b4b9c8..00000000 --- a/nixos/base/home.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ meta, config, lib, inputs, tf, ... }: - -with lib; - -{ - options.home-manager.users = mkOption { - type = types.attrsOf (types.submoduleWith { - modules = singleton meta.modules.home; - specialArgs = { - inherit inputs tf meta; - nixos = config; - }; - }); - }; - - config = { - home-manager = { - useUserPackages = true; - useGlobalPkgs = true; - }; - }; -} diff --git a/system/home.nix b/system/home.nix new file mode 100644 index 00000000..9cc22ed7 --- /dev/null +++ b/system/home.nix @@ -0,0 +1,17 @@ +{ meta, config, lib, inputs, tf, ... }: + +with lib; + +{ + home-manager = { + extraSpecialArgs = { + inherit inputs tf meta; + nixos = config; + }; + sharedModules = [ + meta.modules.home + ]; + useUserPackages = true; + useGlobalPkgs = true; + }; +}