diff --git a/config/c3d2.nix b/config/c3d2.nix index 355992db..3407c371 100644 --- a/config/c3d2.nix +++ b/config/c3d2.nix @@ -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" ); diff --git a/config/shared.nix b/config/shared.nix deleted file mode 100644 index 9bc5c3ee..00000000 --- a/config/shared.nix +++ /dev/null @@ -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" - ]; - }; -} diff --git a/hosts/containers/deployer/configuration.nix b/hosts/containers/deployer/configuration.nix index 09d452e2..fb7a1b05 100644 --- a/hosts/containers/deployer/configuration.nix +++ b/hosts/containers/deployer/configuration.nix @@ -4,7 +4,6 @@ imports = [ ../../../config ../../../config/lxc-container.nix - ../../../config/shared.nix ]; c3d2.k-ot.enable = true; diff --git a/hosts/containers/prometheus/configuration.nix b/hosts/containers/prometheus/configuration.nix index cfd9f3b9..65192de5 100644 --- a/hosts/containers/prometheus/configuration.nix +++ b/hosts/containers/prometheus/configuration.nix @@ -4,7 +4,6 @@ imports = [ ../../../config ../../../config/lxc-container.nix - ../../../config/shared.nix ]; networking = { diff --git a/hosts/containers/registry/configuration.nix b/hosts/containers/registry/configuration.nix index 04dd782a..f54ec2ed 100644 --- a/hosts/containers/registry/configuration.nix +++ b/hosts/containers/registry/configuration.nix @@ -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? } -