From 9183b1773105f7604658644d1bffb8ca25ba4e84 Mon Sep 17 00:00:00 2001 From: hektor Date: Sat, 11 Jul 2026 23:18:03 +0200 Subject: [PATCH] refactor(common): simplify home-manager config --- hosts/andromache/default.nix | 1 - hosts/astyanax/default.nix | 1 - hosts/vm/default.nix | 2 -- modules/common/default.nix | 4 ++++ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hosts/andromache/default.nix b/hosts/andromache/default.nix index a7c6b2c..b1d4bcc 100644 --- a/hosts/andromache/default.nix +++ b/hosts/andromache/default.nix @@ -26,7 +26,6 @@ in inherit (meta) host; hardware.facter.reportPath = ./facter.json; - home-manager.users.${config.host.username} = import ../../home/hosts/${config.host.name}; "ai-tools".enable = true; anki.enable = true; diff --git a/hosts/astyanax/default.nix b/hosts/astyanax/default.nix index 56fcaa6..b0d2cad 100644 --- a/hosts/astyanax/default.nix +++ b/hosts/astyanax/default.nix @@ -25,7 +25,6 @@ in inherit (meta) host; hardware.facter.reportPath = ./facter.json; - home-manager.users.${config.host.username} = import ../../home/hosts/${config.host.name}; "ai-tools".enable = true; anki.enable = true; diff --git a/hosts/vm/default.nix b/hosts/vm/default.nix index c57acd4..840a4e0 100644 --- a/hosts/vm/default.nix +++ b/hosts/vm/default.nix @@ -1,6 +1,5 @@ { inputs, - config, ... }: let @@ -17,7 +16,6 @@ in inherit (meta) host; hardware.facter.reportPath = ./facter.json; - home-manager.users.${config.host.username} = import ../../home/hosts/vm; "ai-tools".enable = true; anki.enable = true; diff --git a/modules/common/default.nix b/modules/common/default.nix index eb7c0b1..006c103 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -9,6 +9,7 @@ let inherit (inputs.nixpkgs) lib; + homeDir = ../../home/hosts + "/${config.host.name}"; in { imports = [ @@ -83,6 +84,9 @@ in host.username = lib.mkDefault config.host.username; } ]; + users = lib.optionalAttrs (builtins.pathExists homeDir) { + ${config.host.username} = import homeDir; + }; }; }; }