talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Switch to nested attrsets.

Browse Source
This commit is contained in:
Tom Alexander 2025-08-09 14:37:25 -04:00
parent f667c9daa6
commit 146dc5f79a
No known key found for this signature in database
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 119 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nix/configuration/configuration.nix
View File

@ -78,6 +78,11 @@
./util/unfree_polyfill ./util/unfree_polyfill
]; ];
# me.install.user.file.talexander.".local/nixcfg" = ./README.org;
me.install.user.talexander.file.".local/nixcfg" = {
source = ./flake.lock;
};
nix.settings.experimental-features = [ nix.settings.experimental-features = [
"nix-command" "nix-command"
"flakes" "flakes"

112
nix/configuration/util/install_files/default.nix
View File

@ -7,10 +7,23 @@
}: }:
let let
cfg = config.me.install;
inherit (lib) inherit (lib)
filter filter
attrNames attrNames
; ;
install_user_file =
target:
let
source = lib.strings.escapeShellArg "${target.source}";
destination = lib.strings.escapeShellArg "${target.target}";
mode = lib.strings.escapeShellArg "${target.mode}";
in
# $DRY_RUN_CMD ${pkgs.toyboy}/bin/install $VERBOSE_ARG -D -m ${mode} ${source} ${destination}
''
$DRY_RUN_CMD install $VERBOSE_ARG -D --compare -m ${mode} ${source} ${destination}
'';
in in
{ {
imports = [ ]; imports = [ ];
@ -19,47 +32,47 @@ in
user = lib.mkOption { user = lib.mkOption {
type = lib.types.attrsOf ( type = lib.types.attrsOf (
lib.types.submodule ( lib.types.submodule (
{ username, config, ... }: { name, config, ... }:
let
username = name;
in
{ {
options = { options = {
enable = lib.mkOption { enable = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = true; default = true;
defaultText = "me.install.file.‹username›.enable"; defaultText = "enable";
example = false; example = lib.literalExpression false;
description = "Whether we want to install files in this user's home directory."; description = "Whether we want to install files in this user's home directory.";
}; };
target_username = lib.mkOption {
type = lib.types.str;
defaultText = "me.install.file.‹username›.target_username";
example = "root";
description = "The username for the user whose home directory will contain the file.";
};
};
config = {
target_username = lib.mkDefault username;
};
}
)
);
defaultText = "me.install.user.‹username›";
default = { };
# TODO: example
};
file = lib.mkOption { file = lib.mkOption {
type = lib.types.attrsOf ( type = lib.types.attrsOf (
lib.types.submodule ( lib.types.submodule (
{ path, config, ... }: { name, config, ... }:
let
path = name;
in
{ {
options = { options = {
enable = lib.mkOption { enable = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = true; default = true;
defaultText = "me.install.file.‹path›.enable"; defaultText = "enable";
example = false; example = lib.literalExpression false;
description = "Whether we want to install this file."; description = "Whether we want to install this file in this user's home directory.";
};
username = lib.mkOption {
type = lib.types.str;
defaultText = "username";
example = "root";
description = "The username for the user whose home directory will contain the file.";
};
target = lib.mkOption {
type = lib.types.str;
defaultText = "target";
example = ".local/share/foo/bar.txt";
description = "The path where the file should be written.";
}; };
method = lib.mkOption { method = lib.mkOption {
type = lib.types.enum [ type = lib.types.enum [
@ -85,50 +98,32 @@ in
example = ./files/foo.txt; example = ./files/foo.txt;
description = "The source file to install into the destination."; description = "The source file to install into the destination.";
}; };
target = lib.mkOption {
type = lib.types.str;
defaultText = "me.install.file.‹path›.target";
example = ".local/share/foo/bar.txt";
description = "The path where the file should be written.";
};
}; };
config = { config = {
username = lib.mkDefault username;
target = lib.mkDefault path; target = lib.mkDefault path;
}; };
} }
) )
); );
defaultText = "me.install.file.‹path›"; };
default = { };
example = lib.literalExpression ''
{
".config/foo/bar.txt" = {
source = ./files/bar.txt
}; };
} }
''; )
);
}; };
}; };
config = lib.mkMerge [ config =
(lib.mkIf (config.me.install.file != { }) (
let let
cfg = config.me.install.file; all_users = builtins.map (username: cfg.user."${username}") (attrNames cfg.user);
install_file_targets = filter (target: config.me.install.file."${target}".enable) (attrNames cfg); enabled_users = filter (user: user.enable) all_users;
install_commands = builtins.map ( all_file_targets = lib.flatten (
target: builtins.map (user: (builtins.map (path: user.file."${path}") (attrNames user.file))) enabled_users
let );
target_config = config.me.install.file."${target}"; enabled_file_targets = filter (target: target.enable) all_file_targets;
source = lib.strings.escapeShellArg "${target_config.source}"; install_commands = builtins.map install_user_file enabled_file_targets;
destination = lib.strings.escapeShellArg "${target_config.target}";
mode = lib.strings.escapeShellArg "${target_config.mode}";
in
# $DRY_RUN_CMD ${pkgs.toyboy}/bin/install $VERBOSE_ARG -D -m ${mode} ${source} ${destination}
''
$DRY_RUN_CMD install $VERBOSE_ARG -D --compare -m ${mode} ${source} ${destination}
''
) install_file_targets;
in in
{ {
systemd.services.me-install-file = { systemd.services.me-install-file = {
@ -150,7 +145,8 @@ in
# rm -f /home/talexander/.docker/config.json # rm -f /home/talexander/.docker/config.json
# ''; # '';
}; };
}
)) # environment.etc."install_out".text = builtins.toJSON enabled_file_targets;
]; environment.etc."install_out".text = (lib.strings.concatStringsSep "\n" install_commands);
};
} }