Replace kitty with alacritty

8 files changed, 24 insertions, 251 deletions

diff --git a/alacritty.yml b/alacritty.yml
new file mode 100644
index 0000000..98788c0
--- /dev/null
+++ b/alacritty.yml
@@ -0,0 +1,13 @@
+window:
+    opacity: 0.8
+    class: "alacritty"
+
+font:
+    size: 12
+    normal:
+        family: "Hack"
+    bold:
+        family: "Hack"
+    italic:
+        family: "Hack"
+
diff --git a/bin/lock b/bin/lock
index 2b8fc3a..1fa8004 100755
--- a/bin/lock
+++ b/bin/lock
@@ -30,9 +30,7 @@ FOCUSED_MONITOR=$(bspc query -M -m)
 FULLSCREEN_NODES=$(bspc query -N -n any.fullscreen)
 
 bspc monitor -f 1
-~/.local/kitty.app/bin/kitty \
-		-c ~/.config/kitty/lock_screen.conf \
-		-- ~/bin/lockscr1 &
+alacritty -e ~/bin/lockscr1 &
 
 while [ -z "$(ps -C lockscr1 -o pid=)" ]; do sleep 1; done
 while [ -z "$(ps -s $(ps -C lockscr1 -o pid=) -o pid=)" ]; do sleep 1; done
@@ -40,9 +38,7 @@ PRIMARY_WINDOW=$(bspc query -N -n)
 
 if [ -n "$(xrandr --listmonitors | grep 'DP-2')" ]; then
 	bspc monitor -f 2
-	~/.local/kitty.app/bin/kitty \
-			-c ~/.config/kitty/lock_screen.conf \
-			-- ~/bin/lockscr2 &
+	alacritty -e ~/bin/lockscr2 &
 
 	while [ -z "$(ps -C lockscr2 -o pid=)" ]; do sleep 1; done
 	while [ -z "$(ps -s $(ps -C lockscr2 -o pid=) -o pid=)" ]; do sleep 1; done
diff --git a/install.sh b/install.sh
index 55b064c..044cfb8 100755
--- a/install.sh
+++ b/install.sh
@@ -37,7 +37,8 @@ if command_exists apt; then
 		vlc \
 		firefox-esr \
 		thunderbird \
-		signal-desktop
+		signal-desktop \
+		fonts-hack
 	$SUDO apt purge -y \
 		lemonbar # automatically installed but unwanted
 else
@@ -58,9 +59,10 @@ ln -s ${PWD}/rofi_config ~/.config/rofi/config
 mkdir -p ~/.config/polybar
 ln -s ${PWD}/polybar ~/.config/polybar
 
-curl -L https://sw.kovidgoyal.net/kitty/installer.sh | bash
+cargo install alacritty
 
