From 6031b73fb544fd113d579409e21d618e286c4070 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sat, 24 Jul 2021 18:07:23 -0600
Subject: [PATCH 1/2] Replace termite with alacritty
Termite was removed from the main Arch repos and the devs are
recommending this instead
---
setup/linux/packages/gui | 2 +-
.../etc/skel/.config/alacritty/alacritty.yml | 34 +++++++
.../etc/skel/.config/openbox/autostart | 2 +-
.../etc/skel/.config/openbox/menu.xml | 60 ++++++-------
.../airootfs/etc/skel/.config/openbox/rc.xml | 20 ++---
.../airootfs/etc/skel/.config/termite/config | 90 -------------------
6 files changed, 76 insertions(+), 132 deletions(-)
create mode 100644 setup/linux/profile_gui/airootfs/etc/skel/.config/alacritty/alacritty.yml
delete mode 100644 setup/linux/profile_gui/airootfs/etc/skel/.config/termite/config
diff --git a/setup/linux/packages/gui b/setup/linux/packages/gui
index 4ef1a114..cebee0b2 100644
--- a/setup/linux/packages/gui
+++ b/setup/linux/packages/gui
@@ -1,3 +1,4 @@
+alacritty
arandr
arc-gtk-theme
cbatticon
@@ -29,7 +30,6 @@ qemu-guest-agent
rofi
rxvt-unicode
spice-vdagent
-termite
thunar
tigervnc
tint2
diff --git a/setup/linux/profile_gui/airootfs/etc/skel/.config/alacritty/alacritty.yml b/setup/linux/profile_gui/airootfs/etc/skel/.config/alacritty/alacritty.yml
new file mode 100644
index 00000000..a12dee79
--- /dev/null
+++ b/setup/linux/profile_gui/airootfs/etc/skel/.config/alacritty/alacritty.yml
@@ -0,0 +1,34 @@
+env:
+ TERM: xterm-256color
+
+font:
+ normal:
+ family: Hack
+ size: 8.0
+
+colors:
+ primary:
+ background: '#000000'
+ foreground: '#d0d0d0'
+
+ normal:
+ black: '#000000'
+ red: '#ff0000'
+ green: '#33ff00'
+ yellow: '#ffd000'
+ blue: '#0066ff'
+ magenta: '#cc00ff'
+ cyan: '#00ffff'
+ white: '#d0d0d0'
+
+ bright:
+ black: '#808080'
+ red: '#ff9900'
+ green: '#404040'
+ yellow: '#606060'
+ blue: '#c0c0c0'
+ magenta: '#e0e0e0'
+ cyan: '#3300ff'
+ white: '#ffffff'
+
+background_opacity: 0.9
diff --git a/setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/autostart b/setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/autostart
index 39c0f1bc..d4693528 100755
--- a/setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/autostart
+++ b/setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/autostart
@@ -1,5 +1,5 @@
#openbox-autostart
-/usr/bin/termite --title "Initializing..." -e "$HOME/.update_x"
+/usr/bin/alacritty --title "Initializing..." -e "$HOME/.update_x"
"$HOME/.start_desktop_apps" &
diff --git a/setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/menu.xml b/setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/menu.xml
index 0be00d27..a0e96b7b 100644
--- a/setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/menu.xml
+++ b/setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/menu.xml
@@ -4,7 +4,7 @@
-
- termite --title "Hardware Diagnostics" -e hw-diags
+ alacritty --title "Hardware Diagnostics" -e hw-diags
-
hardinfo
@@ -19,7 +19,7 @@
gsmartcontrol_polkit
-
- termite --title "Network Diagnostics" -hold -e hw-diags-network
+ alacritty --title "Network Diagnostics" -hold -e hw-diags-network
-
firefox
@@ -31,32 +31,32 @@
idle
-
- termite -e python
+ alacritty -e python
-
- termite -e python2.7
+ alacritty -e python2.7
-
- termite -e tclsh8.6
+ alacritty -e tclsh8.6
diff --git a/setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/rc.xml b/setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/rc.xml
index bb871df9..dafd7860 100644
--- a/setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/rc.xml
+++ b/setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/rc.xml
@@ -299,7 +299,7 @@
- termite --title "Hardware Diagnostics" -e "resize-and-run hw-diags"
+ alacritty --title "Hardware Diagnostics" -e "resize-and-run hw-diags"
@@ -314,7 +314,7 @@
- termite --title "Mount all Volumes" -e "resize-and-run mount-all-volumes gui"
+ alacritty --title "Mount all Volumes" -e "resize-and-run mount-all-volumes gui"
@@ -324,17 +324,17 @@
- termite --title "Hardware Diagnostics" -e "resize-and-run hw-diags --quick"
+ alacritty --title "Hardware Diagnostics" -e "resize-and-run hw-diags --quick"
- termite -e "resize-and-run /bin/zsh"
+ alacritty -e "resize-and-run /bin/zsh"
- termite --title "Hardware Sensors" -e "resize-and-run hw-sensors"
+ alacritty --title "Hardware Sensors" -e "resize-and-run hw-sensors"
@@ -349,7 +349,7 @@
- termite --title "Hardware Diagnostics" -e "resize-and-run hw-diags"
+ alacritty --title "Hardware Diagnostics" -e "resize-and-run hw-diags"
@@ -364,7 +364,7 @@
- termite --title "Mount all Volumes" -e "resize-and-run mount-all-volumes gui"
+ alacritty --title "Mount all Volumes" -e "resize-and-run mount-all-volumes gui"
@@ -374,17 +374,17 @@
- termite --title "Hardware Diagnostics" -e "resize-and-run hw-diags --quick"
+ alacritty --title "Hardware Diagnostics" -e "resize-and-run hw-diags --quick"
- termite -e "resize-and-run /bin/zsh"
+ alacritty -e "resize-and-run /bin/zsh"
- termite --title "Hardware Sensors" -e "resize-and-run hw-sensors"
+ alacritty --title "Hardware Sensors" -e "resize-and-run hw-sensors"
diff --git a/setup/linux/profile_gui/airootfs/etc/skel/.config/termite/config b/setup/linux/profile_gui/airootfs/etc/skel/.config/termite/config
deleted file mode 100644
index 23757be6..00000000
--- a/setup/linux/profile_gui/airootfs/etc/skel/.config/termite/config
+++ /dev/null
@@ -1,90 +0,0 @@
-[options]
-#allow_bold = true
-#audible_bell = false
-#bold_is_bright = true
-#cell_height_scale = 1.0
-#cell_width_scale = 1.0
-clickable_url = true
-#dynamic_title = true
-font = Hack 9
-#font = IPAGothic 10
-#fullscreen = true
-#icon_name = terminal
-#mouse_autohide = false
-#scroll_on_output = false
-#scroll_on_keystroke = true
-# Length of the scrollback buffer, 0 disabled the scrollback buffer
-# and setting it to a negative value means "infinite scrollback"
-scrollback_lines = 10000
-#search_wrap = true
-#urgent_on_bell = true
-#hyperlinks = false
-
-# $BROWSER is used by default if set, with xdg-open as a fallback
-#browser = xdg-open
-
-# "system", "on" or "off"
-cursor_blink = off
-
-# "block", "underline" or "ibeam"
-#cursor_shape = block
-
-# Hide links that are no longer valid in url select overlay mode
-#filter_unmatched_urls = true
-
-# Emit escape sequences for extra modified keys
-#modify_other_keys = false
-
-# set size hints for the window
-#size_hints = false
-
-# "off", "left" or "right"
-#scrollbar = off
-
-[colors]
-# If both of these are unset, cursor falls back to the foreground color,
-# and cursor_foreground falls back to the background color.
-cursor = #d0d0d0
-cursor_foreground = #000000
-
-foreground = #d0d0d0
-#foreground_bold = #ffffff
-background = #000000
-
-# 20% background transparency (requires a compositor)
-background = rgba(0, 0, 0, 0.85)
-
-# If unset, will reverse foreground and background
-highlight = #2f2f2f
-
-# Colors from color0 to color254 can be set
-color0 = #000000
-color1 = #ff0000
-color2 = #33ff00
-color3 = #ffd000
-color4 = #0066ff
-color5 = #cc00ff
-color6 = #00ffff
-color7 = #d0d0d0
-
-color8 = #808080
-color9 = #ff9900
-color10 = #404040
-color11 = #606060
-color12 = #c0c0c0
-color13 = #e0e0e0
-color14 = #3300ff
-color15 = #ffffff
-
-[hints]
-font = SourceCodePro 10
-foreground = #d0d0d0
-background = #000000
-#active_foreground = #e68080
-#active_background = #3f3f3f
-#padding = 2
-#border = #3f3f3f
-#border_width = 0.5
-#roundness = 2.0
-
-# vim: ft=dosini cms=#%s
From f61f4397d20445fa888983609ed4428e631c0296 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sat, 24 Jul 2021 18:08:19 -0600
Subject: [PATCH 2/2] Remove unused .Xresources file
---
.../profile_gui/airootfs/etc/skel/.Xresources | 65 -------------------
1 file changed, 65 deletions(-)
delete mode 100755 setup/linux/profile_gui/airootfs/etc/skel/.Xresources
diff --git a/setup/linux/profile_gui/airootfs/etc/skel/.Xresources b/setup/linux/profile_gui/airootfs/etc/skel/.Xresources
deleted file mode 100755
index d659b735..00000000
--- a/setup/linux/profile_gui/airootfs/etc/skel/.Xresources
+++ /dev/null
@@ -1,65 +0,0 @@
-! general settings
-URxvt*saveline: 15000
-URxvt*termName: rxvt-256color
-URxvt*iso14755: false
-
-! appearance
-URxvt*depth: 32
-!URxvt*background: rgba:0000/0000/0000/AAAA
-!URxvt*background: [80]#404552
-!URxvt*background: [100]#2f343f
-!URxvt*foreground: #F8F8FF
-!URxvt.underlineColor: #4682B4
-!URxvt.highlightColor: #4682B4
-!URxvt.throughColor: Blue
-!URxvt*cursorColor: #dc8cc3
-!URxvt*cursorColor2: Black
-URxvt*scrollBar: false
-URxvt*scrollBar_right: false
-URxvt*internalBorder: 0
-URxvt*externalBorder: 0
-!URxvt.colorIT: #87af5f
-!URxvt.colorBD: #c5c8c6
-!URxvt.colorUL: #87afd7
-URxvt.geometry: 92x16
-URxvt.internalBorder: 8
-URxvt.shading: 10
-URxvt.transparent: true
-
-! Base16 Isotope
-! Scheme: Jan T. Sott
-!! Modified by 2Shirt
-
-*.foreground: #d0d0d0
-*.background: #000000
-*.cursorColor: #d0d0d0
-
-*.color0: #000000
-*.color1: #ff0000
-*.color2: #33ff00
-*.color3: #ffd000
-*.color4: #0066ff
-*.color5: #cc00ff
-*.color6: #00ffff
-*.color7: #d0d0d0
-
-*.color8: #808080
-*.color9: #ff9900
-*.color10: #404040
-*.color11: #606060
-*.color12: #c0c0c0
-*.color13: #e0e0e0
-*.color14: #3300ff
-*.color15: #ffffff
-
-! fonts
-!Xft.dpi: 192
-Xft.autohint: 0
-Xft.antialias: 1
-Xft.hinting: true
-Xft.hintstyle: hintslight
-Xft.rgba: rgb
-Xft.lcdfilter: lcddefault
-URxvt.font: xft:Inconsolata:size=12
-!URxvt.letterSpace: -3
-