From 5d8a60b4d8154946997046048e06210fa0b7815f Mon Sep 17 00:00:00 2001 From: oddlama Date: Mon, 1 May 2023 15:27:56 +0200 Subject: [PATCH] fix: properly inherit stateVersion on home-manager configs --- users/common/default.nix | 7 +++++-- users/myuser/default.nix | 4 +++- users/root/default.nix | 8 ++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/users/common/default.nix b/users/common/default.nix index 0874f08..d72298a 100644 --- a/users/common/default.nix +++ b/users/common/default.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + stateVersion, + ... +}: { imports = [ ./modules/uid.nix @@ -16,7 +20,6 @@ ]; home = { - inherit stateVersion; packages = with pkgs; [ bandwhich btop diff --git a/users/myuser/default.nix b/users/myuser/default.nix index d0b419d..81efee2 100644 --- a/users/myuser/default.nix +++ b/users/myuser/default.nix @@ -3,6 +3,7 @@ lib, pkgs, secrets, + stateVersion, ... }: with lib; let @@ -31,8 +32,9 @@ in { ]; home = { - username = config.users.users.${myuser}.name; + inherit stateVersion; inherit (config.users.users.${myuser}) uid; + username = config.users.users.${myuser}.name; shellAliases = { p = "cd ~/projects"; }; diff --git a/users/root/default.nix b/users/root/default.nix index aa48dc7..029bcc2 100644 --- a/users/root/default.nix +++ b/users/root/default.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + stateVersion, ... }: with lib; { @@ -16,7 +17,10 @@ with lib; { ../common ]; - home.username = config.users.users.root.name; - home.uid = config.users.users.root.uid; + home = { + inherit stateVersion; + inherit (config.users.users.root) uid; + username = config.users.users.root.name; + }; }; }