From ad27d55764c96c373f8a307a98836ce0689628a7 Mon Sep 17 00:00:00 2001
From: sadan <117494111+sadan4@users.noreply.github.com>
Date: Wed, 2 Oct 2024 15:17:55 -0400
Subject: [PATCH] 263 current  2024-10-02 15:17:48  24.11.20240916.99dc878 
 6.11.0                               *

---
 boxes/desktop/configuration.nix | 45 ++-------------------------------
 common/modules/kde.nix          | 21 +++++++++++++++
 common/util.nix                 | 16 ------------
 3 files changed, 23 insertions(+), 59 deletions(-)
 create mode 100644 common/modules/kde.nix
 delete mode 100644 common/util.nix

diff --git a/boxes/desktop/configuration.nix b/boxes/desktop/configuration.nix
index 4a80597..67cb8d8 100644
--- a/boxes/desktop/configuration.nix
+++ b/boxes/desktop/configuration.nix
@@ -7,8 +7,6 @@
 let
   _v = import ../../common/programs/virt.nix { };
   wireshark = import ../../common/programs/wireshark.nix { };
-  # audio = import ../../common/modules/audio.nix { };
-  util = import ../../common/util.nix { inherit pkgs; };
 in
 {
   imports =
@@ -16,6 +14,7 @@ in
       # Include the results of the hardware scan.
       ./hardware-configuration.nix
       ../../common/modules/audio.nix
+      ../../common/modules/kde.nix
       inputs.sops-nix.nixosModules.sops
     ];
   sops.defaultSopsFile = ../../secrets.yaml;
@@ -83,30 +82,13 @@ in
     avahi.enable = true;
     usbmuxd.enable = true;
   };
-  services.desktopManager.plasma6.enable = true;
-  services.xserver = {
-    videoDrivers = [ "amdgpu" ];
-    enable = true;
-    displayManager.sddm = {
-      enable = true;
-    };
-  };
+  services.xserver.videoDrivers = ["amdgpu"];
   services.printing.enable = true;
   services.printing.drivers = with pkgs; [
     hplip
   ];
   virtualisation = _v;
-  # Enable the X11 windowing system.
-  # servives.desktopManager.plasma6.enable = true;
-  # services.desktopManager.plasma6.enable = true;
 
-
-
-  # Configure keymap in X11
-  # services.xserver.xkb.layout = "us";
-  # services.xserver.xkb.options = "eurosign:e,caps:escape";
-
-  # Enable CUPS to print documents.
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   # Enable sound.
   # sound.enable = true;
@@ -196,29 +178,6 @@ in
     enable = true;
     pinentryPackage = pkgs.pinentry-gnome3;
   };
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # Copy the NixOS configuration file and link it from the resulting system
-  # (/run/current-system/configuration.nix). This is useful in case you
-  # accidentally delete configuration.nix.
-  # system.copySystemConfiguration = true;
 
   # This option defines the first version of NixOS you have installed on this particular machine,
   # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
diff --git a/common/modules/kde.nix b/common/modules/kde.nix
new file mode 100644
index 0000000..ed40fc8
--- /dev/null
+++ b/common/modules/kde.nix
@@ -0,0 +1,21 @@
+{ ... }: {
+  services = {
+    desktopManager = {
+      plasma6 = {
+        enable = true;
+      };
+    };
+    xserver = {
+      enable = true;
+      displayManager = {
+        sddm = {
+          enable = true;
+          autoNumlock = true;
+          wayland = {
+            enable = false;
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/common/util.nix b/common/util.nix
deleted file mode 100644
index e2c2db6..0000000
--- a/common/util.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ pkgs }: with pkgs.lib; {
-  merge = attrList:
-    let
-      f = attrPath:
-        zipAttrsWith (n: values:
-          if tail values == [ ]
-          then head values
-          else if all isList values
-          then unique (concatLists values)
-          else if all isAttrs values
-          then f (attrPath ++ [ n ]) values
-          else last values
-        );
-    in
-    f [ ] attrList;
-}