From e9a6c6b0681d7add32cf43c677f1d2861356dbbe Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sat, 18 May 2024 15:43:53 +0100
Subject: [PATCH] depot: resolve warnings/various fixups

---
 nix/pkgs/prometheus-snmp-config/default.nix | 2 +-
 ops/nixos/laputa/default.nix                | 4 ++--
 ops/nixos/nausicaa/default.nix              | 4 ++--
 ops/nixos/porcorosso/default.nix            | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nix/pkgs/prometheus-snmp-config/default.nix b/nix/pkgs/prometheus-snmp-config/default.nix
index b6032b26ab..e6d3cee258 100644
--- a/nix/pkgs/prometheus-snmp-config/default.nix
+++ b/nix/pkgs/prometheus-snmp-config/default.nix
@@ -24,7 +24,7 @@ let
     version = "lukegb-${prometheus-snmp-exporter.version}";
 
     outputHashMode = "recursive";
-    outputHash = "sha256:1bkp1jlfv9xb9912q58n1x3mvl1xja2ii1jiadykphh64n1d8pvd";
+    outputHash = "sha256:00saap4wwyak0q54066akhrg2694a263d6rl2pqbbprnqyvjqqiz";
 
     buildInputs = [
       curl
diff --git a/ops/nixos/laputa/default.nix b/ops/nixos/laputa/default.nix
index b6d5b2562e..b7141fe28a 100644
--- a/ops/nixos/laputa/default.nix
+++ b/ops/nixos/laputa/default.nix
@@ -110,11 +110,11 @@
   services.xserver = {
     enable = true;
     xkb.layout = "us";
-    libinput.enable = true;
     windowManager.i3.enable = true;
     videoDrivers = [ "modesetting" "fbdev" "intel" ];
   };
-  services.xserver.displayManager = {
+  services.libinput.enable = true;
+  services.displayManager = {
     sddm = {
       enable = true;
       settings = {
diff --git a/ops/nixos/nausicaa/default.nix b/ops/nixos/nausicaa/default.nix
index 8320dd65e2..5a838d1b74 100644
--- a/ops/nixos/nausicaa/default.nix
+++ b/ops/nixos/nausicaa/default.nix
@@ -163,11 +163,11 @@ in {
   services.xserver = {
     enable = true;
     xkb.layout = "us";
-    libinput.enable = true;
     windowManager.i3.enable = true;
     videoDrivers = [ "modesetting" ];
   };
-  services.xserver.displayManager = {
+  services.libinput.enable = true;
+  services.displayManager = {
     sddm = {
       enable = true;
       wayland.enable = true;
diff --git a/ops/nixos/porcorosso/default.nix b/ops/nixos/porcorosso/default.nix
index 7baad3328e..f6c1bf0a1a 100644
--- a/ops/nixos/porcorosso/default.nix
+++ b/ops/nixos/porcorosso/default.nix
@@ -173,10 +173,10 @@ in {
   services.xserver = {
     enable = true;
     xkb.layout = "us";
-    libinput.enable = true;
     windowManager.i3.enable = true;
     videoDrivers = [ "nvidia" ];
   };
+  services.libinput.enable = true;
   specialisation.intelGraphics.configuration = {
     my.specialisationName = "intelGraphics";
     services.xserver.videoDrivers = lib.mkForce [ "intel" ];
@@ -185,7 +185,7 @@ in {
     hardware.nvidia.prime.sync.enable = lib.mkForce false;
     boot.initrd.kernelModules = lib.mkForce [ "zfs" "spl" "dm_mod" ];
   };
-  services.xserver.displayManager = {
+  services.displayManager = {
     sddm = {
       enable = true;
       settings = {