From aca52517b955668e460a9577405bd33a573d2905 Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Wed, 10 Apr 2024 14:50:17 +0300 Subject: [PATCH] Home Manager : Simplify args merge. --- user/home/Dasha.nix | 12 +++--------- user/home/Root.nix | 12 +++--------- user/home/Voronind.nix | 12 +++--------- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/user/home/Dasha.nix b/user/home/Dasha.nix index 64a8c72e..6e365174 100644 --- a/user/home/Dasha.nix +++ b/user/home/Dasha.nix @@ -1,14 +1,8 @@ -{ const, username, homeDir, util, style, pkgs, setting, key, ... }: { +{ const, util, style, pkgs, setting, key, ... } @args: { imports = [ - (import ./Default.nix { + (import ./Default.nix (args // { username = "dasha"; homeDir = "/home/dasha"; - const = const; - key = key; - pkgs = pkgs; - setting = setting; - style = style; - util = util; - }) + })) ]; } diff --git a/user/home/Root.nix b/user/home/Root.nix index 84cbf36a..353c526a 100644 --- a/user/home/Root.nix +++ b/user/home/Root.nix @@ -1,14 +1,8 @@ -{ const, username, homeDir, util, style, pkgs, setting, key, ... }: { +{ const, util, style, pkgs, setting, key, ... } @args: { imports = [ - (import ./Default.nix { + (import ./Default.nix (args // { username = "root"; homeDir = "/root"; - const = const; - key = key; - pkgs = pkgs; - setting = setting; - style = style; - util = util; - }) + })) ]; } diff --git a/user/home/Voronind.nix b/user/home/Voronind.nix index fb59d1d7..ed7f28a5 100644 --- a/user/home/Voronind.nix +++ b/user/home/Voronind.nix @@ -1,14 +1,8 @@ -{ const, username, homeDir, util, style, pkgs, setting, key, ... }: { +{ const, util, style, pkgs, setting, key, ... } @args: { imports = [ - (import ./Default.nix { + (import ./Default.nix (args // { username = "voronind"; homeDir = "/home/voronind"; - const = const; - key = key; - pkgs = pkgs; - setting = setting; - style = style; - util = util; - }) + })) ]; }