From ab299d4b9ba343f82b3300b1c76787e80272423c Mon Sep 17 00:00:00 2001 From: Piotr Dobrowolski Date: Mon, 16 Oct 2023 19:10:23 +0200 Subject: [PATCH] hswaw/customs: avoid major rebuilds, nixpkgs deprecations, update arcade Change-Id: I6f2d15e2a6b8f9189a92ab88658e3235ed119c48 Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1729 Reviewed-by: vuko --- hswaw/machines/customs.hackerspace.pl/configuration.nix | 9 ++++++--- hswaw/machines/customs.hackerspace.pl/dhcpd.conf | 2 +- .../customs.hackerspace.pl/zones/waw.hackerspace.pl | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hswaw/machines/customs.hackerspace.pl/configuration.nix b/hswaw/machines/customs.hackerspace.pl/configuration.nix index aa1c61f7..d831f62e 100644 --- a/hswaw/machines/customs.hackerspace.pl/configuration.nix +++ b/hswaw/machines/customs.hackerspace.pl/configuration.nix @@ -54,9 +54,10 @@ in { ./laserproxy/service.nix ]; + # Prevent spurious rebuilds due to dbus override on minimal profile + environment.noXlibs = false; boot.loader.grub.enable = true; - boot.loader.grub.version = 2; boot.loader.grub.device = "nodev"; boot.loader.grub.extraConfig = '' serial --unit=0 --speed=115200 @@ -308,8 +309,10 @@ in { services.openssh = { enable = true; - passwordAuthentication = false; - logLevel = "INFO"; + settings = { + PasswordAuthentication = false; + LogLevel = "INFO"; + }; }; users.users.root.openssh.authorizedKeys.keys = [ vuko-pubkey q3k-pubkey ]; diff --git a/hswaw/machines/customs.hackerspace.pl/dhcpd.conf b/hswaw/machines/customs.hackerspace.pl/dhcpd.conf index 4aa0fcae..a235cce2 100644 --- a/hswaw/machines/customs.hackerspace.pl/dhcpd.conf +++ b/hswaw/machines/customs.hackerspace.pl/dhcpd.conf @@ -82,7 +82,7 @@ subnet 10.8.0.0 netmask 255.255.0.0 { } host arcade { - hardware ethernet 20:e5:17:0c:31:23; + hardware ethernet 00:23:ae:6f:8e:a7; fixed-address 10.8.1.35; } diff --git a/hswaw/machines/customs.hackerspace.pl/zones/waw.hackerspace.pl b/hswaw/machines/customs.hackerspace.pl/zones/waw.hackerspace.pl index 240fe0fa..e893be89 100644 --- a/hswaw/machines/customs.hackerspace.pl/zones/waw.hackerspace.pl +++ b/hswaw/machines/customs.hackerspace.pl/zones/waw.hackerspace.pl @@ -50,6 +50,7 @@ vending A 10.8.1.32 mate CNAME vending transcend A 10.8.1.33 welcomer A 10.8.1.34 +arcade A 10.8.1.35 inventory A 10.8.1.38 i CNAME inventory camera A 10.8.1.39