From 94f08a38477504ce006e0a2f69d69540baf4d1ad Mon Sep 17 00:00:00 2001
From: MFlossmann <michael.flossmann@posteo.net>
Date: Sat, 11 May 2024 12:39:05 +0200
Subject: [PATCH] add wacom support

---
 flake.nix                                 |  1 +
 modules/home/bundles/desktop.nix          |  2 --
 modules/home/bundles/graphicDesign.nix    |  3 ++-
 modules/nixOS/bundles/general-desktop.nix | 23 +++++++++++++----------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8e2547f..8a017c6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,6 +19,7 @@
   outputs = {...} @ inputs: let
     # basic boilerplate-reducing lib with a bunch of functions
     helperLib = import ./helperLib/default.nix {inherit inputs;};
+    stablepkgs = inputs.nixpkgs-stable;
   in
     with helperLib; {
       nixosConfigurations = {
diff --git a/modules/home/bundles/desktop.nix b/modules/home/bundles/desktop.nix
index f37f370..12e6e4a 100644
--- a/modules/home/bundles/desktop.nix
+++ b/modules/home/bundles/desktop.nix
@@ -17,8 +17,6 @@
     enable = true; 
   };
 
-  xserver.wacom.enable = true;
-
   # TODO: fill this out (and move it in a service, probably)
   # services.syncthing = {
   #   enable = true
diff --git a/modules/home/bundles/graphicDesign.nix b/modules/home/bundles/graphicDesign.nix
index b6dc583..5ea542b 100644
--- a/modules/home/bundles/graphicDesign.nix
+++ b/modules/home/bundles/graphicDesign.nix
@@ -3,12 +3,13 @@
   config,
   lib,
   inputs,
+  stablepkgs,
   ...
 }: {
   imports = [];
 
   home.packages = with pkgs; [
-    inkscape
+    stablepkgs.inkscape
     gimp
     krita
   ];
diff --git a/modules/nixOS/bundles/general-desktop.nix b/modules/nixOS/bundles/general-desktop.nix
index 75f123b..08bf60e 100644
--- a/modules/nixOS/bundles/general-desktop.nix
+++ b/modules/nixOS/bundles/general-desktop.nix
@@ -7,22 +7,25 @@
     "kernel.sysrq" = 502; # enables "REISUB"
   };
 
-  services.xserver.xkb = lib.mkDefault {
-    layout = "de";
-    variant = "neo";
-  };
-
   console.keyMap = lib.mkDefault "neo";
 
-  services.xserver.enable = true;
-  services.xserver.displayManager.sddm.enable = lib.mkDefault true;
+  services.xserver = {
+    xkb = lib.mkDefault {
+      layout = "de";
+      variant = "neo";
+    };
+
+    enable = true;
+    displayManager.sddm.enable = lib.mkDefault true;
+
+  # For touchscreen/pad support (supposedly)
+    libinput.enable = true;
+    wacom.enable = true;
+  };
   services.desktopManager.plasma6.enable = lib.mkDefault true;
 
   services.printing.enable = true;
 
-  # For touchscreen/pad support (supposedly)
-  services.xserver.libinput.enable = true;
-
   # sound
   sound.enable = true;
   hardware.pulseaudio.enable = false;