diff --git a/extras/dev.nix b/extras/dev.nix index 2669876..a0820ac 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -4,6 +4,7 @@ # freecad # gh # vulkan-loader + qFlipper hyperfine jq jujutsu @@ -69,18 +70,20 @@ trunk ]; - programs.nix-ld.enable = true; - programs.nix-ld.libraries = with pkgs; [ - libxkbcommon - libGL + hardware.flipperzero.enable = true; - wayland.dev + # programs.nix-ld.enable = true; + # programs.nix-ld.libraries = with pkgs; [ + # libxkbcommon + # libGL - xorg.libX11 - xorg.libXrandr - xorg.libXi - xorg.libX11 - ]; + # wayland.dev + + # xorg.libX11 + # xorg.libXrandr + # xorg.libXi + # xorg.libX11 + # ]; services.udev.extraRules = '' SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic GDB Server", SYMLINK+="ttyBmpGdb" diff --git a/extras/libinput-delay.patch b/extras/libinput-delay.patch new file mode 100644 index 0000000..e3aa313 --- /dev/null +++ b/extras/libinput-delay.patch @@ -0,0 +1,15 @@ +diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c +index 5b040ce..4bf172b 100644 +--- a/src/evdev-mt-touchpad.c ++++ b/src/evdev-mt-touchpad.c +@@ -37,8 +37,8 @@ + + #define DEFAULT_TRACKPOINT_ACTIVITY_TIMEOUT ms2us(300) + #define DEFAULT_TRACKPOINT_EVENT_TIMEOUT ms2us(40) +-#define DEFAULT_KEYBOARD_ACTIVITY_TIMEOUT_1 ms2us(200) +-#define DEFAULT_KEYBOARD_ACTIVITY_TIMEOUT_2 ms2us(500) ++#define DEFAULT_KEYBOARD_ACTIVITY_TIMEOUT_1 ms2us(2000) ++#define DEFAULT_KEYBOARD_ACTIVITY_TIMEOUT_2 ms2us(5000) + #define FAKE_FINGER_OVERFLOW bit(7) + #define THUMB_IGNORE_SPEED_THRESHOLD 20 /* mm/s */ + diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index b2568c3..6942d2a 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -1,7 +1,6 @@ { config, pkgs, - lib, ... }: { zramSwap = { @@ -9,8 +8,17 @@ algorithm = "zstd"; }; nixpkgs.overlays = [ - (import ../extras/libinput-overlay.nix) + (final: prev: { + libinput = prev.libinput.overrideAttrs (old: { + patches = + (old.patches or []) + ++ [ + ../extras/libinput-delay.patch + ]; + }); + }) ]; + environment.systemPackages = with pkgs; [ # fw-ectool framework-tool