From 42b10fdf8586d793308c71fb1e4f1e4354c95ac5 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Sun, 30 Apr 2023 10:37:49 -0500 Subject: [PATCH 1/2] Fix pointer accel for trackpads --- common/helix/config.toml | 3 --- host/laptop/sway/config | 9 +++++++-- os/linux/sway/config | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/common/helix/config.toml b/common/helix/config.toml index 2474fab..fcb4a59 100644 --- a/common/helix/config.toml +++ b/common/helix/config.toml @@ -8,9 +8,6 @@ scrolloff = 8 rulers = [80, 120] cursorline = true -[editor.soft-wrap] -enable = true - [editor.cursor-shape] normal = "block" insert = "bar" diff --git a/host/laptop/sway/config b/host/laptop/sway/config index c1a0f6d..f6e3b8e 100644 --- a/host/laptop/sway/config +++ b/host/laptop/sway/config @@ -7,8 +7,13 @@ input type:keyboard { xkb_options ctrl:nocaps } -input type:touchscreen { - events disabled +# disabled since we don't have a broken touch screen anymore +# input type:touchscreen { +# events disabled +# } + +input type:touchpad { + } exec firefox diff --git a/os/linux/sway/config b/os/linux/sway/config index 3131e81..620784a 100644 --- a/os/linux/sway/config +++ b/os/linux/sway/config @@ -39,7 +39,7 @@ input type:touchpad { tap enabled natural_scroll enabled middle_emulation enabled - pointer_accel 0.33 + # pointer_accel } bindsym $mod+control+space exec makoctl dismiss From 653d2bdff263be654aa4def0546fccef2325c332 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 5 May 2023 13:46:24 -0500 Subject: [PATCH 2/2] Use kitty with nerd fonts properly --- common/kitty/kitty.conf | 10 ++++++---- os/linux/arch/provision.d/optional/ui-packages.bash | 2 +- os/linux/sway/config | 6 ++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/kitty/kitty.conf b/common/kitty/kitty.conf index 436bcd1..a42614e 100644 --- a/common/kitty/kitty.conf +++ b/common/kitty/kitty.conf @@ -1,9 +1,11 @@ -font_family IosevkaLyteTerm Nerd Font Complete -bold_font IosevkaLyteTerm Heavy Nerd Font Complete -italic_font IosevkaLyteTerm Italic Nerd Font Complete -bold_italic_font IosevkaLyteTerm Heavy Italic Nerd Font Complete +font_family IosevkaLyteTerm +bold_font IosevkaLyteTerm Heavy +italic_font IosevkaLyteTerm Italic +bold_italic_font IosevkaLyteTerm Heavy Italic font_size 12.5 +symbol_map U+23FB-U+23FE,U+2665,U+26A1,U+2B58,U+E000-U+E00A,U+E0A0-U+E0A3,U+E0B0-U+E0D4,U+E200-U+E2A9,U+E300-U+E3E3,U+E5FA-U+E6AA,U+E700-U+E7C5,U+EA60-U+EBEB,U+F000-U+F2E0,U+F300-U+F32F,U+F400-U+F4A9,U+F500-U+F8FF,U+F0001-U+F1AF0 Symbols Nerd Font Mono + # use `kitty + list-fonts --psnames` to get the font's PostScript name # font_features IosevkaLyte # font_features Iosevka-Heavy +calt +dlig diff --git a/os/linux/arch/provision.d/optional/ui-packages.bash b/os/linux/arch/provision.d/optional/ui-packages.bash index f41c1d8..a13e7a4 100755 --- a/os/linux/arch/provision.d/optional/ui-packages.bash +++ b/os/linux/arch/provision.d/optional/ui-packages.bash @@ -15,7 +15,7 @@ paru -Sy --needed \ bluez bluez-libs bluez-utils bluez-tools `# Bluetooth` \ arc-gtk-theme elementary-icon-theme `# GUI Theme Stuff` \ thunar thunar-volman gvfs `# File Manager` \ - ttf-iosevka-lyte-nerd-font ttf-iosevka-lyte ttf-opensans `# Fonts` \ + ttf-iosevka-lyte ttf-nerd-fonts-symbols-mono ttf-opensans `# Fonts` \ avr-libc avr-gcc dfu-programmer dfu-util `# MCU Programming Utilities` \ gimp inkscape krita `# Image/Vector Editing Applications` \ audacity `# Audio Editing Application` \ diff --git a/os/linux/sway/config b/os/linux/sway/config index 620784a..e2bb5d8 100644 --- a/os/linux/sway/config +++ b/os/linux/sway/config @@ -163,7 +163,7 @@ mode "resize" { bindsym escape mode "default" } -set $tilers "(kitty.*|firefox.*|slack.*|Slack.*|thunar.*|Alacritty.*|alacritty.*)" +set $tilers "(kitty.*|firefox.*|slack.*|Slack.*|thunar.*|Alacritty.*|alacritty.*|Discord.*|discord.*)" for_window [title=".*"] floating enable for_window [app_id=$tilers] floating disable bindsym $mod+shift+alt+f for_window [class=$tilers] floating toggle @@ -186,9 +186,7 @@ exec /usr/share/sway/scripts/inactive-windows-transparency.py --opacity 0.95 exec mako # exec gammastep -t 6500:3500 -l 39.0:-94.5 # exec /usr/lib/kdeconnectd -# exec sway-init-tmux -# TODO: initial startup window attaches to a known, default tmux session (same for SSH?) -# new kitty windows setup a fresh tmux + exec exec kitty --single-instance fish -i exec tmux start-server