From 805b435113e8c61e6b329ec7bf6fa4e2b2a61860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yaroslav=20de=20la=20Pe=C3=B1a=20Smirnov?=
 <yps@yaroslavps.com>
Date: Mon, 22 Mar 2021 03:51:42 +0300
Subject: Some changes to improve things on the X200

* Switched to foot, since Alacritty doesn't support older GPUs and
because foot consumes around 7-15MB of RAM per instance while Alacritty
consumes around 30-60MB/instance.
* Other minor changes and improvements.
---
 dotfiles/.config/foot/foot.ini  | 31 +++++++++++++++++++++++++++++++
 dotfiles/.config/sway/config    | 18 +++++++++---------
 dotfiles/.local/bin/ddquakemite |  7 ++++---
 dotfiles/.local/bin/menuman     |  2 +-
 dotfiles/.local/bin/menupass    |  2 +-
 dotfiles/.profile               |  2 +-
 6 files changed, 47 insertions(+), 15 deletions(-)
 create mode 100644 dotfiles/.config/foot/foot.ini

(limited to 'dotfiles')

diff --git a/dotfiles/.config/foot/foot.ini b/dotfiles/.config/foot/foot.ini
new file mode 100644
index 0000000..1fb832f
--- /dev/null
+++ b/dotfiles/.config/foot/foot.ini
@@ -0,0 +1,31 @@
+line-height = 10
+
+[mouse]
+hide-when-typing = yes
+
+[colors]
+
+foreground = fcf8e2
+background = 151517
+
+regular0 = 33333a
+regular1 = b73030
+regular2 = 6d974b
+regular3 = b2872f
+regular4 = 3f6e90
+regular5 = 9c6992
+regular6 = 5b8277
+regular7 = b0afa8
+
+bright0 = 676775
+bright1 = c45c5c
+bright2 = 92b078
+bright3 = e2b55a
+bright4 = 81acc1
+bright5 = b48ead
+bright6 = 7fac96
+bright7 = faf6e5
+
+[search-bindings]
+find-prev = Control+p
+find-next = Control+n
diff --git a/dotfiles/.config/sway/config b/dotfiles/.config/sway/config
index 0b1ba66..c2824ab 100644
--- a/dotfiles/.config/sway/config
+++ b/dotfiles/.config/sway/config
@@ -5,8 +5,8 @@
 # Set mod key (Mod1=<Alt>, Mod4=<Super>)
 set $mod Mod4
 set $alt Mod1
-set $term alacritty
-set $browser "qutebrowser"
+set $term foot
+set $browser qutebrowser
 
 # set default desktop layout (default is tiling)
 # workspace_layout tabbed <stacking|tabbed>
@@ -112,7 +112,7 @@ bindswitch --reload --locked lid:on exec "swaysession suspend"
 # Trackpoint (Thinkpad)
 input 2:10:TPPS/2_IBM_TrackPoint {
 	accel_profile flat
-	pointer_accel 0.7
+	pointer_accel 0.8
 }
 
 # Trackpoint (Thinkpad Compact Keyboard (External))
@@ -159,7 +159,7 @@ bindsym --to-code {
 	$mod+Shift+q kill
 	$mod+q kill
 
-	# bemenu program launcher (-x force run through xwayland, -t run in terminal)
+	# bemenu program launcher (-x force run through xwayland, -T run in terminal)
 	$mod+d exec --no-startup-id menurun
 	$mod+Shift+d exec --no-startup-id "menurun -t"
 	$mod+Ctrl+d exec --no-startup-id "menurun -x"
@@ -180,9 +180,9 @@ bindsym --to-code {
 	$mod+t exec --no-startup-id toggletorrent
 	$mod+Ctrl+t exec --no-startup-id launch-transmission
 	$mod+s exec "xway steam"
-	$mod+m exec $term -e ncmpcpp
-	$mod+n exec $term -t "newsboat" -e newsboat && killall -42 waybar
-	$mod+a exec $term -t "aerc" -e aerc
+	$mod+m exec $term ncmpcpp
+	$mod+n exec $term -T "newsboat" newsboat && killall -42 waybar
+	$mod+a exec $term -T "aerc" aerc
 	$mod+o exec --no-startup-id notistats
 	$mod+c exec --no-startup-id camtoggle
 	$mod+grave exec --no-startup-id menuemoji
@@ -195,7 +195,7 @@ bindsym --to-code {
 
 	# Network management
 	$mod+Shift+c exec togglevpn
-	$mod+Shift+n exec $term -t "Network Manager" -e 'nmtui'
+	$mod+Shift+n exec $term -T "Network Manager" 'nmtui'
 
 	# Screenshot and recording
 	Print exec --no-startup-id menugrim -q
@@ -204,7 +204,7 @@ bindsym --to-code {
 	Ctrl+Print exec --no-startup-id swayrecord
 
 	# Sound
-	$mod+Shift+m exec $term -t "ncpamixer" -e 'ncpamixer'
+	$mod+Shift+m exec $term -T "ncpamixer" 'ncpamixer'
 	$mod+Ctrl+m exec --no-startup-id menuoutput
 
 	# Applications that start with no gaps
diff --git a/dotfiles/.local/bin/ddquakemite b/dotfiles/.local/bin/ddquakemite
index c38225a..0393f1e 100755
--- a/dotfiles/.local/bin/ddquakemite
+++ b/dotfiles/.local/bin/ddquakemite
@@ -7,10 +7,11 @@ if ! [ -z "$(swaymsg -t get_tree | grep 'ddterminal')" ]; then
         swaymsg '[title="ddterminal"] move scratchpad'
     fi
 else
-    $TERMINAL -t "ddterminal" -e tmuxatt &
+    $TERMINAL -T "ddterminal" tmuxatt &
     sleep 0.2s
-    currenty=$(swaygetcurrentwindow | cut -d ' ' -f1 | cut -d ',' -f2 )
-    let moveup=$currenty-30
+    curwiny=$(swaygetcurrentwindow | cut -d ' ' -f1 | cut -d ',' -f2 )
+    curdisy=$(swaymsg -pt get_outputs | grep -A3 focused | grep Position | cut -d ',' -f2)
+    moveup=$(($curwiny - $curdisy - 30))
     swaymsg move up "$moveup px"
 fi
 
diff --git a/dotfiles/.local/bin/menuman b/dotfiles/.local/bin/menuman
index fe79667..acad4c4 100755
--- a/dotfiles/.local/bin/menuman
+++ b/dotfiles/.local/bin/menuman
@@ -16,4 +16,4 @@ if [ -z "$chosen" ]; then
     exit 0
 fi
 
-$TERMINAL -t "man $chosen" -e man $chosen
+$TERMINAL -T "man $chosen" man $chosen
diff --git a/dotfiles/.local/bin/menupass b/dotfiles/.local/bin/menupass
index 7ad3f59..9633b56 100755
--- a/dotfiles/.local/bin/menupass
+++ b/dotfiles/.local/bin/menupass
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#!/usr/bin/bash
 
 # Inspiration taken from
 # https://git.zx2c4.com/password-store/tree/contrib/dmenu/passmenu
diff --git a/dotfiles/.profile b/dotfiles/.profile
index 0c34ff9..1628457 100644
--- a/dotfiles/.profile
+++ b/dotfiles/.profile
@@ -14,7 +14,7 @@ export MANWIDTH=80
 
 # User specific environment and startup programs:
 export LANG=en_US.UTF-8
-export TERMINAL=alacritty
+export TERMINAL=foot
 export EDITOR="nvim"
 export PAGER="less -R -j.5"
 export BROWSER=qutebrowser
-- 
cgit v1.2.3