chore: fix a few eval warnings

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";
     };
   };
 }

machines/base.nix

@@ -33,9 +33,9 @@
     useXkbConfig = true;
   };
 
-  services.xserver = {
+  services.xserver.xkb = {
     layout = "fr";
-    xkbVariant = "";
+    variant = "";
   };
 
   programs.gnupg.agent.enable = true;

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;
 

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" ];

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;