non-critical-infra: share common config
Martin Weinelt committed
Jun 2, 2024 at 22:06 UTC
f2cce78cbf7ed1283ac85aebbd2b5e8776edb06a
3 files changed
+17
-17
non-critical-infra/hosts/caliban.nixos.org/default.nix
-14
@@ -31,25 +31,11 @@
31
32
disko.devices = import ./disko.nix;
33
34
- # Set your time zone.
35
- time.timeZone = "UTC";
36
-
37
- environment.systemPackages = with pkgs; [
38
- neovim
39
- ];
40
-
41
- services.openssh.enable = true;
42
-
43
- security.acme.acceptTerms = true;
44
- security.acme.defaults.email = "webmaster@nixos.org";
45
-
34
networking.firewall.allowedTCPPorts = [ 80 443 ];
35
networking.firewall.allowedUDPPorts = [ ];
36
37
systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f9:5a:186c::2";
38
51
- users.users.root.openssh.authorizedKeys.keys = (import ../../../ssh-keys.nix).infra;
52
-
39
sops.secrets.storagebox-ssh-key = {
40
sopsFile = ../../secrets/storagebox-ssh-key.caliban;
41
format = "binary";
non-critical-infra/hosts/umbriel.nixos.org/default.nix
-3
@@ -45,9 +45,6 @@
45
linkConfig.RequiredForOnline = "routable";
46
};
47
48
- services.openssh.enable = true;
49
- users.users.root.openssh.authorizedKeys.keys = (import ../../../ssh-keys.nix).infra;
50
-
48
system.stateVersion = "23.05";
49
}
50
non-critical-infra/modules/common.nix
+17
@@ -1,3 +1,20 @@
1
+{
2
+ pkgs,
3
+ ...
4
+}:
5
+
6
{
7
boot.initrd.systemd.enable = true;
8
+
9
+ time.timeZone = "UTC";
10
+
11
+ systemd.services.openssh.enable = true;
12
+ users.users.root.openssh.authorizedKeys.keys = (import ../../ssh-keys.nix).infra;
13
+
14
+ environment.systemPackages = with pkgs; [
15
+ neovim
16
+ ];
17
+
18
+ security.acme.acceptTerms = true;
19
+ security.acme.defaults.email = "webmaster@nixos.org";
20
}