completed cleanup of configuration.nix

configuration.nix

@@ -5,16 +5,16 @@ in
 {
     imports = [
         ./hardware-configuration.nix # Include the results of the hardware scan.
+        ./core              # core system components
+        ./system            # system components such as kernel
         ./nix-settings.nix  # nix related config
         ./users
         ./.luks-swap.nix
         ./fonts.nix         # system wide font settings
         ./extra             # extra packages
-        ./core              # core system components
         ./dev               # development stuff
         ./games             # games
         ./hardware          # hardware specific settings
-        ./system            # system components such as kernel
     ];
 
     # This value determines the NixOS release from which the default
@@ -27,72 +27,18 @@ in
 
     hardware.opengl.enable = true;
 
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
+    # Set your time zone.
+    time.timeZone = settings.system.timeZone;
 
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
+    # Select internationalisation properties.
+    i18n.defaultLocale = settings.system.defaultLocale;
+    i18n.extraLocaleSettings = settings.system.extraLocales;
 
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "de_DE.UTF-8";
-    LC_IDENTIFICATION = "de_DE.UTF-8";
-    LC_MEASUREMENT = "de_DE.UTF-8";
-    LC_MONETARY = "de_DE.UTF-8";
-    LC_NAME = "de_DE.UTF-8";
-    LC_NUMERIC = "de_DE.UTF-8";
-    LC_PAPER = "de_DE.UTF-8";
-    LC_TELEPHONE = "de_DE.UTF-8";
-    LC_TIME = "de_DE.UTF-8";
-  };
+    # use bash shell for other users
+    environment.shells = with pkgs; [ bash ];
 
-  services.rpcbind.enable = true; # needed for NFS
+    # Configure console keymap
+    console.keyMap = settings.system.ttykeymap;
 
-  programs.partition-manager.enable = true;
-
-  # use bash shell for other users
-  environment.shells = with pkgs; [ bash ];
-
-  # Configure console keymap
-  console.keyMap = "de";
-
-  # 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;
 }

core/plasma5.nix

@@ -12,11 +12,13 @@ in
         xkbVariant = "";
     };
 
-    # Enable the KDE Plasma Desktop Environment.
+    # SDDM
     services.xserver.displayManager.sddm.enable = true;
+    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; 
-    # set wayland as default session
-    services.xserver.displayManager.defaultSession = "plasmawayland";
 
     # 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";
+    };
 }

dev/android.nix

@@ -0,0 +1,11 @@
+{ pkgs, lib, config, ... }:
+let
+    settings = import ./../settings.nix;
+in
+{
+    programs.adb.enable = true;
+
+    services.udev.packages = [
+        pkgs.android-udev-rules
+    ];
+}

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 ]
+    );
+}

dev/default.nix

@@ -12,5 +12,6 @@ in
     ++ lib.optionals settings.dev.python3.enable [ ./python3.nix ]
     ++ lib.optionals settings.virtualisation.waydroid [ ./waydroid.nix ]
     ++ lib.optionals settings.virtualisation.wine.enable [ ./wine.nix ]
-    ++ lib.optionals settings.dev.arduino.enable [ ./arduino.nix ];
+    ++ lib.optionals settings.dev.arduino.enable [ ./arduino.nix ]
+    ++ lib.optionals settings.dev.android.enable [ ./android.nix ];
 }

settings.nix

@@ -2,6 +2,29 @@ with import <nixpkgs> {};
 {
     stateVersion = "23.11";
 
+    system = {
+        ttykeymap = "de";
+        timeZone = "Europe/Berlin";
+        defaultLocale = "en_US.UTF-8";
+        extraLocales = {
+            LC_ADDRESS = "de_DE.UTF-8";
+            LC_IDENTIFICATION = "de_DE.UTF-8";
+            LC_MEASUREMENT = "de_DE.UTF-8";
+            LC_MONETARY = "de_DE.UTF-8";
+            LC_NAME = "de_DE.UTF-8";
+            LC_NUMERIC = "en_US.UTF-8";
+            LC_PAPER = "de_DE.UTF-8";
+            LC_TELEPHONE = "de_DE.UTF-8";
+            LC_TIME = "de_DE.UTF-8";
+        };
+
+        pkgs = [
+            ffmpeg-full
+            openssl
+            imagemagick
+        ];
+    };
+
     hardware = {
         # support for GPUs
         amdgpu = true;
@@ -21,7 +44,7 @@ with import <nixpkgs> {};
         };
     };
 
-    fish = true;
+    fish = false;
 
     plasma5 = {
         enable = true;
@@ -32,6 +55,7 @@ with import <nixpkgs> {};
             oxygen
             khelpcenter
             kcolorpicker
+            konsole
         ];
     };
 
@@ -42,7 +66,7 @@ with import <nixpkgs> {};
         };
         qemu = {
             enable = true;
-            virt-manager = true;
+            virt-manager = false;
         };
         waydroid = false;
         wine = {
@@ -52,6 +76,7 @@ with import <nixpkgs> {};
         };
     };
     dev = {
+        devbox = true;
         platformio = true;
         latex = true;
         dotnet = false;
@@ -74,6 +99,9 @@ with import <nixpkgs> {};
             enable = false;  # enable arduino development platform
             ide2 = true;    # wether to use IDE 2.x or deprecated 1.x
         };
+        android = {
+            enable = true;
+        };
         lsp = {
             enable = true;
             # various language server
@@ -103,7 +131,7 @@ with import <nixpkgs> {};
 
     networking = {
         wireguard = true;   # enable wireguard protocol
-        hostname = "servostar-nixos-desktop";
+        hostname = "servostar-nixos-flex";
     };
 
     games = {