From e063a50fc5159a92a870418aea105a1f70f9f7e6 Mon Sep 17 00:00:00 2001 From: SolidHal Date: Tue, 9 Oct 2018 18:46:32 +0000 Subject: [PATCH 1/6] Better palm detection --- resources/InstallResources/50-synaptics.conf | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/InstallResources/50-synaptics.conf b/resources/InstallResources/50-synaptics.conf index f6ddb9b..3e53508 100644 --- a/resources/InstallResources/50-synaptics.conf +++ b/resources/InstallResources/50-synaptics.conf @@ -51,7 +51,10 @@ Section "InputClass" Option "HorizHysteresis" "10" # Drag Lock - #Option "LockedDrags" "1" + Option "LockedDrags" "0" + + # Tap n drag + Option "TapAndDragGesture" "0" # Tap to click thresholds. Option "FingerLow" "10" @@ -59,8 +62,8 @@ Section "InputClass" # Prevent accidental clicks Option "PalmDetect" "1" - Option "PalmMinWidth" "10" - Option "PalmMinZ" "80" + Option "PalmMinWidth" "5" + Option "PalmMinZ" "55" # scrolling. Option "VertTwoFingerScroll" "1" From 0434341e15ecc32655a1f2f709cc97e23bbd86c1 Mon Sep 17 00:00:00 2001 From: SolidHal Date: Sat, 20 Oct 2018 17:59:23 +0000 Subject: [PATCH 2/6] Update InstallToUSB.sh --- scripts/InstallScripts/InstallToUSB.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/InstallScripts/InstallToUSB.sh b/scripts/InstallScripts/InstallToUSB.sh index 2367390..fb02893 100755 --- a/scripts/InstallScripts/InstallToUSB.sh +++ b/scripts/InstallScripts/InstallToUSB.sh @@ -15,3 +15,5 @@ sgdisk -c 2:Root /dev/sda partprobe /dev/sda #Force the filesystem to fill the new partition resize2fs -f /dev/sda2 +#Reboot to ensure everything resized properly +reboot From 8e5a0690a993b18965449e58e9c7064d0adc2366 Mon Sep 17 00:00:00 2001 From: SolidHal Date: Sat, 20 Oct 2018 18:02:06 +0000 Subject: [PATCH 3/6] Update readme for install to usb troubleshooting --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index eca4fa6..2029bf5 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ If you are running stock coreboot and haven't flashed libreboot, you will first When it boots, login as root. The password is blank. #### If you simply want a basic linux environment with not desktop environment or window manager: -Make sure its the only storage device plugged in, and run this script to expand the partition and filesystem to the full usb drive +Make sure its the only storage device plugged in, and run this script to expand the partition and filesystem to the full usb drive. This will reboot when complete, so you'll have to press `control+u` again to boot to the external media. ``` cd /InstallResources/ ./InstallToUSB @@ -86,11 +86,13 @@ If you want a quick guide on how to connect to wifi, check out [this down below] The first expands the partition and filesystem to use the entire drive. Make sure you only have one usb or sd storage device plugged into the machine. +This will reboot when complete, so you'll have to press `control+u` again to boot to the external media. Run: ``` cd /InstallResources/ ./InstallToUSB ``` +You can verify it worked by running `df -h` after the reboot. The original `/dev/root/` filesystem was only ~2GB Then run this script which installs the either the xfce4 or the lxqt desktop enviroment, sound, trackpad, and Xorg configurations as well as prompts you to make a new user that automatically gets sudo privileges. If it asks you about terminal encoding and/or locale, just hit enter. The default works for both. From 2b0f8015804bd3ca59f087d9c054f268cdab928a Mon Sep 17 00:00:00 2001 From: SolidHal Date: Sat, 20 Oct 2018 19:53:40 +0000 Subject: [PATCH 4/6] Add badges --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 2029bf5..1e78994 100644 --- a/README.md +++ b/README.md @@ -199,3 +199,7 @@ PrawnOS is free and unencumbered software released under the terms of the GNU General Public License, version 2; see COPYING for the license text. For a list of its authors and contributors, see AUTHORS. + + +[![Github All Releases](https://img.shields.io/github/downloads/SolidHal/PrawnOS/total.svg)]() [![Built with Spacemacs](https://cdn.rawgit.com/syl20bnr/spacemacs/442d025779da2f62fc86c2082703697714db6514/assets/spacemacs-badge.svg)](http://spacemacs.org) + From b287d7772d4e19fadb6ffa0a24d99e069e7e64e2 Mon Sep 17 00:00:00 2001 From: SolidHal Date: Thu, 25 Oct 2018 18:37:34 +0000 Subject: [PATCH 5/6] Disable three finger swipe fixup up palm rejection --- resources/InstallResources/50-synaptics.conf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/InstallResources/50-synaptics.conf b/resources/InstallResources/50-synaptics.conf index 3e53508..1e28956 100644 --- a/resources/InstallResources/50-synaptics.conf +++ b/resources/InstallResources/50-synaptics.conf @@ -44,8 +44,7 @@ Section "InputClass" # Enable 1, 2, and 3 finger clicking as left, right, and middle click, respectively. Option "TapButton1" "1" Option "TapButton2" "3" - Option "TapButton3" "2" - + # Calm the pad down while clicking. Option "VertHysteresis" "10" Option "HorizHysteresis" "10" @@ -62,8 +61,8 @@ Section "InputClass" # Prevent accidental clicks Option "PalmDetect" "1" - Option "PalmMinWidth" "5" - Option "PalmMinZ" "55" + Option "PalmMinWidth" "10" + Option "PalmMinZ" "80" # scrolling. Option "VertTwoFingerScroll" "1" From 9c6ab124655d99bdef848b91014fa28b1725f53c Mon Sep 17 00:00:00 2001 From: SolidHal Date: Thu, 25 Oct 2018 14:12:09 -0500 Subject: [PATCH 6/6] Switch to using libinout instead of synaptics. Better palm detection, better swipe detection. better better better --- resources/InstallResources/30-touchpad.conf | 38 +++++++++ resources/InstallResources/50-synaptics.conf | 88 -------------------- scripts/InstallScripts/InstallPackages.sh | 4 +- scripts/buildDebianFs.sh | 2 +- 4 files changed, 41 insertions(+), 91 deletions(-) create mode 100644 resources/InstallResources/30-touchpad.conf delete mode 100644 resources/InstallResources/50-synaptics.conf diff --git a/resources/InstallResources/30-touchpad.conf b/resources/InstallResources/30-touchpad.conf new file mode 100644 index 0000000..fb07a7a --- /dev/null +++ b/resources/InstallResources/30-touchpad.conf @@ -0,0 +1,38 @@ +# Match on all types of devices but tablet devices and joysticks +Section "InputClass" + Identifier "libinput pointer catchall" + MatchIsPointer "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" +EndSection + +Section "InputClass" + Identifier "libinput keyboard catchall" + MatchIsKeyboard "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" +EndSection + +Section "InputClass" + Identifier "libinput touchpad catchall" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" + Option "Tapping" "on" + Option "ClickMethod" "clickfinger" +EndSection + +Section "InputClass" + Identifier "libinput touchscreen catchall" + MatchIsTouchscreen "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" +EndSection + +Section "InputClass" + Identifier "libinput tablet catchall" + MatchIsTablet "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" +EndSection + diff --git a/resources/InstallResources/50-synaptics.conf b/resources/InstallResources/50-synaptics.conf deleted file mode 100644 index 1e28956..0000000 --- a/resources/InstallResources/50-synaptics.conf +++ /dev/null @@ -1,88 +0,0 @@ -# Example xorg.conf.d snippet that assigns the touchpad driver -# to all touchpads. See xorg.conf.d(5) for more information on -# InputClass. -# DO NOT EDIT THIS FILE, your distribution will likely overwrite -# it when updating. Copy (and rename) this file into -# /etc/X11/xorg.conf.d first. -# Additional options may be added in the form of -# Option "OptionName" "value" -# -Section "InputClass" - Identifier "touchpad catchall" - Driver "synaptics" - MatchIsTouchpad "on" -# This option is recommend on all Linux systems using evdev, but cannot be -# enabled by default. See the following link for details: -# http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html -# MatchDevicePath "/dev/input/event*" -EndSection - -Section "InputClass" - Identifier "touchpad ignore duplicates" - MatchIsTouchpad "on" - MatchOS "Linux" - MatchDevicePath "/dev/input/mouse*" - Option "Ignore" "on" -EndSection - -# This option enables the bottom right corner to be a right button on clickpads -# and the right and middle top areas to be right / middle buttons on clickpads -# with a top button area. -# This option is only interpreted by clickpads. -Section "InputClass" - Identifier "Default clickpad buttons" - MatchDriver "synaptics" - # FIXME: describe these better. - # these options are not adjustable via synclient - Option "SoftButtonAreas" "50% 0 82% 0 0 0 0 0" -# Option "SoftButtonAreas" "0 50% 82% 0 0 0 0 0" -# Option "SecondarySoftButtonAreas" "0 42% 0 0 15% 42% 58% 0 15%" - Option "SecondarySoftButtonAreas" "0 42% 0 0 15% 42% 58% 0 15%" - - # the rest of this is adjustable via synclient. - - # Enable 1, 2, and 3 finger clicking as left, right, and middle click, respectively. - Option "TapButton1" "1" - Option "TapButton2" "3" - - # Calm the pad down while clicking. - Option "VertHysteresis" "10" - Option "HorizHysteresis" "10" - - # Drag Lock - Option "LockedDrags" "0" - - # Tap n drag - Option "TapAndDragGesture" "0" - - # Tap to click thresholds. - Option "FingerLow" "10" - Option "FingerHigh" "16" - - # Prevent accidental clicks - Option "PalmDetect" "1" - Option "PalmMinWidth" "10" - Option "PalmMinZ" "80" - - # scrolling. - Option "VertTwoFingerScroll" "1" - Option "VertScrollDelta" "90" - Option "HorizTwoFingerScroll" "1" - Option "HorizScrollDelta" "90" - - # Aceleration - Option "MinSpeed" "0.5" - Option "MaxSpeed" "0.75" - - Option "AccelerationProfile" "2" - Option "ConstantDeceleration" "4" -EndSection - -# This option disables software buttons on Apple touchpads. -# This option is only interpreted by clickpads. -Section "InputClass" - Identifier "Disable clickpad buttons on Apple touchpads" - MatchProduct "Apple|bcm5974" - MatchDriver "synaptics" - Option "SoftButtonAreas" "0 0 0 0 0 0 0 0" -EndSection diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh index 639c85f..0b37c2b 100755 --- a/scripts/InstallScripts/InstallPackages.sh +++ b/scripts/InstallScripts/InstallPackages.sh @@ -29,7 +29,7 @@ done locale-gen #Install shared packages -apt install -y xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils xserver-xorg-input-synaptics mousepad vlc dconf-tools sudo dtrx emacs25 +apt install -y xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils mousepad vlc dconf-tools sudo dtrx emacs25 apt install -y network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome [ "$DE" = "xfce" ] && apt install -y xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies numix-gtk-theme plank @@ -87,7 +87,7 @@ cp -rf $DIR/default.pa /etc/pulse/default.pa cp -rf $DIR/sound.sh /etc/acpi/sound.sh cp -rf $DIR/headphone-acpi-toggle /etc/acpi/events/headphone-acpi-toggle mkdir /etc/X11/xorg.conf.d/ -cp -rf $DIR/50-synaptics.conf /etc/X11/xorg.conf.d/ +cp -rf $DIR/30-touchpad.conf /etc/X11/xorg.conf.d/ apt clean && apt autoremove --purge diff --git a/scripts/buildDebianFs.sh b/scripts/buildDebianFs.sh index f5955e5..7ccbaaa 100755 --- a/scripts/buildDebianFs.sh +++ b/scripts/buildDebianFs.sh @@ -109,7 +109,7 @@ chroot $outmnt apt-get autoremove --purge chroot $outmnt apt-get clean #Download the packages to be installed by Install.sh: -chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt xserver-xorg-input-synaptics crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-tools plank network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome dtrx emacs25 +chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-tools plank network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome dtrx emacs25 #Download support for libinput-gestures chroot $outmnt apt install -y libinput-tools xdotool build-essential