-ln -s ${PWD}/kitty/ ~/.config/kitty
+mkdir -p ~/.config/alacritty
+ln -s ${PWD}/alacritty.yml ~/.config/alacritty/alacritty.yml
 
 mkdir -p ~/.config
 ln -s ${PWD}/picom.conf ~/.config/picom.conf
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
deleted file mode 100644
index da62eff..0000000
--- a/kitty/kitty.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-font_family Hack
-font_size 12
-box_drawing_scale 1.75, 1.75, 1.75, 1.75
-remember_window_size no
-initial_window_width 1100
-initial_window_height 650
-foreground #c3c7d1
-selection_foreground #161925
-background #161925
-selection_background #c3c7d1
-background_opacity 0.8
-color0 #282c34
-color10 #282c34
-color1 #ed254e
-color11 #ed254e
-color2 #71f79f
-color12 #71f79f
-color3 #f9dc5c
-color13 #f9dc5c
-color4 #7cb7ff
-color14 #7cb7ff
-color5 #c74ded
-color15 #c74ded
-color6 #00c1e4
-color16 #00c1e4
-color7 #dcdfe4
-color17 #dcdfe4
-cursor #f9dc5c
diff --git a/kitty/lock_screen.conf b/kitty/lock_screen.conf
deleted file mode 100644
index 4e039e2..0000000
--- a/kitty/lock_screen.conf
+++ /dev/null
@@ -1,212 +0,0 @@
-font_family Hack
-font_size 12
-box_drawing_scale 1.75, 1.75, 1.75, 1.75
-remember_window_size no
-initial_window_width 1100
-initial_window_height 650
-foreground #c3c7d1
-selection_foreground #161925
-background #161925
-selection_background #c3c7d1
-background_opacity 0.8
-color0 #282c34
-color10 #282c34
-color1 #ed254e
-color11 #ed254e
-color2 #71f79f
-color12 #71f79f
-color3 #f9dc5c
-color13 #f9dc5c
-color4 #7cb7ff
-color14 #7cb7ff
-color5 #c74ded
-color15 #c74ded
-color6 #00c1e4
-color16 #00c1e4
-color7 #dcdfe4
-color17 #dcdfe4
-cursor #f9dc5c
-
-map alt+1 no_op
-map alt+2 no_op
-map alt+3 no_op
-map shift+cmd+v no_op
-map ctrl+0x61 no_op
-map kitty_mod+space no_op
-map kitty_mod+f1 no_op
-map kitty_mod+e no_op
-map ctrl+f>2 no_op
-map f1 no_op
-map f2 no_op
-map ctrl+shift+c no_op
-map cmd+c no_op
-map ctrl+shift+v no_op
-map cmd+v no_op
-map ctrl+shift+s no_op
-map shift+insert no_op
-map ctrl+shift+o no_op
-map kitty_mod+o no_op
-map kitty_mod+y no_op
-map ctrl+shift+up no_op
-map ctrl+shift+k no_op
-map opt+cmd+page_up no_op
-map cmd+up no_op
-map ctrl+shift+down no_op
-map ctrl+shift+j no_op
-map opt+cmd+page_down no_op
-map cmd+down no_op
-map ctrl+shift+page_up no_op
-map cmd+page_up no_op
-map ctrl+shift+page_down no_op
-map cmd+page_down no_op
-map ctrl+shift+home no_op
-map cmd+home no_op
-map ctrl+shift+end no_op
-map cmd+end no_op
-map ctrl+shift+z no_op
-map ctrl+shift+x no_op
-map ctrl+shift+h no_op
-map f1 no_op
-map ctrl+shift+g no_op
-map f1 no_op
-map f1 no_op
-map f1 no_op
-map ctrl+shift+enter no_op
-map cmd+enter no_op
-map kitty_mod+y no_op
-map ctrl+alt+enter no_op
-map ctrl+enter no_op
-map ctrl+n no_op
-map ctrl+f no_op
-map ctrl+shift+n no_op
-map cmd+n no_op
-map ctrl+shift+w no_op
-map shift+cmd+d no_op
-map ctrl+shift+] no_op
-map ctrl+shift+[ no_op
-map ctrl+shift+f no_op
-map ctrl+shift+b no_op
-map ctrl+shift+r no_op
-map cmd+r no_op
-map ctrl+shift+1 no_op
-map cmd+1 no_op
-map ctrl+shift+2 no_op
-map cmd+2 no_op
-map ctrl+shift+3 no_op
-map cmd+3 no_op
-map ctrl+shift+4 no_op
-map cmd+4 no_op
-map ctrl+shift+5 no_op
-map cmd+5 no_op
-map ctrl+shift+6 no_op
-map cmd+6 no_op
-map ctrl+shift+7 no_op
-map cmd+7 no_op
-map ctrl+shift+8 no_op
-map cmd+8 no_op
-map ctrl+shift+9 no_op
-map cmd+9 no_op
-map ctrl+shift+0 no_op
-map ctrl+shift+f7 no_op
-map ctrl+shift+f8 no_op
-map ctrl+shift+right no_op
-map shift+cmd+] no_op
-map ctrl+tab no_op
-map ctrl+shift+left no_op
-map shift+cmd+[ no_op
-map ctrl+shift+tab no_op
-map ctrl+shift+t no_op
-map cmd+t no_op
-map ctrl+shift+q no_op
-map cmd+w no_op
-map shift+cmd+w no_op
-map ctrl+shift+. no_op
-map ctrl+shift+, no_op
-map ctrl+shift+alt+t no_op
-map shift+cmd+i no_op
-map ctrl+alt+1 no_op
-map ctrl+alt+2 no_op
-map ctrl+t no_op
-map ctrl+shift+l no_op
-map ctrl+alt+t no_op
-map ctrl+alt+s no_op
-map ctrl+alt+p no_op
-map ctrl+alt+z no_op
-map ctrl+shift+equal no_op
-map ctrl+shift+plus no_op
-map ctrl+shift+kp_add no_op
-map cmd+plus no_op
-map cmd+equal no_op
-map shift+cmd+equal no_op
-map ctrl+shift+minus no_op
-map ctrl+shift+kp_subtract no_op
-map cmd+minus no_op
-map shift+cmd+minus no_op
-map ctrl+shift+backspace no_op
-map cmd+0 no_op
-map kitty_mod+f6 no_op
-map kitty_mod+f6 no_op
-map ctrl+shift+e no_op
-map ctrl+shift+p>f no_op
-map ctrl+shift+p>shift+f no_op
-map ctrl+shift+p>l no_op
-map ctrl+shift+p>w no_op
-map ctrl+shift+p>h no_op
-map ctrl+shift+p>n no_op
-map ctrl+shift+p>y no_op
-map ctrl+shift+f11 no_op
-map ctrl+cmd+f no_op
-map ctrl+shift+f10 no_op
-map opt+cmd+s no_op
-map ctrl+shift+u no_op
-map ctrl+cmd+space no_op
-map ctrl+shift+f2 no_op
-map cmd+, no_op
-map ctrl+shift+escape no_op
-map ctrl+shift+a>m no_op
-map ctrl+shift+a>l no_op
-map ctrl+shift+a>1 no_op
-map ctrl+shift+a>d no_op
-map ctrl+shift+delete no_op
-map opt+cmd+r no_op
-map f1 no_op
-map f1 no_op
-map f1 no_op
-map f1 no_op
-map f1 no_op
-map cmd+k no_op
-map ctrl+shift+f5 no_op
-map ctrl+cmd+, no_op
-map f5 no_op
-map ctrl+shift+f6 no_op
-map opt+cmd+, no_op
-map ctrl+alt+a no_op
-map ctrl+alt+a no_op
-map ctrl+alt+a no_op
-map ctrl+alt+a no_op
-map shift+cmd+/ no_op
-map f1 no_op
-map f1 no_op
-map F1 no_op
-map f1 no_op
-map f1 no_op
-map f1 no_op
-map f1 no_op
-map f1 no_op
-map kitty_mod+e no_op
-map f5 no_op
-map F1 no_op
-map f5 no_op
-map ctrl+p no_op
-map ctrl+n no_op
-map ctrl+o no_op
-map ctrl+left no_op
-map ctrl+down no_op
-map ctrl+left no_op
-map ctrl+down no_op
-map ctrl+p no_op
-map ctrl+1 no_op
-map f1 no_op
-map f1 no_op
-map f2 no_op
-map f3 no_op
diff --git a/picom.conf b/picom.conf
index a14fe94..49fe322 100644
--- a/picom.conf
+++ b/picom.conf
@@ -1,3 +1,3 @@
 opacity-rule = [
-  "80:class_g = 'kitty'"
+  "90:class_g = 'Alacritty'"
 ];
diff --git a/shell_only.sh b/shell_only.sh
index 827c68c..d037721 100755
--- a/shell_only.sh
+++ b/shell_only.sh
@@ -57,3 +57,5 @@ $SUDO update-alternatives --set editor /usr/local/bin/micro
 
 mkdir -p ~/.local/bspwm-setup/
 ln -s ${PWD}/lockscreen.xkb ~/.local/bspwm-setup/lockscreen.xkb
+
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
diff --git a/sxhkdrc b/sxhkdrc
index bacc4c4..dfe4003 100644
--- a/sxhkdrc
+++ b/sxhkdrc
@@ -4,7 +4,7 @@
 
 # terminal emulator
 super + Return
-	~/.local/kitty.app/bin/kitty
+	~/.cargo/bin/alacritty
 
 # program launcher
 super + a