Skip to content

feat: home configurations without hostname #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
clo4 wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

feat: home configurations without hostname #77

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2528182
feat: home configurations in top-level users dir
clo4 Feb 17, 2025
b033f96
refactor: remove 'users' attrset from module args
clo4 Mar 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions lib/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,26 @@ let
in
lib.optional (builtins.hasAttr hostname homesNested) module;

homesGeneric =
let
getEntryPath =
_username: userEntry:
if builtins.pathExists (userEntry.path + "/home-configuration.nix") then
userEntry.path + "/home-configuration.nix"
else
# If we decide to add users/<username>.nix, it's as simple as
# testing `if userEntry.type == "regular"`
null;

mkUsers =
userEntries:
let
users = lib.mapAttrs getEntryPath userEntries;
in
lib.filterAttrs (_name: value: value != null) users;
in
importDir (src + "/users") mkUsers;
Copy link
Member

@zimbatm zimbatm Feb 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if /homes would map more naturally for the end-users. It would also allow users to have multiple home configurations (eg: homes/terminal and homes/desktop).

Copy link
Contributor Author

@clo4 clo4 Feb 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not opposed to this. users is analogous to hosts/*/users so it was an obvious first choice, but it also makes sense because HM will pick the output name based on $USER. @jzbor since you'll be using this yourself, do you have any input?

Copy link

@sokai sokai Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey!
My 2cents to the _question: /homes/USERNAME seems better suited, as you both wrote (, because HM will pick up the output name).


# Attribute set mapping hostname (defined in hosts/) to a set of home
# configurations (modules) for that host. If a host has no home
# configuration, it will be omitted from the set. Likewise, if the user
Expand Down Expand Up @@ -258,13 +278,17 @@ let
eachSystem (
{ pkgs, ... }:
{
homeConfigurations = lib.mapAttrs (
_name: homeData:
mkHomeConfiguration {
inherit (homeData) modulePath username;
inherit pkgs;
}
) homesFlat;
homeConfigurations =
lib.mapAttrs (
_name: homeData:
mkHomeConfiguration {
inherit (homeData) modulePath username;
inherit pkgs;
}
) homesFlat
// lib.mapAttrs (
username: modulePath: mkHomeConfiguration { inherit pkgs username modulePath; }
) homesGeneric;
}
);

Expand Down Expand Up @@ -468,7 +492,7 @@ let
# nix3 CLI output (`packages` output expects flat attrset)
# FIXME: Find another way to make this work without introducing legacyPackages.
# May involve changing upstream home-manager.
legacyPackages = lib.optionalAttrs (homesNested != { }) standaloneHomeConfigurations;
legacyPackages = standaloneHomeConfigurations;
Copy link
Member

@phaer phaer Mar 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iiuc, we only introduce this to have nested attributes because the home-manager cli doesn't understand flattened ones? If that's correct I think it'd be preferable to drop this here before it sees too much use and prioritize an upstream fix. What do you think?

(I know it's already in main, i just hadn't seen it before and took the change as there's already this PR touching it ;))


darwinConfigurations = lib.mapAttrs (_: x: x.value) (hostsByCategory.darwinConfigurations or { });
nixosConfigurations = lib.mapAttrs (_: x: x.value) (hostsByCategory.nixosConfigurations or { });
Expand Down