From 411a51c074eb75e31f03b8b4db133b14b1318f4d Mon Sep 17 00:00:00 2001
From: Christoph Cullmann <christoph@cullmann.io>
Date: Thu, 4 Jul 2024 17:11:41 +0200
Subject: less DEs, better test that inside VMs

fix keyboard layout
---
 beta/configuration.nix |  3 +++
 common.nix             | 22 ++++++++++------------
 mini/configuration.nix |  3 +++
 neko/configuration.nix |  3 +++
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/beta/configuration.nix b/beta/configuration.nix
index 047b551..2b233ac 100644
--- a/beta/configuration.nix
+++ b/beta/configuration.nix
@@ -23,4 +23,7 @@
 
   # classic dhcpcd
   networking.networkmanager.enable = false;
+
+  # german laptop keyboard
+  services.xserver.xkb.layout = "de";
 }
diff --git a/common.nix b/common.nix
index c8bcbd7..0a6ff78 100644
--- a/common.nix
+++ b/common.nix
@@ -195,21 +195,19 @@ in
   # allow to have all locales
   i18n.supportedLocales = [ "all" ];
 
-  # EurKey layout everywhere
-  services.xserver.xkb.layout = "eu";
+  # use X11/wayland layout for console, too
   console.useXkbConfig = true;
 
-  # enable SDDM & the KDE Plasma Desktop Environment
-  services.xserver.enable = true;
-  services.displayManager.sddm.enable = true;
+  # enable greetd & the KDE Plasma Desktop Environment
   services.desktopManager.plasma6.enable = true;
-  programs.ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass";
-
-  # other desktop environments for testing
-  services.xserver.desktopManager.enlightenment.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-  services.xserver.desktopManager.mate.enable = true;
-  services.xserver.desktopManager.xfce.enable = true;
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd '${pkgs.kdePackages.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed ${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland'";
+      };
+    };
+  };
 
   # enable sound with PipeWire
   sound.enable = true;
diff --git a/mini/configuration.nix b/mini/configuration.nix
index 2f139e9..ce298da 100644
--- a/mini/configuration.nix
+++ b/mini/configuration.nix
@@ -23,4 +23,7 @@
 
   # classic dhcpcd
   networking.networkmanager.enable = false;
+
+  # EurKey layout
+  services.xserver.xkb.layout = "eu";
 }
diff --git a/neko/configuration.nix b/neko/configuration.nix
index a2fc5c8..f8686de 100644
--- a/neko/configuration.nix
+++ b/neko/configuration.nix
@@ -23,4 +23,7 @@
 
   # classic dhcpcd
   networking.networkmanager.enable = false;
+
+  # EurKey layout
+  services.xserver.xkb.layout = "eu";
 }
-- 
cgit v1.2.3