From db0d7bdae28d69dd0a1c568d60691c3c2d9e6610 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Sat, 2 Jan 2021 20:39:48 +0100 Subject: [PATCH] fix nixpkgs bump issues --- logical/frumar.nix | 2 +- roles/default.nix | 3 ++- roles/graphical.nix | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/logical/frumar.nix b/logical/frumar.nix index 1618dca..f18cbce 100644 --- a/logical/frumar.nix +++ b/logical/frumar.nix @@ -34,7 +34,7 @@ "--web.enable-admin-api" ]; # victoriametrics - extraConfig.remote_write = [ { url = "http://127.0.0.1:8428/api/v1/write"; } ]; + remoteWrite = [ { url = "http://127.0.0.1:8428/api/v1/write"; } ]; scrapeConfigs = [ { job_name = "smartmeter"; # prometheus doesn't support mdns :thinking_face: diff --git a/roles/default.nix b/roles/default.nix index b16bd5d..292cd6b 100644 --- a/roles/default.nix +++ b/roles/default.nix @@ -12,7 +12,8 @@ in ../deploy/keys.nix ../services ]; - networking.hostName = secrets.hostnames.${machine}; + networking.domain = "yori.cc"; + networking.hostName = machine; time.timeZone = "Europe/Amsterdam"; users.mutableUsers = false; users.users.root = { diff --git a/roles/graphical.nix b/roles/graphical.nix index c7ab4a4..86e30b6 100644 --- a/roles/graphical.nix +++ b/roles/graphical.nix @@ -24,7 +24,7 @@ in { config, lib, pkgs, ... }: { ''; fonts = { - enableFontDir = true; + fontDir.enable = true; enableGhostscriptFonts = true; fonts = with pkgs; [ corefonts # Micrsoft free fonts