From 243183438043fbe867c3b108f539b676d05dfdda Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Fri, 7 May 2021 14:14:23 +0100
Subject: [PATCH] modules/home: Generalised for all users, arc-nixexprs use
 compacted

---
 modules/home/default.nix  | 7 +------
 nixos.nix                 | 5 ++---
 users/hexchen/default.nix | 4 ----
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/modules/home/default.nix b/modules/home/default.nix
index 6c9df2b4..ecbc2686 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -2,14 +2,9 @@
 
 {
   disabledModules = [ "programs/vim.nix" ];
-  imports = [
+  imports = with (import (sources.arc-nixexprs + "/modules")).home-manager; [ base16 syncplay konawall i3gopher weechat ] ++ [
     ./vim.nix
     ./deploy-tf
     (sources.tf-nix + "/modules/home/secrets.nix")
-    (import (sources.arc-nixexprs + "/modules")).home-manager.base16
-    (import (sources.arc-nixexprs + "/modules")).home-manager.syncplay
-    (import (sources.arc-nixexprs + "/modules")).home-manager.konawall
-    (import (sources.arc-nixexprs + "/modules")).home-manager.i3gopher
-    (sources.arc-nixexprs + "/modules/home/weechat.nix")
   ];
 }
diff --git a/nixos.nix b/nixos.nix
index 849ea1b9..f79013f4 100644
--- a/nixos.nix
+++ b/nixos.nix
@@ -19,7 +19,7 @@
 
   options.home-manager.users = lib.mkOption {
     type = lib.types.attrsOf (lib.types.submoduleWith {
-      modules = [ ];
+      modules = [ ./modules/home ];
       specialArgs = {
         inherit sources witch hostName tf;
         superConfig = config;
@@ -36,8 +36,7 @@
 
       users = {
         kat = {
-          imports = [ ./modules/home ] 
-          ++ lib.optional (builtins.pathExists (./hosts + "/${hostName}/home")) (import (./hosts + "/${hostName}/home")) 
+          imports = lib.optional (builtins.pathExists (./hosts + "/${hostName}/home")) (import (./hosts + "/${hostName}/home")) 
           # trusted hosts check
           ++ lib.optional (builtins.pathExists (./trusted/hosts + "/${hostName}/home")) (import (./trusted/hosts + "/${hostName}/home"))
           # trusted users check 
diff --git a/users/hexchen/default.nix b/users/hexchen/default.nix
index a96c02ff..ddc0c887 100644
--- a/users/hexchen/default.nix
+++ b/users/hexchen/default.nix
@@ -13,10 +13,6 @@
   };
 
   home-manager.users.hexchen = {
-    imports = [
-      ../../modules/home      
-    ];
-
     programs.vim = {
       enable = true;
       extraConfig = ''