fix: add tuxedo drivers from PR NixOS/nixpkgs#293017

gabyx · Sep 8, 2024 · f3901ed · f3901ed
1 parent b1eaf32
commit f3901ed
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 1 deletion.
diff --git a/config/dot_config/way-displays/scripts/executable_on-change.sh b/config/dot_config/way-displays/scripts/executable_on-change.sh
@@ -9,6 +9,8 @@ script="$HOME/.config/sway/scripts/assign-workspaces-to-outputs.sh"
 if [ -f "$script" ]; then
     # shellcheck disable=SC2015
     out=$("$script" 2>&1) &&
+        # echo -e "OnChanged:: Workspace moved\n$out" >>~/.way-displays.log ||
+        # echo -e "OnChanged:: Workspace not moved\n$out" >>~/.way-displays.log
         notify-send "Display changed." "$(echo -e "Workspace moved:\n$out")" ||
         notify-send -u critical "Display changed." "$(echo -e "Workspace not moved:\n$out")"
 fi
diff --git a/flake.lock b/flake.lock
diff --git a/home/services.nix b/home/services.nix
@@ -23,7 +23,7 @@
 
   ### Color Shifting ==========================================================
   services.gammastep = {
-    enable = true;
+    enable = false;
     provider = "manual";
 
     longitude = 8.55;

diff --git a/nixos/hosts/tuxedo-pulse-14/boot.nix b/nixos/hosts/tuxedo-pulse-14/boot.nix
@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  inputs,
   ...
 }: {
   boot = {
@@ -11,6 +12,11 @@
     # Documentation: https://www.kernel.org/doc/html/latest/admin-guide/sysrq.html
     kernel.sysctl."kernel.sysrq" = 1; # NixOS default: 16 (only the sync command)
 
+    kernelPackages = pkgs.linuxPackages.extend (final: prev: {
+      # OR `callPackage` it to download less packages
+      tuxedo-drivers = prev.callPackage (inputs.tuxedo + "/pkgs/os-specific/linux/tuxedo-keyboard/default.nix") {};
+    });
+
     # Bootloader ================================================================
     loader = {
       grub = {

diff --git a/nixos/hosts/tuxedo-pulse-14/configuration.nix b/nixos/hosts/tuxedo-pulse-14/configuration.nix
@@ -18,11 +18,13 @@ in {
   # Testing PR 293017
   disabledModules = [
     "hardware/tuxedo-keyboard.nix"
+    "services/hardware/tuxedo-rs.nix"
   ];
 
   imports = [
     # Testing PR 293017
     "${inputs.tuxedo}/nixos/modules/hardware/tuxedo-drivers.nix"
+    "${inputs.tuxedo}/nixos/modules/services/hardware/tuxedo-rs.nix"
 
     # If you want to use modules your own flake exports (from modules/nixos):
     # outputs.nixosModules.example