v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

final changes for tonight

Browse source
This commit is contained in:
Vivian 2022-07-30 23:35:52 +02:00
parent 49432e0650
commit 40c672d89b
7 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
nixos/common/default.nix
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}";

2
nixos/common/users/default.nix
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;
};

2
nixos/hosts/default.nix
View file

@ -1,4 +1,4 @@
{
hades = import ./hades;
olympus = import ./olympus;
hades = [];
}

1
nixos/hosts/hades/default.nix Normal file
View file

@ -0,0 +1 @@
[]

2
nixos/hosts/olympus/_template/configuration.nix
View file

@ -7,8 +7,6 @@
{
imports = [ ];
networking.hostName = "template";
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave

7
nixos/hosts/olympus/dhcp/configuration.nix
View file

@ -5,7 +5,8 @@ let
hostName = hostname;
ipAddress = ip;
};
hosts' = hosts.olympus;
localDomain = config.networking.domain;
hosts' = hosts.${localDomain};
in {
imports = [ ];
@ -41,8 +42,8 @@ in {
option broadcast-address 10.42.43.255;
option routers 10.42.42.1;
option domain-name-servers 10.42.42.15, 10.42.42.16;
option domain-name "olympus";
option domain-search "olympus";
option domain-name "${localDomain}";
option domain-search "${localDomain}";
subnet 10.42.42.0 netmask 255.255.254.0 {
range 10.42.43.1 10.42.43.254;
}