From bb9494227fc0b1005d3b8482e4ee175ced628730 Mon Sep 17 00:00:00 2001
From: MFlossmann <michael.flossmann@posteo.net>
Date: Tue, 14 May 2024 08:19:08 +0200
Subject: [PATCH] add screenlocker

---
 modules/nixOS/bundles/core.nix            | 12 ++++++++++++
 modules/nixOS/bundles/general-desktop.nix | 19 ++++++++++---------
 modules/nixOS/default.nix                 |  5 +++--
 3 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 modules/nixOS/bundles/core.nix

diff --git a/modules/nixOS/bundles/core.nix b/modules/nixOS/bundles/core.nix
new file mode 100644
index 0000000..766b874
--- /dev/null
+++ b/modules/nixOS/bundles/core.nix
@@ -0,0 +1,12 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  environment.systemPackages = with pkgs; [
+    vim
+    wget
+    git
+    libgcc
+  ];
+}
diff --git a/modules/nixOS/bundles/general-desktop.nix b/modules/nixOS/bundles/general-desktop.nix
index 4259d56..989ed7b 100644
--- a/modules/nixOS/bundles/general-desktop.nix
+++ b/modules/nixOS/bundles/general-desktop.nix
@@ -16,11 +16,14 @@
     };
 
     enable = true;
-    displayManager.sddm.enable = lib.mkDefault true;
-
-  # For touchscreen/pad support (supposedly)
-    libinput.enable = true;
   };
+
+  # TODO: sort better
+  # For touchscreen/pad support (supposedly)
+  services.libinput.enable = true;
+
+  # TODO: sort better
+  services.displayManager.sddm.enable = lib.mkDefault true;
   services.desktopManager.plasma6.enable = lib.mkDefault true;
 
   services.printing.enable = true;
@@ -52,11 +55,9 @@
   ];
 
   environment.systemPackages = with pkgs; [
-    vim
-    wget
-    git
-    libgcc
-    gtk3
+    # TODO: move to displaymanagers
+    kdePackages.kscreenlocker
+    gtklock
   ];
 
   fonts.enableDefaultPackages = true;
diff --git a/modules/nixOS/default.nix b/modules/nixOS/default.nix
index 184ed4d..2ba9ade 100644
--- a/modules/nixOS/default.nix
+++ b/modules/nixOS/default.nix
@@ -75,9 +75,10 @@ in {
     nixpkgs.config.allowUnfree = lib.mkDefault true;
 
     myNixOS = {
-      defaultLocale.enable = lib.mkDefault true;
-
+      bundles.core.enable = lib.mkDefault true;
       bundles.users.enable = lib.mkDefault true;
+
+      defaultLocale.enable = lib.mkDefault true;
     };
   };