final changes for tonight
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing

This commit is contained in:
Vivian 2022-07-30 23:35:52 +02:00
parent 1e3192f865
commit ecfc36e017
7 changed files with 14 additions and 18 deletions

View file

@ -1,4 +1,4 @@
{ config, pkgs, inputs, ... }:
{ config, lib, pkgs, inputs, ... }:
{
imports = [
@ -32,11 +32,7 @@
"nixpkgs-review-bot.cachix.org-1:eppgiDjPk7Hkzzz7XlUesk3rcEHqNDozGOrcLc8IqwE="
"colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg="
];
};
gc = {
dates = "weekly";
automatic = true;
randomizedDelaySec = "45min";
# Also use zsh for root;
};
optimise = {
automatic = true;
@ -63,8 +59,7 @@
permitRootLogin = "no";
};
# TODO: Location dependent
vault-secrets = {
vault-secrets = lib.mkIf (config.networking.domain == "olympus") {
vaultPrefix = "secrets/nixos";
vaultAddress = "http://vault.olympus:8200/";
approlePrefix = "olympus-${config.networking.hostName}";

View file

@ -54,7 +54,7 @@
# Configure the root account
users.extraUsers.root = {
# Allow my SSH keys for logging in as root.
openssh.authorizedKeys.keys = config.users.users.victor.openssh.authorizedKeys.keys;
openssh.authorizedKeys.keys = config.users.extraUsers.victor.openssh.authorizedKeys.keys;
# Also use zsh for root
shell = pkgs.zsh;
};