From 91ebcfa4f133d4e1b766ba5311228decc1a942e7 Mon Sep 17 00:00:00 2001 From: EdenQwQ Date: Tue, 24 Mar 2026 13:30:13 +0800 Subject: [PATCH] fix touchpad, fix stylix polarity --- flake.lock | 17 +++++++++++++++++ flake.nix | 1 + home/lib/colorScheme/buildColorScheme.nix | 2 +- home/tweaks/stylix.nix | 1 - hosts/xiaomi/os.nix | 14 +++++++------- overlays/default.nix | 1 + 6 files changed, 27 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index ca6badf..0ace0a9 100644 --- a/flake.lock +++ b/flake.lock @@ -962,6 +962,22 @@ "type": "github" } }, + "nixpkgs-new-libinput": { + "locked": { + "lastModified": 1773138432, + "narHash": "sha256-9FtasZuEakGyXCqt7IbSALG5bgvKRKpp5DpHqlUS6V4=", + "owner": "skowalak", + "repo": "nixpkgs", + "rev": "3444cf952961ac97b3366df43fa36ec393f85599", + "type": "github" + }, + "original": { + "owner": "skowalak", + "ref": "libinput-update-1.31.0", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-r": { "locked": { "lastModified": 1773964973, @@ -1579,6 +1595,7 @@ "nixGL": "nixGL", "nixd": "nixd", "nixpkgs": "nixpkgs_14", + "nixpkgs-new-libinput": "nixpkgs-new-libinput", "nixpkgs-r": "nixpkgs-r", "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-wayland": "nixpkgs-wayland", diff --git a/flake.nix b/flake.nix index 51b32ad..75d2a4e 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,7 @@ nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixpkgs-r.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs-new-libinput.url = "github:skowalak/nixpkgs/libinput-update-1.31.0"; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/lib/colorScheme/buildColorScheme.nix b/home/lib/colorScheme/buildColorScheme.nix index 892bc2c..97b5520 100644 --- a/home/lib/colorScheme/buildColorScheme.nix +++ b/home/lib/colorScheme/buildColorScheme.nix @@ -76,7 +76,7 @@ let } ) // { - inherit polarity; + polarity = forceOrDefault polarity; }; buildSpecialisation = diff --git a/home/tweaks/stylix.nix b/home/tweaks/stylix.nix index 85d3dde..3acdf2e 100644 --- a/home/tweaks/stylix.nix +++ b/home/tweaks/stylix.nix @@ -11,7 +11,6 @@ in autoEnable = false; targets.gtk.enable = true; targets.gtk.flatpakSupport.enable = true; - polarity = "dark"; cursor = { package = pkgs.graphite-cursors; name = "graphite-dark"; diff --git a/hosts/xiaomi/os.nix b/hosts/xiaomi/os.nix index ba39b69..dd6db5f 100644 --- a/hosts/xiaomi/os.nix +++ b/hosts/xiaomi/os.nix @@ -7,11 +7,11 @@ "i8042.dumbkbd" "xe.enable_psr=0" ]; - # services.udev.extraHwdb = '' - # evdev:name:BLTP7853:00 347D:7853 Touchpad:* - # ID_INPUT_TOUCHPAD=1 - # ID_BUS=i2c - # ID_INTEGRATION=internal - # ID_INPUT_TOUCHPAD_INTEGRATION=internal - # ''; + services.udev.extraHwdb = '' + evdev:name:BLTP7853:00 347D:7853 Touchpad:* + ID_INPUT_TOUCHPAD=1 + ID_BUS=i2c + ID_INTEGRATION=internal + ID_INPUT_TOUCHPAD_INTEGRATION=internal + ''; } diff --git a/overlays/default.nix b/overlays/default.nix index d51a7a8..d5460ed 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -29,6 +29,7 @@ passthru.providedSessions = [ "scroll" ]; }); inherit (inputs.awww.packages.${final.stdenv.hostPlatform.system}) awww; + inherit (inputs.nixpkgs-new-libinput.legacyPackages.${final.stdenv.hostPlatform.system}) libinput; }; inherit (inputs.niri.overlays) niri;