From 4b52c21ac9755ecdaeecc86d43d55ec04fe80ea8 Mon Sep 17 00:00:00 2001
From: Joe Groocock <me@frebib.net>
Date: Sun, 22 Mar 2020 11:10:14 +0000
Subject: [PATCH] alacritty: set alacritty as default terminal

---
 .config/X11/xprofile   |  2 +-
 .config/i3/config      | 15 +++++++--------
 .config/polybar/config |  6 +++---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.config/X11/xprofile b/.config/X11/xprofile
index 15595af..4c41bc6 100644
--- a/.config/X11/xprofile
+++ b/.config/X11/xprofile
@@ -1,7 +1,7 @@
 #!/bin/sh -u
 
 # Graphical-specific environment variables
-export TERMINAL="termite"
+export TERMINAL="alacritty"
 export BROWSER="firefox"
 
 export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
diff --git a/.config/i3/config b/.config/i3/config
index c6080ee..d752d04 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -113,10 +113,9 @@ exec_always --no-startup-id feh --no-fehbg --no-xinerama --bg-fill $DOTFILES/lak
 for_window [class="Pinentry"] floating enable
 for_window [class="Pavucontrol"] floating enable
 for_window [class="Blueman-manager"] floating enable
+for_window [class="floating-term" instance="termite"] floating enable
+for_window [class="Alacritty" instance="floating-term"] floating enable
 for_window [window_role="floating-term"] floating enable
-for_window [window_role="pop-up"] floating enable
-for_window [window_role="i3blocks-update-term"] floating enable
-for_window [window_role="i3blocks-clock-term"] floating enable
 for_window [title="^rofi$"] floating enable
 
 new_window none
@@ -132,12 +131,12 @@ popup_during_fullscreen smart
 bindsym $mod+Shift+j            reload
 bindsym $mod+c                  exec systemd-run --user --scope --slice=chromium.slice --no-block -- chromium
 bindsym $mod+b                  exec systemd-run --user --scope --slice=firefox.slice --no-block -- firefox
-bindsym $mod+v                  exec "i3-sensible-terminal -e \\"$SHELL -c vim;$SHELL\\"
-bindsym $mod+Ctrl+v             exec "i3-sensible-terminal -r floating-term -e \\"$SHELL -c vim;$SHELL\\"
+bindsym $mod+v                  exec "i3-sensible-terminal -e sh -c \\"($SHELL -c $EDITOR || :) && $SHELL\\"
+bindsym $mod+Ctrl+v             exec "i3-sensible-terminal --class floating-term -e sh -c \\"($SHELL -c $EDITOR || : ) && $SHELL\\"
 bindsym $mod+Return             exec i3-sensible-terminal
-bindsym $mod+Ctrl+Return        exec i3-sensible-terminal -r floating-term
-bindsym $mod+Shift+Return       exec i3-sensible-terminal -d "`xcwd`"
-bindsym $mod+Ctrl+Shift+Return  exec i3-sensible-terminal -r floating-term -d "`xcwd`"
+bindsym $mod+Ctrl+Return        exec i3-sensible-terminal --class floating-term
+bindsym $mod+Shift+Return       exec i3-sensible-terminal --working-directory "$(xcwd)"
+bindsym $mod+Ctrl+Shift+Return  exec i3-sensible-terminal --class floating-term --working-directory "$(xcwd)"
 bindsym $mod+l                  exec dm-tool switch-to-greeter
 bindsym $mod+space              exec "pkill rofi; rofi -show run -sidebar-mode -terminal i3-sensible-terminal -normal-window"
 bindsym $mod+Shift+p            exec rofi-pass --root $(grep path ~/.config/gopass/config.yml | sed -E 's|^.*fs\+file://||g' | tr '\n' ':') | sed 's/:$//g'
diff --git a/.config/polybar/config b/.config/polybar/config
index fec9614..166b652 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -68,13 +68,13 @@ exec = $XDG_CONFIG_HOME/polybar/update.sh
 tail = true
 format-prefix = "  "
 format-prefix-foreground = ${colours.icon}
-click-left = systemd-run --user --no-block -- i3-sensible-terminal -r i3blocks-update-term -e "sh -c 'yay && kill -USR1 %pid% || kill --USR1 %pid%'"
+click-left = systemd-run --user --no-block -- i3-sensible-terminal --class floating-term -e sh -c "yay; kill -USR1 %pid%"
 
 [module/weather]
 type = custom/script
 exec = $XDG_CONFIG_HOME/polybar/weather.sh
 interval = 120
-click-left = systemd-run --user --no-block i3-sensible-terminal -r floating-term -e 'sh -c "xdotool getactivewindow windowsize 910 680 && curl wttr.in && sleep infinity"'
+click-left = systemd-run --user --no-block -- i3-sensible-terminal --class floating-term -d 125 40 --hold -e sh -c "curl wttr.in"
 
 [module/gateway]
 type = custom/script
@@ -208,7 +208,7 @@ label-disconnected-foreground = ${colours.critical}
 type = internal/date
 interval = 1
 
-label = %{A3:systemd-run --user --no-block -- i3-sensible-terminal -r i3blocks-clock-term -e "sh -c \"xdotool getactivewindow windowsize 500 600; cal -y $(date +%Y); stty -echo; exec sleep infinity\"" &:}%date% %time%%{A}
+label = %{A3:systemd-run --user --no-block -- i3-sensible-terminal --class floating-term -d 66 35 -qq --hold -e sh -c "cal -y $(date +%Y)":}%date% %time%%{A}
 
 time = %H:%M
 time-alt = %a %e %b %Y %H:%M:%S