From 8b18da737a369b197f904d9b4310911fcf51b25d Mon Sep 17 00:00:00 2001
From: Florian Schmitt <mrflos@gmail.com>
Date: Wed, 3 Jul 2024 14:53:55 +0300
Subject: [PATCH] post 24.05 fixes

---
 README.md                                        | 8 ++++++--
 machines/Segotep-desktop-tower-configuration.nix | 7 +++----
 modules/desktop.nix                              | 4 +---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 2e438d4..a26aa38 100644
--- a/README.md
+++ b/README.md
@@ -4,13 +4,16 @@ NixOS config files to make a perfect (for me) server or desktop environment and
 Mostly all was stolen, I mean inspired by [tazjin's nix files from TVL's repo](https://code.tvl.fyi/tree/users/tazjin/)
 
 ## Installation and setup
+
 On a fresh NixOS installation
+
 - check out this repository, for example in your home `git clone https://code.mrflos.pw/mrflos/nixos-config.git ~/nixos-config` (ideally fork this repo and clone it with ssh to be able to commit your customs)
 - copy the NixOS generated configuration to the `machines` folder `cp /etc/hardware-configuration.nix ~/nixos-config/machines/<machinename>-hardware-configuration.nix`
-- copy the example configuration file in the  `machines` folder `cp ~/nixos-config/machines/example-configuration.nix ~/nixos-config/machines/<machinename>-configuration.nix`
+- copy the example configuration file in the `machines` folder `cp ~/nixos-config/machines/example-configuration.nix ~/nixos-config/machines/<machinename>-configuration.nix`
 - edit your machine configuration file `~/nixos-config/machines/<machinename>-configuration.nix`, make changes and uncomment modules according to your needs for this machine
-- copy the example configuration file  `~/nixos-config/configuration.example.nix` to `~/nixos-config/configuration.nix` 
+- copy the example configuration file `~/nixos-config/configuration.example.nix` to `~/nixos-config/configuration.nix`
 - edit the main configuration file `~/nixos-config/configuration.nix` and point to the right files
+
 ```nix
 # NixOS config entry point
 # import the hardware and configuration files specific to your machine
@@ -22,6 +25,7 @@ On a fresh NixOS installation
     ];
 }
 ```
+
 - move the old `/etc/nixos` folder `sudo mv /etc/nixos /etc/nixos.old` and symlink your custom one `sudo ln -s ~/nixos-config /etc/nixos`
 - run the install `sudo nixos-rebuild switch`
 - if all good don't forget to commit your changes
diff --git a/machines/Segotep-desktop-tower-configuration.nix b/machines/Segotep-desktop-tower-configuration.nix
index 03fb5d0..309ed2a 100644
--- a/machines/Segotep-desktop-tower-configuration.nix
+++ b/machines/Segotep-desktop-tower-configuration.nix
@@ -47,13 +47,13 @@
   services.xserver.videoDrivers = [ "amdgpu" ];
   
   # Enable the KDE Plasma Desktop Environment.
-  services.xserver.displayManager.sddm.enable = true;
+  services.displayManager.sddm.enable = true;
   services.xserver.desktopManager.plasma5.enable = true;
 
   # Configure keymap in X11
   services.xserver = {
-    layout = "us";
-    xkbVariant = "";
+    xkb.layout = "us";
+    xkb.variant = "";
   };
 
   fileSystems."/mnt/nas/music" =
@@ -110,7 +110,6 @@
     ../modules/desktop.nix
     ../modules/fonts.nix
     ../modules/home-config.nix
-#     ../modules/laptop.nix
     ../modules/local-dev.nix
     ../modules/nixos.nix
   ];
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 6a03423..c54ccfa 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -29,12 +29,10 @@
     displayManager.defaultSession = "plasmawayland";
     displayManager.sddm.wayland.enable = true;
     displayManager.sddm.enableHidpi = true;
+    displayManager.sddm.theme = "rose-pine";
     xserver = {
       enable = true;
       desktopManager.plasma5.enable = true;
-      displayManager.sddm.wayland.enable = true;
-      displayManager.sddm.enableHidpi = true;
-      displayManager.sddm.theme = "rose-pine";
     };
     dbus.enable = true;
   };