diff --git a/bin/,man b/bin/,man index 2e44a32..5a8d870 100755 --- a/bin/,man +++ b/bin/,man @@ -19,15 +19,9 @@ Blue=4 Violet=13 Magenta=5 -if [ "$BACKGROUND" = "light" ]; then - standout=$( printf '%s\n' "setaf $Base3" "setab $Cyan" | tput -S) - bold=$( printf '%s\n' "setaf $Blue" | tput -S) - underline=$(printf '%s\n' "setaf $Base02" "smul" | tput -S) -else - standout=$( printf '%s\n' "setaf $Base03" "setab $Cyan" | tput -S) - bold=$( printf '%s\n' "setaf $Yellow" | tput -S) - underline=$(printf '%s\n' "setaf $Base3" "smul" | tput -S) -fi +standout=$( printf '%s\n' "setaf $Base03" "setab $Cyan" | tput -S) +bold=$( printf '%s\n' "setaf $Yellow" | tput -S) +underline=$(printf '%s\n' "setaf $Base3" "smul" | tput -S) exec env \ LESS_TERMCAP_so="$standout" \ diff --git a/bin/,solarize b/bin/,solarize deleted file mode 100755 index 2961c1a..0000000 --- a/bin/,solarize +++ /dev/null @@ -1,134 +0,0 @@ -#!/bin/sh -# Solarize the terminal - -# Useful terminal control sequences: -# -# Sequence Abbrev Description -# ----- ----- ----------------------------- -# ESC P DCS Device Control String -# ESC [ CSI Control Sequence Introducer -# ESC \ ST String Terminator -# ESC ] OSC Operating System Control -# -# -# More info at: -# * https://www.xfree86.org/4.8.0/ctlseqs.html -# * https://vt100.net/ -# * https://iterm2.com/utilities/imgcat - -# In tmux, OSC sequences can be forwarded to the underlying terminal by: -# * Wrapping the sequence with `DCS tmux; ST` -# * Replacing ESC in with ESC ESC. -# Either ST or BEL (\a) can be used to end an OSC sequence. However, tmux -# requires ST to end its wrapping DCS. -if [ -n "$TMUX" ]; then - OSC=$(printf '\ePtmux;\e\e]') - ST=$(printf '\a\e\\') -else - OSC=$(printf '\e]') - ST=$(printf '\a') -fi - -# Color definitions (from http://ethanschoonover.com/solarized) - Base03="002B36" Base02="073642" Base01="586E75" Base00="657B83" - Base0="839496" Base1="93A1A1" Base2="EEE8D5" Base3="FDF6E3" - Red="DC322F" Orange="CB4B16" Yellow="B58900" Green="859900" - Cyan="2AA198" Blue="268BD2" Violet="6C71C4" Magenta="D33682" - -# Documentation for iTerm2 at -# https://iterm2.com/documentation-escape-codes.html -# under the heading "Change the color palette". -set_iterm2_colors() { # 1: foreground, 2: background, 3: cursor - while read -r key rgb; do - printf "%s1337;SetColors=%s=%s%s" "$OSC" "$key" "$rgb" "$ST" - done < 4;c;spec - # c -> index of the ANSI color to change [0..15] - # spec -> RGB value of color as rgb:RR/GG/BB - awk -v osc="$OSC" -v st="$ST" -v ORS="" \ - '{print osc "4;" $1 ";rgb:" substr($2,1,2) "/" substr($2,3,2) "/" substr($2,5,2) st}' \ - < foreground (10), background (11), or cursor (12) - # Pt -> RGB value of color as rgb:RR/GG/BB - awk -v osc="$OSC" -v st="$ST" -v ORS="" \ - '{print osc $1 ";rgb:" substr($2,1,2) "/" substr($2,3,2) "/" substr($2,5,2) st}' \ - < -# 30 black base02 -# 01;30 bright black base03 bg of SolDark -# 31 red red docs & mm src -# 01;31 bright red orange EXEC -# 32 green green editable text -# 01;32 bright green base01 unimportant text -# 33 yellow yellow unclear in light bg multimedia -# 01;33 bright yellow base00 fg of SolLight unimportant non-text -# 34 blue blue unclear in dark bg user customized -# 01;34 bright blue base0 fg in SolDark unimportant text -# 35 magenta magenta LINK -# 01;35 bright magenta violet archive/compressed -# 36 cyan cyan DIR -# 01;36 bright cyan base1 unimportant non-text -# 37 white base2 -# 01;37 bright white base3 bg in SolLight -# 05;37;41 unclear in Putty dark - - -### By file type - -# global default -NORMAL 00 -# normal file -FILE 00 -# directory -DIR 34 -# 777 directory -OTHER_WRITABLE 34;40 -# symbolic link -LINK 35 - -# pipe, socket, block device, character device (blue bg) -FIFO 30;44 -SOCK 35;44 -DOOR 35;44 # Solaris 2.5 and later -BLK 33;44 -CHR 37;44 - - -############################################################################# -### By file attributes - -# Orphaned symlinks (blinking white on red) -# Blink may or may not work (works on iTerm dark or light, and Putty dark) -ORPHAN 05;37;41 -# ... and the files that orphaned symlinks point to (blinking white on red) -MISSING 05;37;41 - -# files with execute permission -EXEC 01;31 # Unix -.cmd 01;31 # Win -.exe 01;31 # Win -.com 01;31 # Win -.bat 01;31 # Win -.reg 01;31 # Win -.app 01;31 # OSX - -############################################################################# -### By extension - -# List any file extensions like '.gz' or '.tar' that you would like ls -# to colorize below. Put the extension, a space, and the color init string. -# (and any comments you want to add after a '#') - -### Text formats - -# Text that we can edit with a regular editor -.txt 32 -.org 32 -.md 32 -.mkd 32 - -# Source text -.h 32 -.c 32 -.C 32 -.cc 32 -.cpp 32 -.cxx 32 -.objc 32 -.sh 32 -.csh 32 -.zsh 32 -.el 32 -.vim 32 -.java 32 -.pl 32 -.pm 32 -.py 32 -.rb 32 -.hs 32 -.php 32 -.htm 32 -.html 32 -.shtml 32 -.erb 32 -.haml 32 -.xml 32 -.rdf 32 -.css 32 -.sass 32 -.scss 32 -.less 32 -.js 32 -.coffee 32 -.man 32 -.0 32 -.1 32 -.2 32 -.3 32 -.4 32 -.5 32 -.6 32 -.7 32 -.8 32 -.9 32 -.l 32 -.n 32 -.p 32 -.pod 32 -.tex 32 -.go 32 - -### Multimedia formats - -# Image -.bmp 33 -.cgm 33 -.dl 33 -.dvi 33 -.emf 33 -.eps 33 -.gif 33 -.jpeg 33 -.jpg 33 -.JPG 33 -.mng 33 -.pbm 33 -.pcx 33 -.pdf 33 -.pgm 33 -.png 33 -.PNG 33 -.ppm 33 -.pps 33 -.ppsx 33 -.ps 33 -.svg 33 -.svgz 33 -.tga 33 -.tif 33 -.tiff 33 -.xbm 33 -.xcf 33 -.xpm 33 -.xwd 33 -.xwd 33 -.yuv 33 - -# Audio -.aac 33 -.au 33 -.flac 33 -.m4a 33 -.mid 33 -.midi 33 -.mka 33 -.mp3 33 -.mpa 33 -.mpeg 33 -.mpg 33 -.ogg 33 -.ra 33 -.wav 33 - -# Video -.anx 33 -.asf 33 -.avi 33 -.axv 33 -.flc 33 -.fli 33 -.flv 33 -.gl 33 -.m2v 33 -.m4v 33 -.mkv 33 -.mov 33 -.MOV 33 -.mp4 33 -.mp4v 33 -.mpeg 33 -.mpg 33 -.nuv 33 -.ogm 33 -.ogv 33 -.ogx 33 -.qt 33 -.rm 33 -.rmvb 33 -.swf 33 -.vob 33 -.webm 33 -.wmv 33 - -### Misc - -# Binary document formats and multimedia source -.doc 31 -.docx 31 -.rtf 31 -.dot 31 -.dotx 31 -.xls 31 -.xlsx 31 -.ppt 31 -.pptx 31 -.fla 31 -.psd 31 - -# Archives, compressed -.7z 1;35 -.apk 1;35 -.arj 1;35 -.bin 1;35 -.bz 1;35 -.bz2 1;35 -.cab 1;35 # Win -.deb 1;35 -.dmg 1;35 # OSX -.gem 1;35 -.gz 1;35 -.iso 1;35 -.jar 1;35 -.msi 1;35 # Win -.rar 1;35 -.rpm 1;35 -.tar 1;35 -.tbz 1;35 -.tbz2 1;35 -.tgz 1;35 -.tx 1;35 -.war 1;35 -.xpi 1;35 -.xz 1;35 -.z 1;35 -.Z 1;35 -.zip 1;35 - -# For testing -.ANSI-30-black 30 -.ANSI-01;30-brblack 01;30 -.ANSI-31-red 31 -.ANSI-01;31-brred 01;31 -.ANSI-32-green 32 -.ANSI-01;32-brgreen 01;32 -.ANSI-33-yellow 33 -.ANSI-01;33-bryellow 01;33 -.ANSI-34-blue 34 -.ANSI-01;34-brblue 01;34 -.ANSI-35-magenta 35 -.ANSI-01;35-brmagenta 01;35 -.ANSI-36-cyan 36 -.ANSI-01;36-brcyan 01;36 -.ANSI-37-white 37 -.ANSI-01;37-brwhite 01;37 - -############################################################################# -# Your customizations - -# Unimportant text files -# For universal scheme, use brightgreen 01;32 -# For optimal on light bg (but too prominent on dark bg), use white 01;34 -.log 01;32 -*~ 01;32 -*# 01;32 -#.log 01;34 -#*~ 01;34 -#*# 01;34 - -# Unimportant non-text files -# For universal scheme, use brightcyan 01;36 -# For optimal on dark bg (but too prominent on light bg), change to 01;33 -#.bak 01;36 -#.BAK 01;36 -#.old 01;36 -#.OLD 01;36 -#.org_archive 01;36 -#.off 01;36 -#.OFF 01;36 -#.dist 01;36 -#.DIST 01;36 -#.orig 01;36 -#.ORIG 01;36 -#.swp 01;36 -#.swo 01;36 -#*,v 01;36 -.bak 01;33 -.BAK 01;33 -.old 01;33 -.OLD 01;33 -.org_archive 01;33 -.off 01;33 -.OFF 01;33 -.dist 01;33 -.DIST 01;33 -.orig 01;33 -.ORIG 01;33 -.swp 01;33 -.swo 01;33 -*,v 01;33 - -# The brightmagenta (Solarized: purple) color is free for you to use for your -# custom file type -.gpg 34 -.gpg 34 -.pgp 34 -.asc 34 -.3des 34 -.aes 34 -.enc 34 -.sqlite 34 diff --git a/dircolors/solarized-light b/dircolors/solarized-light deleted file mode 100644 index fbf294c..0000000 --- a/dircolors/solarized-light +++ /dev/null @@ -1,458 +0,0 @@ -# Exact Solarized Light color theme for the color GNU ls utility. -# Designed for dircolors (GNU coreutils) 5.97 -# -# This simple theme was simultaneously designed for these terminal color schemes: -# - Solarized dark -# - Solarized light (best) -# - default dark -# - default light -# with a slight optimization for Solarized Light. -# -# How the colors were selected: -# - Terminal emulators often have an option typically enabled by default that makes -# bold a different color. It is important to leave this option enabled so that -# you can access the entire 16-color Solarized palette, and not just 8 colors. -# - We favor universality over a greater number of colors. So we limit the number -# of colors so that this theme will work out of the box in all terminals, -# Solarized or not, dark or light. -# - We choose to have the following category of files: -# NORMAL & FILE, DIR, LINK, EXEC and -# editable text including source, unimportant text, binary docs & multimedia source -# files, viewable multimedia, archived/compressed, and unimportant non-text -# - For uniqueness, we stay away from the Solarized foreground colors are -- either -# base00 (brightyellow) or base0 (brighblue). However, they can be used if -# you know what the bg/fg colors of your terminal are, in order to optimize the display. -# - 3 different options are provided: universal, solarized dark, and solarized light. -# The only difference between the universal scheme and one that's optimized for -# dark/light is the color of "unimportant" files, which should blend more with the -# background -# - We note that blue is the hardest color to see on dark bg and yellow is the hardest -# color to see on light bg (with blue being particularly bad). So we choose yellow -# for multimedia files which are usually accessed in a GUI folder browser anyway. -# And blue is kept for custom use of this scheme's user. -# - See table below to see the assignments. - - -# Insatllation instructions: -# This file goes in the /etc directory, and must be world readable. -# You can copy this file to .dir_colors in your $HOME directory to override -# the system defaults. - -# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not -# pipes. 'all' adds color characters to all output. 'none' shuts colorization -# off. -COLOR tty - -# Below, there should be one TERM entry for each termtype that is colorizable -TERM ansi -TERM color_xterm -TERM color-xterm -TERM con132x25 -TERM con132x30 -TERM con132x43 -TERM con132x60 -TERM con80x25 -TERM con80x28 -TERM con80x30 -TERM con80x43 -TERM con80x50 -TERM con80x60 -TERM cons25 -TERM console -TERM cygwin -TERM dtterm -TERM dvtm -TERM dvtm-256color -TERM Eterm -TERM eterm-color -TERM fbterm -TERM gnome -TERM gnome-256color -TERM jfbterm -TERM konsole -TERM konsole-256color -TERM kterm -TERM linux -TERM linux-c -TERM mach-color -TERM mlterm -TERM nxterm -TERM putty -TERM putty-256color -TERM rxvt -TERM rxvt-256color -TERM rxvt-cygwin -TERM rxvt-cygwin-native -TERM rxvt-unicode -TERM rxvt-unicode256 -TERM rxvt-unicode-256color -TERM screen -TERM screen-16color -TERM screen-16color-bce -TERM screen-16color-s -TERM screen-16color-bce-s -TERM screen-256color -TERM screen-256color-bce -TERM screen-256color-s -TERM screen-256color-bce-s -TERM screen-256color-italic -TERM screen-bce -TERM screen-w -TERM screen.linux -TERM screen.xterm-new -TERM st -TERM st-meta -TERM st-256color -TERM st-meta-256color -TERM vt100 -TERM xterm -TERM xterm-new -TERM xterm-16color -TERM xterm-256color -TERM xterm-256color-italic -TERM xterm-88color -TERM xterm-color -TERM xterm-debian -TERM xterm-termite - -# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output) -EIGHTBIT 1 - -############################################################################# -# Below are the color init strings for the basic file types. A color init -# string consists of one or more of the following numeric codes: -# -# Attribute codes: -# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed -# Text color codes: -# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white -# Background color codes: -# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white -# -# NOTES: -# - See http://www.oreilly.com/catalog/wdnut/excerpt/color_names.html -# - Color combinations -# ANSI Color code Solarized Notes Universal SolDark SolLight -# ~~~~~~~~~~~~~~~ ~~~~~~~~~ ~~~~~ ~~~~~~~~~ ~~~~~~~ ~~~~~~~~ -# 00 none NORMAL, FILE -# 30 black base02 -# 01;30 bright black base03 bg of SolDark -# 31 red red docs & mm src -# 01;31 bright red orange EXEC -# 32 green green editable text -# 01;32 bright green base01 unimportant text -# 33 yellow yellow unclear in light bg multimedia -# 01;33 bright yellow base00 fg of SolLight unimportant non-text -# 34 blue blue unclear in dark bg user customized -# 01;34 bright blue base0 fg in SolDark unimportant text -# 35 magenta magenta LINK -# 01;35 bright magenta violet archive/compressed -# 36 cyan cyan DIR -# 01;36 bright cyan base1 unimportant non-text -# 37 white base2 -# 01;37 bright white base3 bg in SolLight -# 05;37;41 unclear in Putty dark - - -### By file type - -# global default -NORMAL 00 -# normal file -FILE 00 -# directory -DIR 36 -# symbolic link -LINK 35 - -# pipe, socket, block device, character device (blue bg) -FIFO 30;44 -SOCK 35;44 -DOOR 35;44 # Solaris 2.5 and later -BLK 33;44 -CHR 37;44 - - -############################################################################# -### By file attributes - -# Orphaned symlinks (blinking white on red) -# Blink may or may not work (works on iTerm dark or light, and Putty dark) -ORPHAN 05;37;41 -# ... and the files that orphaned symlinks point to (blinking white on red) -MISSING 05;37;41 - -# files with execute permission -EXEC 01;31 # Unix -.cmd 01;31 # Win -.exe 01;31 # Win -.com 01;31 # Win -.bat 01;31 # Win -.reg 01;31 # Win -.app 01;31 # OSX - -############################################################################# -### By extension - -# List any file extensions like '.gz' or '.tar' that you would like ls -# to colorize below. Put the extension, a space, and the color init string. -# (and any comments you want to add after a '#') - -### Text formats - -# Text that we can edit with a regular editor -.txt 32 -.org 32 -.md 32 -.mkd 32 - -# Source text -.h 32 -.c 32 -.C 32 -.cc 32 -.cpp 32 -.cxx 32 -.objc 32 -.sh 32 -.csh 32 -.zsh 32 -.el 32 -.vim 32 -.java 32 -.pl 32 -.pm 32 -.py 32 -.rb 32 -.hs 32 -.php 32 -.htm 32 -.html 32 -.shtml 32 -.erb 32 -.haml 32 -.xml 32 -.rdf 32 -.css 32 -.sass 32 -.scss 32 -.less 32 -.js 32 -.coffee 32 -.man 32 -.0 32 -.1 32 -.2 32 -.3 32 -.4 32 -.5 32 -.6 32 -.7 32 -.8 32 -.9 32 -.l 32 -.n 32 -.p 32 -.pod 32 -.tex 32 -.go 32 - -### Multimedia formats - -# Image -.bmp 33 -.cgm 33 -.dl 33 -.dvi 33 -.emf 33 -.eps 33 -.gif 33 -.jpeg 33 -.jpg 33 -.JPG 33 -.mng 33 -.pbm 33 -.pcx 33 -.pdf 33 -.pgm 33 -.png 33 -.PNG 33 -.ppm 33 -.pps 33 -.ppsx 33 -.ps 33 -.svg 33 -.svgz 33 -.tga 33 -.tif 33 -.tiff 33 -.xbm 33 -.xcf 33 -.xpm 33 -.xwd 33 -.xwd 33 -.yuv 33 - -# Audio -.aac 33 -.au 33 -.flac 33 -.m4a 33 -.mid 33 -.midi 33 -.mka 33 -.mp3 33 -.mpa 33 -.mpeg 33 -.mpg 33 -.ogg 33 -.ra 33 -.wav 33 - -# Video -.anx 33 -.asf 33 -.avi 33 -.axv 33 -.flc 33 -.fli 33 -.flv 33 -.gl 33 -.m2v 33 -.m4v 33 -.mkv 33 -.mov 33 -.MOV 33 -.mp4 33 -.mp4v 33 -.mpeg 33 -.mpg 33 -.nuv 33 -.ogm 33 -.ogv 33 -.ogx 33 -.qt 33 -.rm 33 -.rmvb 33 -.swf 33 -.vob 33 -.webm 33 -.wmv 33 - -### Misc - -# Binary document formats and multimedia source -.doc 31 -.docx 31 -.rtf 31 -.dot 31 -.dotx 31 -.xls 31 -.xlsx 31 -.ppt 31 -.pptx 31 -.fla 31 -.psd 31 - -# Archives, compressed -.7z 1;35 -.apk 1;35 -.arj 1;35 -.bin 1;35 -.bz 1;35 -.bz2 1;35 -.cab 1;35 # Win -.deb 1;35 -.dmg 1;35 # OSX -.gem 1;35 -.gz 1;35 -.iso 1;35 -.jar 1;35 -.msi 1;35 # Win -.rar 1;35 -.rpm 1;35 -.tar 1;35 -.tbz 1;35 -.tbz2 1;35 -.tgz 1;35 -.tx 1;35 -.war 1;35 -.xpi 1;35 -.xz 1;35 -.z 1;35 -.Z 1;35 -.zip 1;35 - -# For testing -.ANSI-30-black 30 -.ANSI-01;30-brblack 01;30 -.ANSI-31-red 31 -.ANSI-01;31-brred 01;31 -.ANSI-32-green 32 -.ANSI-01;32-brgreen 01;32 -.ANSI-33-yellow 33 -.ANSI-01;33-bryellow 01;33 -.ANSI-34-blue 34 -.ANSI-01;34-brblue 01;34 -.ANSI-35-magenta 35 -.ANSI-01;35-brmagenta 01;35 -.ANSI-36-cyan 36 -.ANSI-01;36-brcyan 01;36 -.ANSI-37-white 37 -.ANSI-01;37-brwhite 01;37 - -############################################################################# -# Your customizations - -# Unimportant text files -# For universal scheme, use brightgreen 01;32 -# For optimal on light bg (but too prominent on dark bg), use white 01;34 -#.log 01;32 -#*~ 01;32 -#*# 01;32 -.log 01;34 -*~ 01;34 -*# 01;34 - -# Unimportant non-text files -# For universal scheme, use brightcyan 01;36 -# For optimal on dark bg (but too prominent on light bg), change to 01;33 -.bak 01;36 -.BAK 01;36 -.old 01;36 -.OLD 01;36 -.org_archive 01;36 -.off 01;36 -.OFF 01;36 -.dist 01;36 -.DIST 01;36 -.orig 01;36 -.ORIG 01;36 -.swp 01;36 -.swo 01;36 -*,v 01;36 -#.bak 01;33 -#.BAK 01;33 -#.old 01;33 -#.OLD 01;33 -#.org_archive 01;33 -#.off 01;33 -#.OFF 01;33 -#.dist 01;33 -#.DIST 01;33 -#.orig 01;33 -#.ORIG 01;33 -#.swp 01;33 -#.swo 01;33 -#*,v 01;33 - -# The brightmagenta (Solarized: purple) color is free for you to use for your -# custom file type -.gpg 34 -.gpg 34 -.pgp 34 -.asc 34 -.3des 34 -.aes 34 -.enc 34 -.sqlite 34 diff --git a/files/bashrc b/files/bashrc index bcafd19..a9f1d0f 100644 --- a/files/bashrc +++ b/files/bashrc @@ -11,7 +11,6 @@ export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}" export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}" -export BACKGROUND="${BACKGROUND:-dark}" export EDITOR="nvim" export INPUTRC="$XDG_CONFIG_HOME/readline/inputrc" export LANG="en_US.UTF-8" @@ -69,16 +68,6 @@ fi stty -ixon # disable ctrl-s and ctrl-q -change_bg() { - BACKGROUND="$1"; - command -v ,solarize &>/dev/null && ,solarize; - - local f="$HOME/.config/dircolors/solarized-$BACKGROUND" - [ -f "$f" ] && type dircolors &>/dev/null && eval "$(dircolors "$f")" -} -export change_bg -change_bg "$BACKGROUND" - ############################################################################## # Customize shell options & variables ############################################################################## @@ -104,8 +93,7 @@ PS1_PWD="\[$(tput setaf "$Cyan" )\]" # PWD color PS1_GIT="\[$(tput setaf "$Blue" )\]" # color for git branch PS1_VENV="\[$(tput setaf "$Violet" )\]" # color for python virtual env PS1_JOBS="\[$(tput setaf "$Magenta")\]" # color for background jobs -PS1_SEP_LIGHT="\[$(tput setaf "$Base1" )\]" -PS1_SEP_DARK="\[$(tput setaf "$Base01" )\]" +PS1_SEP_COLOR="\[$(tput setaf "$Base01" )\]" PS1_SEP=" > " # separator between prompt parts GIT_PS1_SHOWDIRTYSTATE=1 @@ -119,8 +107,7 @@ PS2="... " __ps1_set() { local exit=$? local prompt=">>>>>>>>>>" - local sep_color="$PS1_SEP_DARK" - [ "$BACKGROUND" = "light" ] && sep_color="$PS1_SEP_LIGHT" + local sep_color="$PS1_SEP_COLOR" local ps=() [ $exit -ne 0 ] && ps+=("$PS1_EXIT$exit") @@ -172,9 +159,6 @@ alias grep="grep --color=auto" alias egrep="egrep --color=auto" alias fgrep="fgrep --color=auto" -alias dark='change_bg dark' -alias light='change_bg light' - ############################################################################## # Run external customizations ############################################################################## diff --git a/files/init.vim b/files/init.vim index ac002ce..617f993 100644 --- a/files/init.vim +++ b/files/init.vim @@ -4,7 +4,6 @@ if $XDG_DATA_HOME == "" | let $XDG_DATA_HOME="~/.local/share" | endif if $LOCAL_CONFIG == "" | let $LOCAL_CONFIG="~/.local/etc" | endif " Options {{{ -let &background = $BACKGROUND ==? 'light' ? 'light' : 'dark' set backspace=indent,eol,start " sane backspace behavior set nobackup " don't keep backup file after overwriting a file set clipboard=unnamed " synchronize with system clipboard @@ -198,9 +197,6 @@ nnoremap l :call VimrcCycleNumbers() augroup vimrc " {{{ autocmd! - " Make sure the background is always transparent. - autocmd VimEnter,Syntax,ColorScheme * highlight Normal ctermbg=NONE - autocmd BufNewFile,BufRead bash_profile,bashrc,profile set filetype=sh autocmd BufNewFile,BufRead gitconfig set filetype=gitconfig autocmd BufNewFile,BufRead *.sx,*.s19 set filetype=srec diff --git a/files/tmux-colors.conf b/files/tmux-colors.conf deleted file mode 100644 index b69c2db..0000000 --- a/files/tmux-colors.conf +++ /dev/null @@ -1,60 +0,0 @@ -set -g status-left-length 32 -set -g status-right-length 48 -set -g status-justify left - -# Color definitions -# SOLARIZED TMUX -# --------- -------- -# Base03 colour8 -# Base02 colour0 -# Base01 colour10 -# Base00 colour11 -# Base0 colour12 -# Base1 colour14 -# Base2 colour7 -# Base3 colour15 -# Yellow colour3 -# Orange colour9 -# Red colour1 -# Magenta colour5 -# Violet colour13 -# Blue colour4 -# Cyan colour6 -# Green colour2 - -set -g status-left "\ -#[fg=colour3]#{session_name} \ -#{?client_prefix,#[fg=colour1],#[fg=colour10]}> \ -#[fg=colour2]#{window_index}.#{pane_index} \ -#{?client_prefix,#[fg=colour1],#[fg=colour10]}> \ -#[fg=colour6]#{pane_id}#{?pane_marked, #[fg=colour9]M,} \ -#{?client_prefix,#[fg=colour1],#[fg=colour10]}> " - -set -g status-right "\ -#[fg=colour6]#{pid} \ -#{?client_prefix,#[fg=colour1],#[fg=colour10]}< \ -#[fg=colour2]#{host_short} \ -#{?client_prefix,#[fg=colour1],#[fg=colour10]}< \ -#[fg=colour3]%b %d %H:%M" - -setw -g window-status-current-format "#{window_index}:#{window_name}#{window_flags} " -setw -g window-status-format "#{window_index}:#{window_name}#{window_flags} " - -%if #{==:#{BACKGROUND},dark} - set -g status-style bg=colour0 # ... on Base02 - setw -g window-status-style fg=colour12,bg=default # Base0 on Transparent - setw -g window-status-current-style fg=colour4,bg=default # Blue on Transparent - set -g pane-border-style fg=colour0 # Base02 - set -g pane-active-border-style fg=colour14 # Base1 - set -g message-style fg=colour0,bg=colour14 - set -g message-command-style fg=colour0,bg=colour14 -%elif #{==:#{BACKGROUND},light} - set -g status-style fg=colour13,bg=colour7 # Violet on Base2 - setw -g window-status-style fg=colour11,bg=default # Base00 on Transparent - setw -g window-status-current-style fg=colour4,bg=default # Blue on Transparent - set -g pane-border-style fg=colour7 # Base2 - set -g pane-active-border-style fg=colour10 # Base01 - set -g message-style fg=colour7,bg=colour10 - set -g message-command-style fg=colour7,bg=colour10 -%endif - diff --git a/files/tmux.conf b/files/tmux.conf index 96f6428..a62b023 100644 --- a/files/tmux.conf +++ b/files/tmux.conf @@ -42,11 +42,6 @@ setw -g pane-base-index 1 # start pane numbering from 1 # cause shells to start with level 1 again within the session. set-environment -gu SHLVL -# -# Style (status list, colors, ...) -# -source-file -q "$XDG_CONFIG_HOME/tmux/tmux-colors.conf" - # Fix for clipboard in vim running inside tmux: # See http://www.economyofeffort.com/2013/07/29/reattach-to-user-namespace-the-fix-for-your-tmux-in-os-x-woes/ # See http://stackoverflow.com/a/40154047 @@ -54,3 +49,56 @@ source-file -q "$XDG_CONFIG_HOME/tmux/tmux-colors.conf" if-shell 'test "$(uname)" = "Darwin"' \ 'set -g default-command "reattach-to-user-namespace -l $SHELL"' +# +# Style (status list, colors, ...) +# +set -g status-left-length 32 +set -g status-right-length 48 +set -g status-justify left + +# Color definitions +# SOLARIZED TMUX +# --------- -------- +# Base03 colour8 +# Base02 colour0 +# Base01 colour10 +# Base00 colour11 +# Base0 colour12 +# Base1 colour14 +# Base2 colour7 +# Base3 colour15 +# Yellow colour3 +# Orange colour9 +# Red colour1 +# Magenta colour5 +# Violet colour13 +# Blue colour4 +# Cyan colour6 +# Green colour2 + +set -g status-left "\ +#[fg=colour3]#{session_name} \ +#{?client_prefix,#[fg=colour1],#[fg=colour10]}> \ +#[fg=colour2]#{window_index}.#{pane_index} \ +#{?client_prefix,#[fg=colour1],#[fg=colour10]}> \ +#[fg=colour6]#{pane_id}#{?pane_marked, #[fg=colour9]M,} \ +#{?client_prefix,#[fg=colour1],#[fg=colour10]}> " + +set -g status-right "\ +#[fg=colour6]#{pid} \ +#{?client_prefix,#[fg=colour1],#[fg=colour10]}< \ +#[fg=colour2]#{host_short} \ +#{?client_prefix,#[fg=colour1],#[fg=colour10]}< \ +#[fg=colour3]%b %d %H:%M" + +setw -g window-status-current-format "#{window_index}:#{window_name}#{window_flags} " +setw -g window-status-format "#{window_index}:#{window_name}#{window_flags} " + +set -g status-style bg=colour0 # ... on Base02 +setw -g window-status-style fg=colour12,bg=default # Base0 on Transparent +setw -g window-status-current-style fg=colour4,bg=default # Blue on Transparent +set -g pane-border-style fg=colour0 # Base02 +set -g pane-active-border-style fg=colour14 # Base1 +set -g message-style fg=colour0,bg=colour14 +set -g message-command-style fg=colour0,bg=colour14 +