From 281a91d7b3ff5856557795a30a5b2a1986b97667 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Fri, 28 Jun 2024 11:16:58 +0200
Subject: [PATCH] chore: fix a few eval warnings

---
 home-manager-modules/gtk/default.nix |  9 +++++++--
 machines/base.nix                    |  4 ++--
 machines/enigma/default.nix          | 13 ++++++-------
 machines/fischer/default.nix         |  6 +-----
 machines/x2100/default.nix           |  3 +--
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/home-manager-modules/gtk/default.nix b/home-manager-modules/gtk/default.nix
index 19d0332..bb941c7 100644
--- a/home-manager-modules/gtk/default.nix
+++ b/home-manager-modules/gtk/default.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   cfg = config.luj.programs.gtk;
 in
@@ -21,7 +26,7 @@ with lib;
     };
     qt = {
       enable = true;
-      platformTheme = "gtk";
+      platformTheme.name = "gtk";
     };
   };
 }
diff --git a/machines/base.nix b/machines/base.nix
index c729901..209cf12 100644
--- a/machines/base.nix
+++ b/machines/base.nix
@@ -33,9 +33,9 @@
     useXkbConfig = true;
   };
 
-  services.xserver = {
+  services.xserver.xkb = {
     layout = "fr";
-    xkbVariant = "";
+    variant = "";
   };
 
   programs.gnupg.agent.enable = true;
diff --git a/machines/enigma/default.nix b/machines/enigma/default.nix
index 14b0f35..aa1b370 100644
--- a/machines/enigma/default.nix
+++ b/machines/enigma/default.nix
@@ -28,16 +28,15 @@
 
   security.pam.services.swaylock = { };
 
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "julien";
+  };
+
   services.xserver = {
     enable = true;
-    layout = "fr";
-    xkbVariant = "";
     displayManager = {
       gdm.enable = true;
-      autoLogin = {
-        enable = true;
-        user = "julien";
-      };
     };
   };
 
@@ -143,7 +142,7 @@
 
   services.printing.enable = true;
   services.avahi.enable = true;
-  services.avahi.nssmdns = true;
+  services.avahi.nssmdns4 = true;
   # for a WiFi printer
   services.avahi.openFirewall = true;
 
diff --git a/machines/fischer/default.nix b/machines/fischer/default.nix
index 749bd0d..ec05961 100644
--- a/machines/fischer/default.nix
+++ b/machines/fischer/default.nix
@@ -62,11 +62,7 @@
   };
 
   # Enable OpenGL
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-    #    driSupport32Bit = true;
-  };
+  hardware.graphics.enable = true;
 
   # Load nvidia driver for Xorg and Wayland
   services.xserver.videoDrivers = [ "nvidia" ];
diff --git a/machines/x2100/default.nix b/machines/x2100/default.nix
index 5e55815..40a00aa 100644
--- a/machines/x2100/default.nix
+++ b/machines/x2100/default.nix
@@ -66,8 +66,7 @@
     useXkbConfig = true; # use xkbOptions in tty.
   };
 
-  hardware.opengl.enable = true;
-  hardware.opengl.driSupport = true;
+  hardware.graphics.enable = true;
 
   services.dbus.enable = true;