From 5b762b1f137b1a5b0a4ee675bd2b26e8cd97c626 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 18 Mar 2020 15:30:00 +0100
Subject: ...

---
 odin.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'odin.nix')

diff --git a/odin.nix b/odin.nix
index dd9313c6..e740d7bb 100644
--- a/odin.nix
+++ b/odin.nix
@@ -32,7 +32,7 @@
                       ];
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  boot.extraTTYs = [ "tty7" ];
+  console.extraTTYs = [ "tty7" ];
 
   boot.initrd.network = {
     enable = true;
@@ -45,10 +45,8 @@
   networking.hostName = "odin"; # Define your hostname.
 
   # Select internationalisation properties.
-  i18n = {
-    consoleKeyMap = "dvp";
-    defaultLocale = "en_US.UTF-8";
-  };
+  i18n.defaultLocale = "en_US.UTF-8";
+  console.keyMap = "dvp";
 
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
@@ -531,7 +529,7 @@
       #   servers."localhost:${toString config.services.bar.port}"= {};
       # };
       "prometheus" = {
-        servers."${config.services.prometheus2.listenAddress}" = {};
+        servers."${config.services.prometheus.listenAddress}" = {};
       };
       "grafana" = {
         servers."localhost:${toString config.services.grafana.port}" = {};
@@ -550,7 +548,7 @@
     };
   };
 
-  services.prometheus2 = {
+  services.prometheus = {
     enable = true;
     extraFlags = ["--web.enable-admin-api"];
     webExternalUrl = "https://odin.asgard.yggdrasil/prometheus";
-- 
cgit v1.2.3