working on machines

This commit is contained in:
2026-03-12 15:54:33 +01:00
parent a71d7682f3
commit 0b24b9b524
+20 -7
View File
@@ -56,7 +56,10 @@
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user inputs; flakeRoot = ./.; }; home-manager.extraSpecialArgs = {
inherit user inputs;
flakeRoot = ./.;
};
} }
# Catppuccin theme module # Catppuccin theme module
@@ -66,7 +69,9 @@
./generated/top.nix ./generated/top.nix
# Ensure Home Manager is enabled for the user # Ensure Home Manager is enabled for the user
({ config, pkgs, ... }: { (
{ config, pkgs, ... }:
{
programs.home-manager.enable = true; programs.home-manager.enable = true;
systemd.users.services."home-manager-${user.username}" = { systemd.users.services."home-manager-${user.username}" = {
description = "Home Manager service for ${user.username}"; description = "Home Manager service for ${user.username}";
@@ -75,9 +80,13 @@
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
serviceConfig.ExecStart = "${pkgs.home-manager}/bin/home-manager switch --flake ${self}#${user.username}@${machine}"; serviceConfig.ExecStart = "${pkgs.home-manager}/bin/home-manager switch --flake ${self}#${user.username}@${machine}";
}; };
}) }
)
]; ];
specialArgs = { inherit user inputs; flakeRoot = ./.; }; specialArgs = {
inherit user inputs;
flakeRoot = ./.;
};
} }
); );
@@ -85,8 +94,9 @@
homeConfigurations = lib.genAttrs (map (machine: user.username + "@" + machine) machines) ( homeConfigurations = lib.genAttrs (map (machine: user.username + "@" + machine) machines) (
userMachine: userMachine:
let let
username = lib.splitString "@" userMachine !!""; parts = lib.splitString "@" userMachine;
machine = lib.splitString "@" userMachine !!""; username = builtins.elemAt parts 0;
machine = builtins.elemAt parts 1;
in in
home-manager.lib.homeManagerConfiguration { home-manager.lib.homeManagerConfiguration {
inherit system; inherit system;
@@ -94,7 +104,10 @@
inherit inputs user; inherit inputs user;
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
}; };
extraSpecialArgs = { inherit user inputs; flakeRoot = ./.; }; extraSpecialArgs = {
inherit user inputs;
flakeRoot = ./.;
};
} }
); );