hosts/nixos/configuration.nix

@@ -34,6 +34,9 @@
     enable32Bit = true;
   };
 
+  # Setup OpenTabletDriver graphic tablet driver
+  hardware.opentabletdriver.enable = true;
+
   # Enable networking
   networking.networkmanager.enable = true;
   networking.nameservers = ["192.168.0.10" "1.1.1.1"];
@@ -73,9 +76,20 @@
   # Enable fstrim
   services.fstrim.enable = true;
 
+  # Enable upower
+  services.upower.enable = true;
+
+  # Setup udev for android rules
+  services.udev.packages = [
+    pkgs.android-udev-rules
+  ];
+
   # Enable ratbagd to customize mouse options
   services.ratbagd.enable = true;
 
+  # Enable firmware updater
+  services.fwupd.enable = true;
+
   # Enable sound with pipewire.
   services.pulseaudio.enable = false;
   security.rtkit.enable = true;
@@ -112,6 +126,9 @@
   # Enable nixd to see nixpkgs path
   nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
 
+  # Enable zram swap device
+  zramSwap.enable = true;
+
   # DO NOT CHANGE
   system.stateVersion = "24.11";
 }

modules/nixos/additional-hardware/default.nix

@@ -1,17 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: {
-  imports = [
-    ./graphics-tablet.nix
-  ];
-
-  options = {
-    crony.additional-hardware.enable = lib.mkEnableOption "Enable additional hardware modules.";
-  };
-
-  config = lib.mkIf config.crony.additional-hardware.enable {
-    crony.additional-hardware.otd.enable = lib.mkDefault true;
-  };
-}

modules/nixos/additional-hardware/graphics-tablet.nix

@@ -1,14 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: {
-  options = {
-    crony.additional-hardware.otd.enable = lib.mkEnableOption "Enable OpenTabletDriver";
-  };
-
-  config = lib.mkIf config.crony.additional-hardware.otd.enable {
-    # Setup OpenTabletDriver graphic tablet driver
-    hardware.opentabletdriver.enable = true;
-  };
-}

modules/nixos/default.nix

@@ -17,8 +17,6 @@
     ./hyprland.nix
     ./sddm.nix
     ./watchdog.nix
-    ./general-services.nix
-    ./additional-hardware
   ];
 
   crony.bluetooth.enable = lib.mkDefault true;
@@ -38,6 +36,4 @@
   crony.hyprland-nixos.enable = lib.mkDefault true;
   crony.sddm.enable = lib.mkDefault true;
   crony.watchdog.disable = lib.mkDefault true;
-  crony.general-services.enable = lib.mkDefault true;
-  crony.additional-hardware.enable = lib.mkDefault true;
 }

modules/nixos/general-services.nix

@@ -1,25 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  options = {
-    crony.general-services.enable = lib.mkEnableOption "Enable general services that just should be enabled by default.";
-  };
-
-  config = lib.mkIf config.crony.general-services.enable {
-    # Enable upower
-    services.upower.enable = true;
-
-    # Setup udev for android rules
-    services.udev.packages = [
-      pkgs.android-udev-rules
-    ];
-    # Enable firmware updater
-    services.fwupd.enable = true;
-
-    # Enable zram swap device
-    zramSwap.enable = true;
-  };
-}