janus module cleanup

This commit is contained in:
John Lancaster
2026-07-05 19:34:51 -05:00
parent 87821ed109
commit 9f29907ec3
+6 -25
View File
@@ -10,15 +10,13 @@ in
flake.nixosConfigurations."${hostname}" = inputs.nixpkgs.lib.nixosSystem { flake.nixosConfigurations."${hostname}" = inputs.nixpkgs.lib.nixosSystem {
modules = with inputs.self.modules; [ modules = with inputs.self.modules; [
nixos.lxc nixos.lxc
nixos.mysops nixos.login-text
# nixos.ssh-certs
nixos.ssh-new
nixos.step-client
nixos.step-ca
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
nixos."${username}" nixos."${username}"
nixos.docker nixos.ssh-new
nixos.login-text nixos.mysops
nixos.step-ca # Runs the step-ca server
nixos.step-client # Uses the step-ca server as a client
nixos.mtls nixos.mtls
({ config, lib, pkgs, ... }: { ({ config, lib, pkgs, ... }: {
networking.hostName = hostname; networking.hostName = hostname;
@@ -52,10 +50,7 @@ in
mtls = { mtls = {
enable = true; enable = true;
subject = hostname; subject = hostname;
san = [ san = names;
"${hostname}.john-stream.com"
ipv4
];
bootstrap = { bootstrap = {
enable = true; enable = true;
after = [ "sops-nix.service" "step-ca.service" ]; after = [ "sops-nix.service" "step-ca.service" ];
@@ -63,20 +58,6 @@ in
provisionerPasswordFile = config.sops.secrets."janus/admin_jwk".path; 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;
};
}) })
]; ];
}; };