From d3bee9d2def7e7c527f62f38cccd6142065d0653 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 31 Oct 2020 11:44:52 +0000 Subject: [PATCH] ops/nixos: import home-manager into lib/common --- ops/nixos/lib/client.nix | 2 -- ops/nixos/lib/common.nix | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ops/nixos/lib/client.nix b/ops/nixos/lib/client.nix index ccefd16728..10ea35cec5 100644 --- a/ops/nixos/lib/client.nix +++ b/ops/nixos/lib/client.nix @@ -7,8 +7,6 @@ let inherit (lib) mkBefore; in { - imports = [ ../../../third_party/home-manager/nixos ]; - config = { my.home-manager.imports = lib.mkAfter [ ./home-manager/client.nix ]; nix.gc.automatic = false; diff --git a/ops/nixos/lib/common.nix b/ops/nixos/lib/common.nix index 554c42fff1..8675135cb0 100644 --- a/ops/nixos/lib/common.nix +++ b/ops/nixos/lib/common.nix @@ -7,6 +7,8 @@ let inherit (lib) mkDefault; in { + imports = [ ../../../third_party/home-manager/nixos ]; + options.my.home-manager.imports = lib.mkOption { type = lib.types.listOf lib.types.path; default = [ ./home-manager/common.nix ];