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:50:59 -05:00
parent ce55bbc194
commit ed5cecd24d
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/hosts/janus.nix
View File

@@ -13,8 +13,9 @@ in
inputs.self.modules.nixos.docker inputs.self.modules.nixos.docker
]; ];
home-manager.users."${username}" = { home-manager.users."${username}" = {
imports = with inputs.self.modules.homeManager; [ # imports = with inputs.self.modules; [
]; # homeManager."${username}"
# ];
docker.enable = true; docker.enable = true;
ssh.matchSets = { ssh.matchSets = {
certs = true; certs = true;

1
modules/hosts/john-pc-ubuntu.nix
View File

@@ -5,6 +5,7 @@ in
{ {
flake.modules.homeManager."${hostname}" = { pkgs, config, ... }: { flake.modules.homeManager."${hostname}" = { pkgs, config, ... }: {
imports = with inputs.self.modules.homeManager; [ imports = with inputs.self.modules.homeManager; [
# base
rebuild rebuild
john john
desktop desktop

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

@@ -15,11 +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.base
self.modules.homeManager."${username}" self.modules.homeManager."${username}"
]; ];
}; };
@@ -28,6 +25,9 @@
homeManager."${username}" = { homeManager."${username}" = {
home.username = "${username}"; home.username = "${username}";
home.homeDirectory = "/home/${username}"; home.homeDirectory = "/home/${username}";
imports = with self.modules.homeManager; [
base
];
}; };
}; };
} }

0
modules/home-manager/programs/ssh.nix → modules/services/ssh.nix
View File

8
modules/users/john.nix
View File

@@ -23,7 +23,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, ... }: {
users.users."${username}" = { users.users."${username}" = {
isNormalUser = true;
openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys; openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys;
extraGroups = [ "docker" ]; extraGroups = [ "docker" ];
}; };
@@ -36,9 +35,9 @@ in
programs.git.settings.user.name = "John Lancaster"; programs.git.settings.user.name = "John Lancaster";
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
]; # ];
}; };
} }
]; ];
@@ -48,6 +47,7 @@ in
flake.homeConfigurations."${username}" = inputs.home-manager.lib.homeManagerConfiguration { flake.homeConfigurations."${username}" = inputs.home-manager.lib.homeManagerConfiguration {
pkgs = import inputs.nixpkgs { system = "x86_64-linux"; }; pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
modules = [ modules = [
inputs.self.modules.homeManager.base
inputs.self.modules.homeManager."${username}" inputs.self.modules.homeManager."${username}"
# Include another inline module to set the options created through the jsl-home modules # Include another inline module to set the options created through the jsl-home modules