From 9f29907ec328c050765ed3aba6550b6cbfa4bef8 Mon Sep 17 00:00:00 2001 From: John Lancaster <32917998+jsl12@users.noreply.github.com> Date: Sun, 5 Jul 2026 19:34:51 -0500 Subject: [PATCH] janus module cleanup --- modules/hosts/janus/default.nix | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/modules/hosts/janus/default.nix b/modules/hosts/janus/default.nix index 6f4ebdd..366869a 100644 --- a/modules/hosts/janus/default.nix +++ b/modules/hosts/janus/default.nix @@ -10,15 +10,13 @@ in flake.nixosConfigurations."${hostname}" = inputs.nixpkgs.lib.nixosSystem { modules = with inputs.self.modules; [ nixos.lxc - nixos.mysops - # nixos.ssh-certs - nixos.ssh-new - nixos.step-client - nixos.step-ca + nixos.login-text inputs.home-manager.nixosModules.home-manager nixos."${username}" - nixos.docker - nixos.login-text + nixos.ssh-new + nixos.mysops + nixos.step-ca # Runs the step-ca server + nixos.step-client # Uses the step-ca server as a client nixos.mtls ({ config, lib, pkgs, ... }: { networking.hostName = hostname; @@ -52,10 +50,7 @@ in mtls = { enable = true; subject = hostname; - san = [ - "${hostname}.john-stream.com" - ipv4 - ]; + san = names; bootstrap = { enable = true; after = [ "sops-nix.service" "step-ca.service" ]; @@ -63,20 +58,6 @@ in provisionerPasswordFile = config.sops.secrets."janus/admin_jwk".path; }; }; - - users.users."${username}" = { - shell = lib.mkForce ( - lib.getExe inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.jsl-zsh - ); - }; - - home-manager.users."${username}" = { - imports = with inputs.self.modules.homeManager; [ - mysops - step-client - ]; - docker.enable = true; - }; }) ]; };