From b636050ab681cd84348dde35902ffa1d6ccdbbc9 Mon Sep 17 00:00:00 2001
From: Daniel Lundin <dln@arity.se>
Date: Thu, 8 Aug 2024 00:40:49 +0200
Subject: [PATCH] Clean up renamed options and packages

---
 common/desktop.nix      | 21 +++++++++++----------
 hosts/dinky/default.nix |  4 ++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/common/desktop.nix b/common/desktop.nix
index d7eefa2..ba48368 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -23,22 +23,22 @@ in
         gnome-tour
         snapshot
       ])
-      ++ (with pkgs.gnome; [
-        atomix # puzzle game
+      ++ (with pkgs; [
         baobab # disk usage analyzer
         cheese # webcam tool
         epiphany # web browser
         geary # email reader
-        gnome-clocks
-        gnome-contacts
+        gnome.atomix # puzzle game
         gnome-disk-utility
-        gnome-logs
-        gnome-music
+        gnome.gnome-clocks
+        gnome.gnome-contacts
+        gnome.gnome-logs
+        gnome.gnome-music
+        gnome.hitori # sudoku game
+        gnome.iagno # go game
+        gnome.tali # poker game
         gnome-terminal
-        hitori # sudoku game
-        iagno # go game
         simple-scan
-        tali # poker game
         yelp # help viewer
       ]);
 
@@ -84,9 +84,10 @@ in
 
     services.printing.enable = true;
 
+    services.displayManager.defaultSession = "gnome";
+
     services.xserver = {
       enable = true;
-      displayManager.defaultSession = "gnome";
       displayManager.gdm.enable = true;
       displayManager.gdm.autoSuspend = false;
       desktopManager.gnome.enable = true;
diff --git a/hosts/dinky/default.nix b/hosts/dinky/default.nix
index 851801a..b90f774 100644
--- a/hosts/dinky/default.nix
+++ b/hosts/dinky/default.nix
@@ -104,8 +104,8 @@
     podman.enable = true;
   };
 
-  services.xserver.displayManager.autoLogin.enable = true;
-  services.xserver.displayManager.autoLogin.user = "dln";
+  services.displayManager.autoLogin.enable = true;
+  services.displayManager.autoLogin.user = "dln";
   systemd.services."getty@tty1".enable = false;
   systemd.services."autovt@tty1".enable = false;