Opentabletdriver module and cleanup

This commit is contained in:
Filippo Berto 2025-09-23 10:56:09 +02:00
parent 42935759a3
commit fec002c10b
Signed by: bertof
GPG key ID: 9DBF7E6A1D2CE9ED
5 changed files with 19 additions and 34 deletions

View file

@ -111,12 +111,16 @@
# Some basic defaults # Some basic defaults
./nixos/basics ./nixos/basics
];
{ mainModules = [
age.secrets = { ./nixos/pro_audio.nix
# ollama = { file = ./secrets/ollama.age; owner = "bertof"; }; ./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 ]; installerModules = commonModules ++ [ ./nixos/installer.nix ];
@ -245,7 +249,7 @@
nixosConfigurations = { nixosConfigurations = {
thor = inputs.nixpkgs-u.lib.nixosSystem { thor = inputs.nixpkgs-u.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = commonModules ++ [ modules = commonModules ++ mainModules ++ [
./instances/thor/hardware-configuration.nix ./instances/thor/hardware-configuration.nix
inputs.nixos-hardware.nixosModules.common-cpu-amd inputs.nixos-hardware.nixosModules.common-cpu-amd
inputs.nixos-hardware.nixosModules.common-pc-ssd inputs.nixos-hardware.nixosModules.common-pc-ssd
@ -254,12 +258,9 @@
# # S3 cache write # # S3 cache write
# ./nixos/s3_cache_write.nix # ./nixos/s3_cache_write.nix
./nixos/plasma6.nix # ./nixos/plasma6.nix
# ./nixos/cuda_support.nix # ./nixos/cuda_support.nix
# ./nixos/ollama.nix # ./nixos/ollama.nix
./nixos/pro_audio.nix
./nixos/kdeconnect.nix
./nixos/steam.nix
# ./nixos/minio_local.nix # ./nixos/minio_local.nix
./nixos/hyprland.nix ./nixos/hyprland.nix
@ -276,7 +277,7 @@
sif = inputs.nixpkgs-u.lib.nixosSystem { sif = inputs.nixpkgs-u.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = commonModules ++ [ modules = commonModules ++ mainModules ++ [
./instances/sif/hardware-configuration.nix ./instances/sif/hardware-configuration.nix
inputs.nixos-hardware.nixosModules.common-cpu-intel inputs.nixos-hardware.nixosModules.common-cpu-intel
inputs.nixos-hardware.nixosModules.common-cpu-intel inputs.nixos-hardware.nixosModules.common-cpu-intel
@ -289,15 +290,9 @@
# ./nixos/plasma6.nix # ./nixos/plasma6.nix
# ./nixos/ollama.nix # ./nixos/ollama.nix
./nixos/pro_audio.nix
./nixos/kdeconnect.nix
./nixos/steam.nix
# ./nixos/minio_local.nix # ./nixos/minio_local.nix
./nixos/hyprland.nix # ./nixos/musa.nix
{ home-manager.users.bertof.imports = [ ./hm/hyprland.nix ]; }
./nixos/musa.nix
] ++ homeManagerUModules ++ [{ ] ++ homeManagerUModules ++ [{
age.secrets = { age.secrets = {
rclone_bertof = { file = ./secrets/rclone_bertof.age; owner = "bertof"; }; rclone_bertof = { file = ./secrets/rclone_bertof.age; owner = "bertof"; };

View file

@ -49,13 +49,6 @@
}; };
enableRedistributableFirmware = true; enableRedistributableFirmware = true;
# Tablet
opentabletdriver = {
enable = true;
daemon.enable = true;
};
}; };
networking = { networking = {

View file

@ -89,10 +89,6 @@
# package = pkgs.bluezFull; # package = pkgs.bluezFull;
}; };
enableRedistributableFirmware = true; enableRedistributableFirmware = true;
opentabletdriver = {
enable = true;
daemon.enable = true;
};
xpadneo.enable = true; xpadneo.enable = true;
}; };

View file

@ -0,0 +1,6 @@
{
hardware.opentabletdriver = {
enable = true;
daemon.enable = true;
};
}

View file

@ -22,9 +22,4 @@ in
# XP-Pen tablet driver # XP-Pen tablet driver
environment.systemPackages = [ drivers ]; environment.systemPackages = [ drivers ];
# hardware.opentabletdriver = {
# enable = true;
# daemon.enable = true;
# };
} }