From a71d7682f34a48bf5f67f6d2a49c9381c34a911c Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 12 Mar 2026 15:53:54 +0100 Subject: [PATCH] working on machines --- Droidnix/flake.nix | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix index 17808e60b..f37a3320f 100644 --- a/Droidnix/flake.nix +++ b/Droidnix/flake.nix @@ -56,10 +56,7 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { - inherit user inputs; - flakeRoot = ./.; - }; + home-manager.extraSpecialArgs = { inherit user inputs; flakeRoot = ./.; }; } # Catppuccin theme module @@ -69,27 +66,22 @@ ./generated/top.nix # Ensure Home Manager is enabled for the user - ( - { config, pkgs, ... }: - { - programs.home-manager.enable = true; - systemd.users.services."home-manager-${user.username}" = { - description = "Home Manager service for ${user.username}"; - wantedBy = [ "multi-user.target" ]; - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; - serviceConfig.ExecStart = "${pkgs.home-manager}/bin/home-manager switch --flake ${self}#${user.username}@${machine}"; - }; - } - ) + ({ config, pkgs, ... }: { + programs.home-manager.enable = true; + systemd.users.services."home-manager-${user.username}" = { + description = "Home Manager service for ${user.username}"; + wantedBy = [ "multi-user.target" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + serviceConfig.ExecStart = "${pkgs.home-manager}/bin/home-manager switch --flake ${self}#${user.username}@${machine}"; + }; + }) ]; - specialArgs = { - inherit user inputs; - flakeRoot = ./.; - }; + specialArgs = { inherit user inputs; flakeRoot = ./.; }; } ); + # Home Manager configurations for each user/machine homeConfigurations = lib.genAttrs (map (machine: user.username + "@" + machine) machines) ( userMachine: let