From da17773e5186662bf67d66edb95545c2b8faa914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Thu, 30 May 2024 17:25:54 +0300
Subject: [PATCH] desktop: minor moving around xorg/displaymanager, use stable
 kernel pkgs

---
 hosts/fwminex/configuration.nix      |  1 -
 hosts/mtworx/configuration.nix       |  2 --
 modules/base/default.nix             |  2 +-
 modules/profiles/desktop/default.nix | 30 +++++++++++++---------------
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix
index 355babe..3462ee3 100644
--- a/hosts/fwminex/configuration.nix
+++ b/hosts/fwminex/configuration.nix
@@ -10,7 +10,6 @@
 
   boot = {
     initrd.availableKernelModules = ["usb_storage" "sd_mod" "xhci_pci" "thunderbolt" "nvme" "usbhid"];
-    kernelPackages = pkgs.zfs.latestCompatibleLinuxPackages;
     loader.systemd-boot.enable = true;
     supportedFilesystems = ["zfs"];
     zfs = {
diff --git a/hosts/mtworx/configuration.nix b/hosts/mtworx/configuration.nix
index 7bfcf2f..1198d53 100644
--- a/hosts/mtworx/configuration.nix
+++ b/hosts/mtworx/configuration.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   myData,
   ...
@@ -15,7 +14,6 @@ in {
   ];
 
   boot = {
-    kernelPackages = pkgs.linuxPackages_latest;
     kernelModules = ["kvm-intel"];
     #kernelParams = ["intel_pstate=disable"];
     loader.systemd-boot.enable = true;
diff --git a/modules/base/default.nix b/modules/base/default.nix
index ee7822c..91bea1f 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -48,7 +48,7 @@ in {
         "kernel.kptr_restrict" = "0";
       };
 
-      kernelPackages = lib.mkDefault pkgs.zfs.latestCompatibleLinuxPackages;
+      kernelPackages = lib.mkDefault pkgs.linuxPackages;
 
       supportedFilesystems = ["btrfs"];
     };
diff --git a/modules/profiles/desktop/default.nix b/modules/profiles/desktop/default.nix
index 4bdd708..7c948d3 100644
--- a/modules/profiles/desktop/default.nix
+++ b/modules/profiles/desktop/default.nix
@@ -53,25 +53,27 @@ in {
 
       avahi = {
         enable = true;
-        nssmdns = true;
+        nssmdns4 = true;
         openFirewall = true;
       };
 
       xserver = {
         enable = true;
-        layout = "us,lt";
-        xkbOptions = "grp:alt_shift_toggle";
+        xkb = {
+          layout = "us,lt";
+          options = "grp:alt_shift_toggle";
+        };
 
         desktopManager.xfce.enable = true;
         windowManager.awesome.enable = true;
+        displayManager.lightdm.enable = true;
+      };
 
-        displayManager = {
-          lightdm.enable = true;
-          defaultSession = "none+awesome";
-          autoLogin = {
-            enable = true;
-            user = username;
-          };
+      displayManager = {
+        defaultSession = "none+awesome";
+        autoLogin = {
+          enable = true;
+          user = username;
         };
       };
 
@@ -238,12 +240,8 @@ in {
         ]
         (lib.mkIf (pkgs.stdenv.hostPlatform.system == "x86_64-linux") [
           i7z
-          (nvtop.override {
-            amd = true;
-            intel = true;
-            msm = false;
-            nvidia = false;
-          })
+          nvtopPackages.amd
+          nvtopPackages.intel
           joplin-desktop
           intel-gpu-tools