use pkgs.lib.recursiveUpdate instead of //
parent
fc8bb4c1d3
commit
ddefaff28e
|
@ -158,7 +158,7 @@ font:
|
|||
#style: Bold Italic
|
||||
|
||||
# Point size
|
||||
# size: 11.0
|
||||
size: 9.0
|
||||
|
||||
# Offset is the extra space around each character. `offset.y` can be thought
|
||||
# of as modifying the line spacing, and `offset.x` as modifying the letter
|
||||
|
|
|
@ -25,10 +25,16 @@ in
|
|||
'';
|
||||
example = true;
|
||||
};
|
||||
options.base.alacritty._actualConfig = myLib.mkOption {
|
||||
type = myLib.types.attrs;
|
||||
visible = false;
|
||||
default = actualConfig;
|
||||
description = "underlying default config";
|
||||
};
|
||||
|
||||
config.programs.alacritty = {
|
||||
enable = cfg.enable;
|
||||
settings = actualConfig // {
|
||||
settings = myLib.recursiveUpdate actualConfig {
|
||||
font.normal.family = cfg.font.family;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -3,10 +3,11 @@
|
|||
, ...
|
||||
}@inputs:
|
||||
let
|
||||
_lib = lib // import ../../lib { inherit pkgs lib; };
|
||||
recursiveUpdate = lib.recursiveUpdate;
|
||||
_lib = recursiveUpdate lib (import ../../lib { inherit pkgs lib; });
|
||||
in
|
||||
# TODO: Unpollute inputs
|
||||
inputs // {
|
||||
recursiveUpdate inputs {
|
||||
proj_root = builtins.toString ./../../..;
|
||||
myLib = _lib;
|
||||
}
|
||||
|
|
|
@ -124,10 +124,10 @@ in
|
|||
enable = true;
|
||||
enableCompletion = true;
|
||||
enableAutosuggestions = true;
|
||||
shellAliases = {
|
||||
shellAliases = pkgs.lib.recursiveUpdate {
|
||||
nix-rebuild = "sudo nixos-rebuild switch";
|
||||
hm-switch = "home-manager switch --flake";
|
||||
} // (myHome.shellAliases or { });
|
||||
} (myHome.shellAliases or { });
|
||||
history = {
|
||||
size = 10000;
|
||||
path = "${config.xdg.dataHome}/zsh/history";
|
||||
|
|
|
@ -2,8 +2,9 @@
|
|||
, lib ? pkgs.lib
|
||||
, ... }@flake_import:
|
||||
let serde = import ./serde { inherit pkgs lib; };
|
||||
recursiveUpdate = lib.recursiveUpdate;
|
||||
in
|
||||
pkgs.lib // lib // {
|
||||
recursiveUpdate (recursiveUpdate pkgs.lib lib) {
|
||||
fromYaml = serde.fromYaml;
|
||||
fromYamlPath = serde.fromYamlPath;
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
let
|
||||
hostname = specialArgs.hostname;
|
||||
enableSSH = specialArgs.enableSSH or true;
|
||||
_networking = { hostName = hostname; } // (specialArgs._networking or { });
|
||||
_networking = lib.recursiveUpdate { hostName = hostname; } (specialArgs._networking or { });
|
||||
_boot = specialArgs._boot or { };
|
||||
_services = specialArgs._services or { };
|
||||
includeHardware = specialArgs.includeHardware or true;
|
||||
|
@ -63,7 +63,7 @@ with lib;
|
|||
];
|
||||
# tailscale is mandatory : ^)
|
||||
# inherit services;
|
||||
services = _services // {
|
||||
services = lib.recursiveUpdate _services {
|
||||
tailscale.enable = true;
|
||||
};
|
||||
# create a oneshot job to authenticate to Tailscale
|
||||
|
@ -97,7 +97,7 @@ with lib;
|
|||
# Don't touch networking.firewall.enable, just configure everything else.
|
||||
# inherit networking;
|
||||
# inherit _networking;
|
||||
networking = _networking // {
|
||||
networking = lib.recursiveUpdate _networking {
|
||||
firewall =
|
||||
if _networking ? firewall.enable && _networking.firewall.enable then {
|
||||
trustedInterfaces = _networking.firewall.trustedInterfaces or [ ] ++ [
|
||||
|
|
Loading…
Reference in New Issue