From 0c0455a2629df6fe38e90b5ebae9e3ac85e1feec Mon Sep 17 00:00:00 2001
From: servostar <sven.vogel123@web.de>
Date: Sun, 24 Dec 2023 13:38:08 +0100
Subject: [PATCH] completed cleanup of configuration.nix

---
 configuration.nix | 43 +------------------------------------------
 core/plasma5.nix  | 18 +++++++++++++-----
 dev/common.nix    |  9 +++++++++
 settings.nix      |  8 ++++++++
 4 files changed, 31 insertions(+), 47 deletions(-)
 create mode 100644 dev/common.nix

diff --git a/configuration.nix b/configuration.nix
index 9f3e49c..9b2af0f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -34,52 +34,11 @@ in
     i18n.defaultLocale = settings.system.defaultLocale;
     i18n.extraLocaleSettings = settings.system.extraLocales;
 
-  programs.partition-manager.enable = true;
-
     # use bash shell for other users
     environment.shells = with pkgs; [ bash ];
 
     # Configure console keymap
     console.keyMap = settings.system.ttykeymap;
 
-    # List packages installed in system profile. To search, run:
-    # $ nix search wget
-    environment.systemPackages = (with pkgs; [
-
-    devbox
-    ffmpeg-full
-    openssl
-    imagemagick
-    gnumake
-    cmake
-
-    # Clipboard support for Wayland Session
-    # used by Vim/Neovim and etc.
-    wl-clipboard
-
-    # GNU Compiler Collection and toolchain
-    glibc
-    gcc
-    gdb
-    stdenv.cc
-    stdenv.cc.libc
-    stdenv.cc.libc_dev
-
-    pkg-config
-    fontconfig
-
-    # SCSI driver
-    sg3_utils
-  ]);
-
-  environment.sessionVariables = rec {
-    # rust
-    CARGO_TERM_COLOR = "always";
-    RUST_BACKTRACE = "1";
-
-    # Wayland for electron Ozone
-    NIXOS_OZONE_WL = "1";
-
-    GTK_THEME = "Breeze-Dark";
-  };
+    environment.systemPackages = settings.system.pkgs;
 }
diff --git a/core/plasma5.nix b/core/plasma5.nix
index 15be8b7..ece47ac 100644
--- a/core/plasma5.nix
+++ b/core/plasma5.nix
@@ -12,11 +12,13 @@ in
         xkbVariant = "";
     };
 
-    # Enable the KDE Plasma Desktop Environment.
+    # SDDM
     services.xserver.displayManager.sddm.enable = true;
-    services.xserver.desktopManager.plasma5.enable = true;
-    # set wayland as default session
-    services.xserver.displayManager.defaultSession = "plasmawayland";
+    services.xserver.displayManager.sddm.wayland.enable = true;
+    services.xserver.displayManager.defaultSession = "plasmawayland";   # set wayland as default session
+
+    # Enable the KDE Plasma Desktop Environment.
+    services.xserver.desktopManager.plasma5.enable = true; 
 
     # exclude packages from plasma5
     environment.plasma5.excludePackages = settings.plasma5.excludePackages;
@@ -26,5 +28,11 @@ in
 
     environment.systemPackages = (with pkgs; [
         filelight
-    ])
+    ]);
+
+    programs.partition-manager.enable = true;
+
+    environment.sessionVariables = rec {
+        GTK_THEME = "Breeze-Dark";
+    };
 }
diff --git a/dev/common.nix b/dev/common.nix
new file mode 100644
index 0000000..4b77daa
--- /dev/null
+++ b/dev/common.nix
@@ -0,0 +1,9 @@
+{ pkgs, lib, config, ... }:
+let
+    settings = import ./../settings.nix;
+in
+{
+    environment.systemPackages = (with pkgs;
+        lib.optionals settings.dev.devbox [ devbox ]
+    );
+}
diff --git a/settings.nix b/settings.nix
index 308dc73..acea9a7 100644
--- a/settings.nix
+++ b/settings.nix
@@ -17,6 +17,12 @@ with import <nixpkgs> {};
             LC_TELEPHONE = "de_DE.UTF-8";
             LC_TIME = "de_DE.UTF-8";
         };
+
+        pkgs = [
+            ffmpeg-full
+            openssl
+            imagemagick
+        ];
     };
 
     hardware = {
@@ -49,6 +55,7 @@ with import <nixpkgs> {};
             oxygen
             khelpcenter
             kcolorpicker
+            konsole
         ];
     };
 
@@ -69,6 +76,7 @@ with import <nixpkgs> {};
         };
     };
     dev = {
+        devbox = true;
         platformio = true;
         latex = true;
         dotnet = false;