From fec002c10b09a1bca84ef0e0b83ec28b4a5ca93b Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Tue, 23 Sep 2025 10:56:09 +0200
Subject: [PATCH] Opentabletdriver module and cleanup

---
 flake.nix                        | 31 +++++++++++++------------------
 instances/sif/configuration.nix  |  7 -------
 instances/thor/configuration.nix |  4 ----
 nixos/opentabletdriver.nix       |  6 ++++++
 nixos/pentablet.nix              |  5 -----
 5 files changed, 19 insertions(+), 34 deletions(-)
 create mode 100644 nixos/opentabletdriver.nix

diff --git a/flake.nix b/flake.nix
index 927b38d..2ece31a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -111,12 +111,16 @@
 
         # Some basic defaults
         ./nixos/basics
+      ];
 
-        {
-          age.secrets = {
-            # ollama = { file = ./secrets/ollama.age; owner = "bertof"; };
-          };
-        }
+      mainModules = [
+        ./nixos/pro_audio.nix
+        ./nixos/kdeconnect.nix
+        ./nixos/steam.nix
+        ./nixos/opentabletdriver.nix
+
+        ./nixos/hyprland.nix
+        { home-manager.users.bertof.imports = [ ./hm/hyprland.nix ]; }
       ];
 
       installerModules = commonModules ++ [ ./nixos/installer.nix ];
@@ -245,7 +249,7 @@
         nixosConfigurations = {
           thor = inputs.nixpkgs-u.lib.nixosSystem {
             system = "x86_64-linux";
-            modules = commonModules ++ [
+            modules = commonModules ++ mainModules ++ [
               ./instances/thor/hardware-configuration.nix
               inputs.nixos-hardware.nixosModules.common-cpu-amd
               inputs.nixos-hardware.nixosModules.common-pc-ssd
@@ -254,12 +258,9 @@
               # # S3 cache write
               # ./nixos/s3_cache_write.nix
 
-              ./nixos/plasma6.nix
+              # ./nixos/plasma6.nix
               # ./nixos/cuda_support.nix
               # ./nixos/ollama.nix
-              ./nixos/pro_audio.nix
-              ./nixos/kdeconnect.nix
-              ./nixos/steam.nix
               # ./nixos/minio_local.nix
 
               ./nixos/hyprland.nix
@@ -276,7 +277,7 @@
 
           sif = inputs.nixpkgs-u.lib.nixosSystem {
             system = "x86_64-linux";
-            modules = commonModules ++ [
+            modules = commonModules ++ mainModules ++ [
               ./instances/sif/hardware-configuration.nix
               inputs.nixos-hardware.nixosModules.common-cpu-intel
               inputs.nixos-hardware.nixosModules.common-cpu-intel
@@ -289,15 +290,9 @@
 
               # ./nixos/plasma6.nix
               # ./nixos/ollama.nix
-              ./nixos/pro_audio.nix
-              ./nixos/kdeconnect.nix
-              ./nixos/steam.nix
               # ./nixos/minio_local.nix
 
-              ./nixos/hyprland.nix
-              { home-manager.users.bertof.imports = [ ./hm/hyprland.nix ]; }
-
-              ./nixos/musa.nix
+              # ./nixos/musa.nix
             ] ++ homeManagerUModules ++ [{
               age.secrets = {
                 rclone_bertof = { file = ./secrets/rclone_bertof.age; owner = "bertof"; };
diff --git a/instances/sif/configuration.nix b/instances/sif/configuration.nix
index 7d2b03b..164a9e5 100644
--- a/instances/sif/configuration.nix
+++ b/instances/sif/configuration.nix
@@ -49,13 +49,6 @@
     };
 
     enableRedistributableFirmware = true;
-
-
-    # Tablet
-    opentabletdriver = {
-      enable = true;
-      daemon.enable = true;
-    };
   };
 
   networking = {
diff --git a/instances/thor/configuration.nix b/instances/thor/configuration.nix
index 1b1fa97..2c362e2 100644
--- a/instances/thor/configuration.nix
+++ b/instances/thor/configuration.nix
@@ -89,10 +89,6 @@
       # package = pkgs.bluezFull;
     };
     enableRedistributableFirmware = true;
-    opentabletdriver = {
-      enable = true;
-      daemon.enable = true;
-    };
     xpadneo.enable = true;
   };
 
diff --git a/nixos/opentabletdriver.nix b/nixos/opentabletdriver.nix
new file mode 100644
index 0000000..d4cae11
--- /dev/null
+++ b/nixos/opentabletdriver.nix
@@ -0,0 +1,6 @@
+{
+  hardware.opentabletdriver = {
+    enable = true;
+    daemon.enable = true;
+  };
+}
diff --git a/nixos/pentablet.nix b/nixos/pentablet.nix
index 9da4ccb..91cfffb 100644
--- a/nixos/pentablet.nix
+++ b/nixos/pentablet.nix
@@ -22,9 +22,4 @@ in
 
   # XP-Pen tablet driver
   environment.systemPackages = [ drivers ];
-
-  # hardware.opentabletdriver = {
-  #   enable = true;
-  #   daemon.enable = true;
-  # };
 }