nix: deduplicate home-manager merging
All checks were successful
Test / Create distribution (push) Successful in 44s
Test / Sandbox (push) Successful in 55s
Test / Sandbox (race detector) (push) Successful in 53s
Test / Fortify (race detector) (push) Successful in 50s
Test / Fpkg (push) Successful in 54s
Test / Fortify (push) Successful in 2m8s
Test / Flake checks (push) Successful in 1m7s
All checks were successful
Test / Create distribution (push) Successful in 44s
Test / Sandbox (push) Successful in 55s
Test / Sandbox (race detector) (push) Successful in 53s
Test / Fortify (race detector) (push) Successful in 50s
Test / Fpkg (push) Successful in 54s
Test / Fortify (push) Successful in 2m8s
Test / Flake checks (push) Successful in 1m7s
This becomes a problem when extraHomeConfig defines nixos module options. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -95,14 +95,23 @@
|
||||
stateDir = "/var/lib/fortify";
|
||||
users.alice = 0;
|
||||
|
||||
extraHomeConfig = {
|
||||
home.stateVersion = "23.05";
|
||||
};
|
||||
extraHomeConfig =
|
||||
{ config, ... }:
|
||||
{
|
||||
# To test merge deduplication:
|
||||
options._fortify.stateVersion = lib.mkOption { type = lib.types.str; };
|
||||
|
||||
config = {
|
||||
home = { inherit (config._fortify) stateVersion; };
|
||||
_fortify.stateVersion = "23.05";
|
||||
};
|
||||
};
|
||||
|
||||
apps = {
|
||||
"cat.gensokyo.extern.foot.noEnablements" = {
|
||||
name = "ne-foot";
|
||||
identity = 1;
|
||||
shareUid = true;
|
||||
verbose = true;
|
||||
share = pkgs.foot;
|
||||
packages = with pkgs; [
|
||||
@@ -130,7 +139,8 @@
|
||||
|
||||
"cat.gensokyo.extern.Alacritty.x11" = {
|
||||
name = "x11-alacritty";
|
||||
identity = 3;
|
||||
identity = 1;
|
||||
shareUid = true;
|
||||
verbose = true;
|
||||
share = pkgs.alacritty;
|
||||
packages = with pkgs; [
|
||||
|
||||
Reference in New Issue
Block a user