From 7a276908ef32b7ee5c59518081c6acdbed091234 Mon Sep 17 00:00:00 2001 From: Crony Akatsuki Date: Sun, 16 Mar 2025 12:12:50 +0100 Subject: [PATCH] feat: move additional hardware to dedicated module. --- hosts/nixos/configuration.nix | 3 --- modules/nixos/additional-hardware/default.nix | 17 +++++++++++++++++ .../additional-hardware/graphics-tablet.nix | 14 ++++++++++++++ modules/nixos/default.nix | 2 ++ 4 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 modules/nixos/additional-hardware/default.nix create mode 100644 modules/nixos/additional-hardware/graphics-tablet.nix diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix index ab1edc3..bf10303 100644 --- a/hosts/nixos/configuration.nix +++ b/hosts/nixos/configuration.nix @@ -34,9 +34,6 @@ 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"]; diff --git a/modules/nixos/additional-hardware/default.nix b/modules/nixos/additional-hardware/default.nix new file mode 100644 index 0000000..ed5156f --- /dev/null +++ b/modules/nixos/additional-hardware/default.nix @@ -0,0 +1,17 @@ +{ + 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; + }; +} diff --git a/modules/nixos/additional-hardware/graphics-tablet.nix b/modules/nixos/additional-hardware/graphics-tablet.nix new file mode 100644 index 0000000..c17aae0 --- /dev/null +++ b/modules/nixos/additional-hardware/graphics-tablet.nix @@ -0,0 +1,14 @@ +{ + 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; + }; +} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index e828792..b56a8f5 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -17,6 +17,7 @@ ./hyprland.nix ./sddm.nix ./watchdog.nix + ./additional-hardware ]; crony.bluetooth.enable = lib.mkDefault true; @@ -36,4 +37,5 @@ crony.hyprland-nixos.enable = lib.mkDefault true; crony.sddm.enable = lib.mkDefault true; crony.watchdog.disable = lib.mkDefault true; + crony.additional-hardware.enable = lib.mkDefault true; }