c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Consolidate shared.nix file

This commit is contained in:
Sandro - 2022-06-13 20:14:52 +02:00
parent a4723c6cf2
commit d114b91070
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
5 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/c3d2.nix
View File

@ -26,6 +26,7 @@ in {
./audio-server
./ceph-storage.nix
./cache.nix
./logging.nix
];
@ -89,6 +90,15 @@ in {
c3d2.allUsersCanSshRoot = lib.mkDefault true;
i18n = {
defaultLocale = "en_US.UTF-8";
supportedLocales = [
"en_US.UTF-8/UTF-8"
"de_DE.UTF-8/UTF-8"
"C.UTF-8/UTF-8"
];
};
networking.defaultGateway = lib.mkIf (!config.networking.useNetworkd) (
mkIfIsInHq "172.22.99.4"
);

16
config/shared.nix
View File

@ -1,16 +0,0 @@
{ lib, ... }:
{
imports = [ ./logging.nix ];
time.timeZone = "Europe/Berlin";
i18n = {
defaultLocale = "en_US.UTF-8";
supportedLocales = lib.mkForce [
"en_US.UTF-8/UTF-8"
"de_DE.UTF-8/UTF-8"
"C.UTF-8/UTF-8"
];
};
}

1
hosts/containers/deployer/configuration.nix
View File

@ -4,7 +4,6 @@
imports = [
../../../config
../../../config/lxc-container.nix
../../../config/shared.nix
];
c3d2.k-ot.enable = true;

1
hosts/containers/prometheus/configuration.nix
View File

@ -4,7 +4,6 @@
imports = [
../../../config
../../../config/lxc-container.nix
../../../config/shared.nix
];
networking = {

2
hosts/containers/registry/configuration.nix
View File

@ -4,7 +4,6 @@
imports = [
../../../config
../../../config/lxc-container.nix
../../../config/shared.nix
];
networking = {
@ -62,4 +61,3 @@
# should.
system.stateVersion = "19.03"; # Did you read the comment?
}