From 3285a6a04f0eef9f904a09d1307c039de528ff3b Mon Sep 17 00:00:00 2001 From: John Lancaster <32917998+jsl12@users.noreply.github.com> Date: Tue, 10 Mar 2026 00:14:59 -0500 Subject: [PATCH] using new user module --- modules/hosts/test-nix.nix | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/modules/hosts/test-nix.nix b/modules/hosts/test-nix.nix index 1cd4d84..09a20ae 100644 --- a/modules/hosts/test-nix.nix +++ b/modules/hosts/test-nix.nix @@ -5,30 +5,7 @@ let in { flake.modules.nixos."${name}" = { pkgs, lib, ...}: { - home-manager.users."${username}" = { - imports = [ - inputs.self.homeModules."${username}" - ]; - home.sessionVariables = rec { - HOST = "${name}"; - OTHER_VAR = "abc123"; - }; - }; - networking.hostName = "${name}"; - # environment.sessionVariables = rec { - # HOST = "${name}"; - # }; - - users.users."${username}" = { - isNormalUser = true; - shell = pkgs.zsh; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIAUa4dcg1TWc4pW++uodyhX4eOqrX/QYIxFWtEP7HFJ john@john-pc-ubuntu" - ]; - }; - programs.zsh.enable = true; - services.openssh = { enable = true; # require public key authentication for better security @@ -36,14 +13,24 @@ in settings.KbdInteractiveAuthentication = false; }; + virtualisation.docker = { + enable = true; + }; + home-manager.users."${username}" = { + docker.enable = true; + }; + users.users.john = { + extraGroups = [ "docker" ]; + }; }; # Generic bootstrapping lxc, use a specific host file for more flake.nixosConfigurations."${name}" = inputs.nixpkgs.lib.nixosSystem { modules = [ - inputs.home-manager.nixosModules.home-manager inputs.self.modules.nixos.lxc + inputs.home-manager.nixosModules.home-manager inputs.self.modules.nixos."${name}" + inputs.self.modules.nixos.john ]; }; }