nixos/routnerr-2: upgrade to 21.05

nixos/lib/pkgs/wireguard_exporter.nix

@@ -1,11 +1,9 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "wireguard_exporter";
   version = "0.1.2";
 
-  goPackagePath = "github.com/mdlayher/wireguard_exporter";
-
   src = fetchFromGitHub {
     owner = "mdlayher";
     repo = "wireguard_exporter";
@@ -15,7 +13,7 @@ buildGoModule rec {
 
   vendorSha256 = "18jqgjxrmvni1h69lzgnrwjl6b59xyn4qb4rfsd4kmpmg40g85yh";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "github.com/mdlayher/wireguard_exporter";
     description = "Prometheus exporter for WireGuard devices.";
     license = licenses.mit;

nixos/routnerr-2/configuration.nix

@@ -4,8 +4,7 @@
 
 { pkgs, ... }:
 
-let
-  vars = import ./lib/vars.nix;
+let vars = import ./lib/vars.nix;
 
 in {
   imports = [
@@ -37,9 +36,7 @@ in {
   ];
 
   boot = {
-    # Linux kernel 5.10 LTS, and explicitly enable drivetemp for SATA drive
-    # temperature reporting in hwmon.
-    kernelPackages = pkgs.linuxPackages_5_10;
+    # Explicitly enable drivetemp for SATA drive temperature reporting in hwmon.
     kernelModules = [ "drivetemp" ];
 
     kernel = {
@@ -99,14 +96,21 @@ in {
     DynamicUser = false;
     User = "modemmanager-exporter";
   };
-  users.users.modemmanager-exporter.group = "networkmanager";
+  users.users.modemmanager-exporter = {
+    group = "networkmanager";
+    isNormalUser = true;
+  };
 
   services = {
     # Allow mDNS to reflect between VLANs where necessary for devices such as
     # Google Home and Chromecast.
     avahi = {
       enable = true;
-      interfaces = with vars.interfaces; [ "${enp2s0.name}" "${lan0.name}" "${iot0.name}" ];
+      interfaces = with vars.interfaces; [
+        "${enp2s0.name}"
+        "${lan0.name}"
+        "${iot0.name}"
+      ];
       ipv4 = true;
       ipv6 = true;
       reflector = true;

nixos/routnerr-2/corerad.nix

@@ -1,16 +1,11 @@
 { lib, ... }:
 
-let
-  vars = import ./lib/vars.nix;
-  unstable = import <nixos-unstable-small> { };
+let vars = import ./lib/vars.nix;
 
 in {
   services.corerad = {
     enable = true;
 
-    # Use unstable for newer CoreRAD.
-    package = unstable.corerad;
-
     settings = with vars.interfaces; {
       # Base non-interface configuration.
       debug = {