From 87fa30b2940183d65946472663c453a5f34b3f2b Mon Sep 17 00:00:00 2001 From: willifan Date: Sat, 4 Jan 2025 01:21:15 +0100 Subject: [PATCH] added K40 laser software --- hosts/Lenni/default.nix | 1 + hosts/Lillie/default.nix | 1 + modules/default/common/desktop/default.nix | 1 + modules/default/common/desktop/k40.nix | 12 ++++++++++++ modules/default/common/desktop/udev.nix | 3 --- modules/default/common/options.nix | 5 +++++ 6 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 modules/default/common/desktop/k40.nix diff --git a/hosts/Lenni/default.nix b/hosts/Lenni/default.nix index d9d3db6..d184692 100644 --- a/hosts/Lenni/default.nix +++ b/hosts/Lenni/default.nix @@ -13,6 +13,7 @@ desktop = { enable = true; dev.enable = true; + laser.enable = true; windowManager = "niri-session"; hyprland.enable = false; }; diff --git a/hosts/Lillie/default.nix b/hosts/Lillie/default.nix index ee671fd..448ea0f 100644 --- a/hosts/Lillie/default.nix +++ b/hosts/Lillie/default.nix @@ -13,6 +13,7 @@ enable = true; autostart.enable = false; emulation.enable = true; + laser.enable = true; hyprland = { hardware.Lillie = true; diff --git a/modules/default/common/desktop/default.nix b/modules/default/common/desktop/default.nix index cd7b1a7..7b7d2a7 100644 --- a/modules/default/common/desktop/default.nix +++ b/modules/default/common/desktop/default.nix @@ -5,6 +5,7 @@ ./autostart.nix ./boot.nix ./dev.nix + ./k40.nix ./keyboard.nix ./nfs-client.nix ./nix-ld.nix diff --git a/modules/default/common/desktop/k40.nix b/modules/default/common/desktop/k40.nix new file mode 100644 index 0000000..86f23b6 --- /dev/null +++ b/modules/default/common/desktop/k40.nix @@ -0,0 +1,12 @@ +{ lib, config, pkgs, ... }: +lib.mkIf config.desktop.laser.enable { + + services.udev.extraRules = '' + SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="5512", MODE:="0666" + ''; + + environment.systemPackages = with pkgs; [ + k40-whisperer + ]; + +} diff --git a/modules/default/common/desktop/udev.nix b/modules/default/common/desktop/udev.nix index 59efc14..52c14b8 100644 --- a/modules/default/common/desktop/udev.nix +++ b/modules/default/common/desktop/udev.nix @@ -1,6 +1,3 @@ { ... }: { - services.udev.extraRules = '' - SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="5512", MODE:="0666" - ''; } diff --git a/modules/default/common/options.nix b/modules/default/common/options.nix index e36f006..a5d33a6 100644 --- a/modules/default/common/options.nix +++ b/modules/default/common/options.nix @@ -18,6 +18,11 @@ type = lib.types.bool; }; + laser.enable = lib.mkOption { + default = false; + type = lib.types.bool; + }; + windowManager = lib.mkOption { default = "Hyprland"; type = lib.types.str;