john/dendritic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import fixes

Browse Source
This commit is contained in:
John Lancaster
2026-03-10 23:28:05 -05:00
parent f6d9ba27f0
commit 0af3e51ebf
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/nix-tools/user.nix
View File

@@ -3,7 +3,6 @@
{ self, ... }: { self, ... }:
{ {
config.flake.factory.user = username: isAdmin: { config.flake.factory.user = username: isAdmin: {
nixos."${username}" = { lib, pkgs, ... }: { nixos."${username}" = { lib, pkgs, ... }: {
users.users."${username}" = { users.users."${username}" = {
isNormalUser = true; isNormalUser = true;
@@ -16,6 +15,8 @@
"wheel" "wheel"
]; ];
}; };
# Import the corresponding homeManager module for the given username
home-manager.users."${username}" = { home-manager.users."${username}" = {
imports = [ imports = [
self.modules.homeManager."${username}" self.modules.homeManager."${username}"
@@ -25,6 +26,7 @@
homeManager."${username}" = { homeManager."${username}" = {
home.username = "${username}"; home.username = "${username}";
home.homeDirectory = "/home/${username}";
}; };
}; };
} }

9
modules/users/john.nix
View File

@@ -22,11 +22,6 @@ in
{ {
# https://github.com/Doc-Steve/dendritic-design-with-flake-parts/wiki/Dendritic_Aspects#multi-context-aspect # https://github.com/Doc-Steve/dendritic-design-with-flake-parts/wiki/Dendritic_Aspects#multi-context-aspect
nixos."${username}" = { pkgs, ... }: { nixos."${username}" = { pkgs, ... }: {
home-manager.users."${username}" = {
imports = [
inputs.self.modules.homeManager."${username}"
];
};
users.users."${username}" = { users.users."${username}" = {
isNormalUser = true; isNormalUser = true;
openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys; openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys;
@@ -42,9 +37,7 @@ in
programs.git.settings.user.email = "32917998+jsl12@users.noreply.github.com"; programs.git.settings.user.email = "32917998+jsl12@users.noreply.github.com";
imports = with inputs.self.modules.homeManager; [ imports = with inputs.self.modules.homeManager; [
# base base
# docker
# resticprofile
]; ];
}; };
} }