Merge branch 'xtermSwitch'

Change my default terminal emulator to Xterm.  For details, refer to
commit message 0f61877807.
This commit is contained in:
Protesilaos Stavrou 2019-05-23 14:10:56 +03:00
commit 5bbe6938ce
No known key found for this signature in database
GPG key ID: 99BD6459CD5CA3EA
22 changed files with 470 additions and 15 deletions

View file

@ -252,10 +252,28 @@ modify_vim() {
echo "Updating vim syntax theme"
}
# Set theme for XTerm
# -------------------
#
# This is my default terminal emulator.
modify_xterm() {
local my_colours my_Xcolors my_resources
my_colours="$HOME/.local/share/my_colours"
my_Xcolors="$my_colours/active-tempus-theme.Xcolors"
my_resources="$HOME/.Xresources"
if [ "$(command -v xterm 2> /dev/null)" ] && [ -f "$my_Xcolors" ] && [ -f "$my_resources" ]; then
sed --follow-symlinks -i "s/tempus_[a-z]*/tempus_$tempus_scheme/" "$my_Xcolors"
xrdb -I "$HOME" -merge "$my_resources"
echo "Updating XTerm colours"
fi
}
# Set theme for MATE Terminal
# ---------------------------
#
# This is my default terminal emulator. This script leverages `dconf`
# This is my fallback terminal emulator. This script leverages `dconf`
# to make the necessary changes.
modify_mate_terminal() {
if [ "$(command -v mate-terminal 2> /dev/null)" ]; then
@ -649,6 +667,7 @@ update_environment_theme() {
# variables it exposes
# call external script to pass new colours to running terminals
own_script_update_running_terminals
modify_xterm
modify_less_manpages
modify_newsboat
modify_neomutt
@ -656,7 +675,6 @@ update_environment_theme() {
modify_bspwm
modify_dunst
modify_melonpanel
modify_mate_terminal
}
# Catch-all function when running a fully fledged DE
@ -671,6 +689,7 @@ update_environment_theme_de() {
mate)
echo "Your current session is _$DESKTOP_SESSION_"
modify_mate
modify_mate_terminal
;;
xfce)
echo "Your current session is _$DESKTOP_SESSION_"
@ -694,7 +713,6 @@ update_environment_theme_de() {
modify_tmux
modify_dunst
modify_melonpanel
modify_mate_terminal
}
# Conditions for running this script

View file

@ -58,6 +58,11 @@ bspc config presel_feedback_color "#2a2829" # feedback for manual node split
# ones that control BSPWM
sxhkd -c "$HOME/.config/sxhkd/"sxhkdrc* &
# Load my XTerm and relevant configurations.
if [ -f "$HOME/.Xresources" ]; then
xrdb -I "$HOME" -merge "$HOME/.Xresources"
fi
# Launch my custom Lemonbar implementation
if [ "$(command -v melonpanel 2> /dev/null)" ]; then
# Make sure we have no running instances

View file

@ -2,7 +2,7 @@ List of common key bindings. All definitions are stored at:
~/.config/sxhkd/sxhkdrc
Last review 2019-05-16.
Last review 2019-05-23.
Explanation of the basics
=========================
@ -34,7 +34,7 @@ Getting started
===============
Super + Return |-Open a terminal running the "Default" tmux session
Super + Shift + Return |-Open a generic terminal (mate-terminal)
Super + Shift + Return |-Open a generic terminal (xterm)
Super + q |-Close focused node
Super + Shift + q |-Kill focused node
Ctrl + Alt + Delete |-Launch poweroptionsmenu, where you can choose to log out, reboot, etc.

View file

@ -96,7 +96,7 @@ ctrl + alt + {Home,End,Delete}
# terminals, like a barbarian! Watch my screen cast on the matter:
# https://protesilaos.com/codelog/2019-01-13-tmux-demo-bspwm/
super + {_, shift + } Return
{mate-terminal --disable-factory -x tmux new-session -A -s 'Default', mate-terminal --disable-factory}
{xterm -e tmux new-session -A -s 'Default', xterm}
# GUI programs. Where these are alternatives to common CLI tools they
# are mapped to the same number as their counterparts, but prepended
@ -111,13 +111,8 @@ super + g ; {1,2,3}
# CLI programs. Any browser and/or file manager should be assigned the
# numbers 1 and 2 respectively, in order to keep consistency with the
# above-defined GUIs.
#
# Note that, by default, all instances of `mate-terminal` run in
# a single process. So killing one (bspc node -k), will bring down all
# terminals. Pass option "--disable-factory" to run each terminal as
# its own process.
super + x ; {3-5}
mate-terminal --disable-factory -x {neomutt,newsboat,ncmpcpp}
xterm -e {neomutt,newsboat,ncmpcpp}
# I use "my_float_window" as an application name or class for those rare
# occasions where I prefer a floating window at launch. The option
@ -127,12 +122,12 @@ super + x ; {3-5}
# Note that the executable `calc` is contained in the Debian package
# `apcalc`.
super + x ; 0
mate-terminal --disable-factory --class=my_float_window -x calc
xterm -class "my_float_window" -e calc
# Bring up the help text for common keybindings
super + {F1,Home}
mate-terminal --disable-factory --class=my_float_window \
--geometry='100x30' -x less "$HOME/.config/sxhkd/cheatsheet_sxhkdrc.txt"
xterm -class "my_float_window" \
-geometry '100x30' -e less "$HOME/.config/sxhkd/cheatsheet_sxhkdrc.txt"
# sbgmenu: dmenu interface for browsing images from my "Pictures"
# directory. There is an option to just display the selected file, or

81
xterm/.Xresources Normal file
View file

@ -0,0 +1,81 @@
!
! ~/.Xresources
!
! Description
! ===========
!
! This file is part of my dotfiles and is meant to work with the rest of
! my custom desktop session. The font-related settings reflect my
! fontconfig rules. Xterm is configured to work like GNOME terminal.
!
! My dotfiles: https://gitlab.com/protesilaos/dotfiles
! Font settings (for programs that do not support fontconfig)
! ===========================================================
Xft*antialias: 1
Xft*rgba: rgb
Xft*autohint: 0
Xft*hinting: 1
Xft*hintstyle: hintfull
Xft*lcdfilter: lcddefault
! xterm
! =====
! Basic settings
XTerm*termName: xterm-256color
XTerm*utf8: 1
xterm*dynamicColors: true
! Visual
XTerm*cursorBlink: false
XTerm*visualbell: true
XTerm*bellIsUrgent: true
XTerm*geometry: 80x24
XTerm*internalBorder: 2
XTerm*toolBar: false
XTerm*scrollBar: false
XTerm*scrollKey: true
XTerm*multiClickTime: 250
! Text highlighting
XTerm*highlightColor: XtDefaultForeground
XTerm*highlightColorMode: default
XTerm*highlightReverse: true
XTerm*highlightTextColor: XtDefaultBackground
XTerm*highlightSelection: true
! Use fontconfig alias for desired typeface (based on my relevant rules/preferences)
XTerm*faceName: xft:monospace:size=10
XTerm*boldFont: xft:monospace:style=bold:size=10
XTerm*faceSize1: 8
XTerm*faceSize2: 12
XTerm*faceSize3: 14
XTerm*faceSize4: 16
XTerm*faceSize5: 18
XTerm*faceSize6: 20
XTerm*saveLines: 9999
XTerm*scrollTtyKeypress: true
XTerm*scrollTtyOutput: false
XTerm*jumpScroll: true
XTerm*multiScroll: true
! Backspace behaviour
XTerm*metaSendsEscape: true
XTerm*backarrowKey: false
XTerm*ttyModes: erase ^?
! Key bindings. Use C-S-{c,v} to copy/paste as in GNOME terminal. The
! keys "Prior" and "Next" represent PgUp and PgDown respectively.
XTerm*selectToClipboard: true
XTerm*translations: #override \n\
Ctrl Shift <KeyPress>C: select-end(SELECT, CLIPBOARD) \n\
Ctrl Shift <KeyPress>V: insert-selection(SELECT, CLIPBOARD) \n\
Ctrl Shift <KeyPress>Prior: larger-vt-font() \n\
Ctrl Shift <KeyPress>Next: smaller-vt-font()
! DO NOT EDIT THIS. IT IS CONTROLLED PROGRAMMATICALLY.
! Use my active Tempus theme.
#include ".local/share/my_colours/active-tempus-theme.Xcolors"

View file

@ -0,0 +1,4 @@
! IMPORTANT do not edit manually!!!
! All themes (Xcolors, URxvt, bspwm, etc.) are changed by a single script.
! See my `~/bin/own_script_update_environment_theme`
#include "xcolors/tempus_classic.Xcolors"

View file

@ -0,0 +1,22 @@
! Theme: Tempus Autumn
! Description: Dark theme with a palette inspired by earthly colours (WCAG AA compliant)
! Author: Protesilaos Stavrou (https://protesilaos.com)
xterm*background: #302420
xterm*foreground: #a9a2a6
xterm*cursorColor: #a9a2a6
xterm*color0: #302420
xterm*color1: #f16c50
xterm*color2: #80a100
xterm*color3: #ac9440
xterm*color4: #7897c2
xterm*color5: #dd758e
xterm*color6: #52a485
xterm*color7: #a5918a
xterm*color8: #312e2a
xterm*color9: #e07a3d
xterm*color10: #43a770
xterm*color11: #ba9000
xterm*color12: #908ed4
xterm*color13: #c57bc4
xterm*color14: #2aa4ad
xterm*color15: #a9a2a6

View file

@ -0,0 +1,22 @@
! Theme: Tempus Classic
! Description: Dark theme with warm hues (WCAG AA compliant)
! Author: Protesilaos Stavrou (https://protesilaos.com)
xterm*background: #232323
xterm*foreground: #aeadaf
xterm*cursorColor: #aeadaf
xterm*color0: #232323
xterm*color1: #d2813d
xterm*color2: #8c9e3d
xterm*color3: #b1942b
xterm*color4: #6e9cb0
xterm*color5: #b58d88
xterm*color6: #6da280
xterm*color7: #949d9f
xterm*color8: #312e30
xterm*color9: #d0913d
xterm*color10: #96a42d
xterm*color11: #a8a030
xterm*color12: #8e9cc0
xterm*color13: #d58888
xterm*color14: #7aa880
xterm*color15: #aeadaf

View file

@ -0,0 +1,22 @@
! Theme: Tempus Dawn
! Description: Light theme with a soft, slightly desaturated palette (WCAG AA compliant)
! Author: Protesilaos Stavrou (https://protesilaos.com)
xterm*background: #f3f4f6
xterm*foreground: #525470
xterm*cursorColor: #525470
xterm*color0: #525470
xterm*color1: #9b3132
xterm*color2: #306130
xterm*color3: #73500a
xterm*color4: #4c547e
xterm*color5: #883c64
xterm*color6: #186060
xterm*color7: #e6e7ea
xterm*color8: #705e4d
xterm*color9: #9b474d
xterm*color10: #4e6938
xterm*color11: #8e5319
xterm*color12: #5c5d8c
xterm*color13: #a24055
xterm*color14: #2d6978
xterm*color15: #f3f4f6

View file

@ -0,0 +1,22 @@
! Theme: Tempus Day
! Description: Light theme with warm colours (WCAG AA compliant)
! Author: Protesilaos Stavrou (https://protesilaos.com)
xterm*background: #f8f2e5
xterm*foreground: #464340
xterm*cursorColor: #464340
xterm*color0: #464340
xterm*color1: #c81000
xterm*color2: #107410
xterm*color3: #806000
xterm*color4: #385dc4
xterm*color5: #b63052
xterm*color6: #007070
xterm*color7: #eae9dd
xterm*color8: #68607d
xterm*color9: #b94000
xterm*color10: #4a7240
xterm*color11: #706a00
xterm*color12: #0d66c9
xterm*color13: #8055aa
xterm*color14: #337087
xterm*color15: #f8f2e5

View file

@ -0,0 +1,22 @@
! Theme: Tempus Dusk
! Description: Dark theme with a deep blue-ish, slightly desaturated palette (WCAG AA compliant)
! Author: Protesilaos Stavrou (https://protesilaos.com)
xterm*background: #1f252d
xterm*foreground: #a2a8ba
xterm*cursorColor: #a2a8ba
xterm*color0: #1f252d
xterm*color1: #cb8d56
xterm*color2: #8ba089
xterm*color3: #a79c46
xterm*color4: #8c9abe
xterm*color5: #b190af
xterm*color6: #8e9aba
xterm*color7: #a29899
xterm*color8: #2c3150
xterm*color9: #d39d74
xterm*color10: #80b48f
xterm*color11: #bda75a
xterm*color12: #9ca5de
xterm*color13: #c69ac6
xterm*color14: #8caeb6
xterm*color15: #a2a8ba

View file

@ -0,0 +1,22 @@
! Theme: Tempus Fugit
! Description: Light, pleasant theme optimised for long writing/coding sessions (WCAG AA compliant)
! Author: Protesilaos Stavrou (https://protesilaos.com)
xterm*background: #fff5f3
xterm*foreground: #4d595f
xterm*cursorColor: #4d595f
xterm*color0: #4d595f
xterm*color1: #c61a14
xterm*color2: #357200
xterm*color3: #825e00
xterm*color4: #1666b0
xterm*color5: #a83884
xterm*color6: #007072
xterm*color7: #f2ebe9
xterm*color8: #7b6471
xterm*color9: #bd401a
xterm*color10: #447720
xterm*color11: #985d00
xterm*color12: #485ddf
xterm*color13: #a438c0
xterm*color14: #00786a
xterm*color15: #fff5f3

View file

@ -0,0 +1,22 @@
! Theme: Tempus Future
! Description: Dark theme with colours inspired by concept art of outer space (WCAG AAA compliant)
! Author: Protesilaos Stavrou (https://protesilaos.com)
xterm*background: #090a18
xterm*foreground: #b4abac
xterm*cursorColor: #b4abac
xterm*color0: #090a18
xterm*color1: #ff778a
xterm*color2: #6ab539
xterm*color3: #bfa01a
xterm*color4: #4aaed3
xterm*color5: #e58a82
xterm*color6: #29b3bb
xterm*color7: #a59ebd
xterm*color8: #260e22
xterm*color9: #f78e2f
xterm*color10: #60ba80
xterm*color11: #de9b1d
xterm*color12: #8ba7ea
xterm*color13: #e08bd6
xterm*color14: #2cbab6
xterm*color15: #b4abac

View file

@ -0,0 +1,22 @@
! Theme: Tempus Night
! Description: High contrast dark theme with bright colours (WCAG AAA compliant)
! Author: Protesilaos Stavrou (https://protesilaos.com)
xterm*background: #1a1a1a
xterm*foreground: #e0e0e0
xterm*cursorColor: #e0e0e0
xterm*color0: #1a1a1a
xterm*color1: #fb7e8e
xterm*color2: #52ba40
xterm*color3: #b0a800
xterm*color4: #5aaaf2
xterm*color5: #ee80c0
xterm*color6: #1db5c3
xterm*color7: #c4bdaf
xterm*color8: #18143d
xterm*color9: #f69d6a
xterm*color10: #88c400
xterm*color11: #d7ae00
xterm*color12: #8cb4f0
xterm*color13: #de99f0
xterm*color14: #00ca9a
xterm*color15: #e0e0e0

View file

@ -0,0 +1,22 @@
! Theme: Tempus Past
! Description: Light theme inspired by old vaporwave concept art (WCAG AA compliant)
! Author: Protesilaos Stavrou (https://protesilaos.com)
xterm*background: #f3f2f4
xterm*foreground: #53545b
xterm*cursorColor: #53545b
xterm*color0: #53545b
xterm*color1: #c00c50
xterm*color2: #0a7040
xterm*color3: #a6403a
xterm*color4: #1763aa
xterm*color5: #b02874
xterm*color6: #096a83
xterm*color7: #ece6de
xterm*color8: #80565d
xterm*color9: #bd3636
xterm*color10: #407343
xterm*color11: #9d524a
xterm*color12: #5a5ebb
xterm*color13: #b225ab
xterm*color14: #07737a
xterm*color15: #f3f2f4

View file

@ -0,0 +1,22 @@
! Theme: Tempus Rift
! Description: Dark theme with a subdued palette on the green side of the spectrum (WCAG AA compliant)
! Author: Protesilaos Stavrou (https://protesilaos.com)
xterm*background: #162c22
xterm*foreground: #bbbcbc
xterm*cursorColor: #bbbcbc
xterm*color0: #162c22
xterm*color1: #c19904
xterm*color2: #34b534
xterm*color3: #7fad00
xterm*color4: #30aeb0
xterm*color5: #c8954c
xterm*color6: #5fad8f
xterm*color7: #ab9aa9
xterm*color8: #283431
xterm*color9: #d2a634
xterm*color10: #6ac134
xterm*color11: #82bd00
xterm*color12: #56bdad
xterm*color13: #cca0ba
xterm*color14: #10c480
xterm*color15: #bbbcbc

View file

@ -0,0 +1,22 @@
! Theme: Tempus Spring
! Description: Dark theme with a palette inspired by early spring colours (WCAG AA compliant)
! Author: Protesilaos Stavrou (https://protesilaos.com)
xterm*background: #283a37
xterm*foreground: #b5b8b7
xterm*cursorColor: #b5b8b7
xterm*color0: #283a37
xterm*color1: #ff855a
xterm*color2: #5cbc4d
xterm*color3: #a6af1a
xterm*color4: #39b6ce
xterm*color5: #e69092
xterm*color6: #36bd84
xterm*color7: #96aca7
xterm*color8: #2a423d
xterm*color9: #e19900
xterm*color10: #6dbb0d
xterm*color11: #c5a443
xterm*color12: #70ade2
xterm*color13: #d091db
xterm*color14: #3cbaa6
xterm*color15: #b5b8b7

View file

@ -0,0 +1,22 @@
! Theme: Tempus Summer
! Description: Dark theme with colours inspired by summer evenings by the sea (WCAG AA compliant)
! Author: Protesilaos Stavrou (https://protesilaos.com)
xterm*background: #202c3d
xterm*foreground: #a0abae
xterm*cursorColor: #a0abae
xterm*color0: #202c3d
xterm*color1: #f76f6e
xterm*color2: #4eac6d
xterm*color3: #af9a0a
xterm*color4: #609fda
xterm*color5: #cc84ad
xterm*color6: #3dab95
xterm*color7: #919ab9
xterm*color8: #352f49
xterm*color9: #eb7b4d
xterm*color10: #57ad47
xterm*color11: #bd951a
xterm*color12: #8196e8
xterm*color13: #c97ed7
xterm*color14: #2aa9b6
xterm*color15: #a0abae

View file

@ -0,0 +1,22 @@
! Theme: Tempus Tempest
! Description: A green-scale, subtle theme for late night hackers (WCAG AAA compliant)
! Author: Protesilaos Stavrou (https://protesilaos.com)
xterm*background: #282b2b
xterm*foreground: #b6e0ca
xterm*cursorColor: #b6e0ca
xterm*color0: #282b2b
xterm*color1: #c6c80a
xterm*color2: #7ad67a
xterm*color3: #bfc94a
xterm*color4: #60d4cd
xterm*color5: #c0c4aa
xterm*color6: #8ad0b0
xterm*color7: #b0c8ca
xterm*color8: #303434
xterm*color9: #d1d933
xterm*color10: #99e299
xterm*color11: #bbde4f
xterm*color12: #74e4cd
xterm*color13: #d2d4aa
xterm*color14: #9bdfc4
xterm*color15: #b6e0ca

View file

@ -0,0 +1,22 @@
! Theme: Tempus Totus
! Description: Light theme for prose or for coding in an open space (WCAG AAA compliant)
! Author: Protesilaos Stavrou (https://protesilaos.com)
xterm*background: #ffffff
xterm*foreground: #4a484d
xterm*cursorColor: #4a484d
xterm*color0: #4a484d
xterm*color1: #a01c10
xterm*color2: #0d5f0f
xterm*color3: #774600
xterm*color4: #1c4f9f
xterm*color5: #912663
xterm*color6: #185870
xterm*color7: #f3f1f3
xterm*color8: #5f4d4f
xterm*color9: #9a2140
xterm*color10: #2a5d08
xterm*color11: #8b3800
xterm*color12: #5440a7
xterm*color13: #9d105b
xterm*color14: #005e3b
xterm*color15: #ffffff

View file

@ -0,0 +1,22 @@
! Theme: Tempus Warp
! Description: Dark theme with a vibrant palette (WCAG AA compliant)
! Author: Protesilaos Stavrou (https://protesilaos.com)
xterm*background: #001514
xterm*foreground: #a29fa0
xterm*cursorColor: #a29fa0
xterm*color0: #001514
xterm*color1: #fa3333
xterm*color2: #139913
xterm*color3: #9e8100
xterm*color4: #557feb
xterm*color5: #d54cbf
xterm*color6: #009580
xterm*color7: #928080
xterm*color8: #241828
xterm*color9: #F0681A
xterm*color10: #3aa73a
xterm*color11: #ba8a00
xterm*color12: #8887f0
xterm*color13: #d85cf2
xterm*color14: #1da1af
xterm*color15: #a29fa0

View file

@ -0,0 +1,22 @@
! Theme: Tempus Winter
! Description: Dark theme with a palette inspired by winter nights at the city (WCAG AA compliant)
! Author: Protesilaos Stavrou (https://protesilaos.com)
xterm*background: #202427
xterm*foreground: #8da3b8
xterm*cursorColor: #8da3b8
xterm*color0: #202427
xterm*color1: #eb6a58
xterm*color2: #49a61d
xterm*color3: #959721
xterm*color4: #798fd7
xterm*color5: #cd7b7e
xterm*color6: #4fa090
xterm*color7: #909294
xterm*color8: #292b35
xterm*color9: #db7824
xterm*color10: #00a854
xterm*color11: #ad8e4b
xterm*color12: #309dc1
xterm*color13: #c874c2
xterm*color14: #1ba2a0
xterm*color15: #8da3b8