modules/home: Generalised for all users, arc-nixexprs use compacted

This commit is contained in:
kat witch 2021-05-07 14:14:23 +01:00
parent 731aeba2b1
commit 2431834380
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
3 changed files with 3 additions and 13 deletions

View file

@ -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")
];
}

View file

@ -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

View file

@ -13,10 +13,6 @@
};
home-manager.users.hexchen = {
imports = [
../../modules/home
];
programs.vim = {
enable = true;
extraConfig = ''