profile: factor out color definitions again
With the color definitions being in profile, non-login shells don't get the definitions. So out they go back to their own file.
This commit is contained in:
parent
ad9b5e0a77
commit
a1614ab1ce
5 changed files with 61 additions and 51 deletions
|
|
@ -63,6 +63,7 @@ ${XDG_CONFIG_HOME}/tmux/tmux.conf $FILES/tmux.conf
|
|||
${XDG_CONFIG_HOME}/nvim/init.vim $FILES/init.vim
|
||||
${XDG_CONFIG_HOME}/shell/aliases $FILES/aliases.sh
|
||||
${XDG_CONFIG_HOME}/shell/profile $FILES/profile.sh
|
||||
${XDG_CONFIG_HOME}/shell/solarized $FILES/solarized.sh
|
||||
${XDG_CONFIG_HOME}/zsh/.zshrc $FILES/zshrc
|
||||
${HOME}/.XCompose $FILES/xcompose
|
||||
${HOME}/.bashrc $FILES/bashrc
|
||||
|
|
|
|||
|
|
@ -1,6 +1,12 @@
|
|||
#!/bin/bash
|
||||
# Set up bash for interactive use (options, prompt, aliases, etc.)
|
||||
|
||||
while read -r f; do [ -f "$f" ] && source "$f"; done <<EOL
|
||||
${XDG_CONFIG_HOME}/shell/aliases
|
||||
${XDG_CONFIG_HOME}/shell/solarized
|
||||
EOL
|
||||
unset f
|
||||
|
||||
stty stop undef # Prevent ctrl-s from freezing the terminal.
|
||||
|
||||
shopt -s cdspell checkwinsize globstar histappend nocaseglob
|
||||
|
|
@ -13,8 +19,6 @@ HISTSIZE=
|
|||
HISTTIMEFORMAT="[%F %T] "
|
||||
HISTFILE="$XDG_DATA_HOME/bash/history"
|
||||
|
||||
[ -f "${XDG_CONFIG_HOME}/shell/aliases" ] && source "${XDG_CONFIG_HOME}/shell/aliases"
|
||||
|
||||
Reset="\[$(tput sgr0)\]"
|
||||
PS1_EXIT="\[$(tput setaf "$Red" )\]" # color for last exit code if non-zero
|
||||
PS1_ROOT="\[$(tput setaf "$Orange" )\]" # logged in as root
|
||||
|
|
|
|||
|
|
@ -1,50 +1,6 @@
|
|||
#!/bin/sh
|
||||
# Environment variables are set here for login shells.
|
||||
|
||||
# From: https://ethanschoonover.com/solarized/
|
||||
# SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB
|
||||
# --------- ------- ---- ------- ----------- ---------- ----------- -----------
|
||||
# base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21
|
||||
# base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26
|
||||
# base01 #586e75 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46
|
||||
# base00 #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51
|
||||
# base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59
|
||||
# base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63
|
||||
# base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93
|
||||
# base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99
|
||||
# yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71
|
||||
# orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80
|
||||
# red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86
|
||||
# magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83
|
||||
# violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77
|
||||
# blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82
|
||||
# cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63
|
||||
# green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60
|
||||
# ^
|
||||
# |
|
||||
# +--- set colors according to this column, assuming a
|
||||
# properly configured terminal.
|
||||
#
|
||||
# Don't export these into the environment -> the point is to have them
|
||||
# available within the shell only.
|
||||
Base03=8
|
||||
Base02=0
|
||||
Base01=10
|
||||
Base00=11
|
||||
Base0=12
|
||||
Base1=14
|
||||
Base2=7
|
||||
Base3=15
|
||||
Red=1
|
||||
Orange=9
|
||||
Yellow=3
|
||||
Green=2
|
||||
Cyan=6
|
||||
Blue=4
|
||||
Violet=13
|
||||
Magenta=5
|
||||
Reset=$(tput sgr0)
|
||||
|
||||
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}"
|
||||
|
|
@ -64,9 +20,9 @@ export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup.py"
|
|||
export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
|
||||
|
||||
# Make man pages pretty
|
||||
export LESS_TERMCAP_so="$(printf '%s\n' "setaf $Base03" "setab $Cyan" | tput -S)"
|
||||
export LESS_TERMCAP_md="$(printf '%s\n' "setaf $Yellow" | tput -S)"
|
||||
export LESS_TERMCAP_us="$(printf '%s\n' "setaf $Base3" 'smul' | tput -S)"
|
||||
export LESS_TERMCAP_so="$(printf '%s\n' 'setaf 8' 'setab 6' | tput -S)"
|
||||
export LESS_TERMCAP_md="$(printf '%s\n' 'setaf 3' | tput -S)"
|
||||
export LESS_TERMCAP_us="$(printf '%s\n' 'setaf 15' 'smul' | tput -S)"
|
||||
export LESS_TERMCAP_se="$Reset"
|
||||
export LESS_TERMCAP_me="$Reset"
|
||||
export LESS_TERMCAP_ue="$Reset"
|
||||
|
|
|
|||
45
files/solarized.sh
Normal file
45
files/solarized.sh
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
#!/bin/sh
|
||||
# From: https://ethanschoonover.com/solarized/
|
||||
# SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB
|
||||
# --------- ------- ---- ------- ----------- ---------- ----------- -----------
|
||||
# base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21
|
||||
# base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26
|
||||
# base01 #586e75 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46
|
||||
# base00 #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51
|
||||
# base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59
|
||||
# base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63
|
||||
# base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93
|
||||
# base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99
|
||||
# yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71
|
||||
# orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80
|
||||
# red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86
|
||||
# magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83
|
||||
# violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77
|
||||
# blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82
|
||||
# cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63
|
||||
# green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60
|
||||
# ^
|
||||
# |
|
||||
# +--- set colors according to this column, assuming a
|
||||
# properly configured terminal.
|
||||
#
|
||||
# Don't export these into the environment -> the point is to have them
|
||||
# available within the shell only.
|
||||
Base03=8
|
||||
Base02=0
|
||||
Base01=10
|
||||
Base00=11
|
||||
Base0=12
|
||||
Base1=14
|
||||
Base2=7
|
||||
Base3=15
|
||||
Red=1
|
||||
Orange=9
|
||||
Yellow=3
|
||||
Green=2
|
||||
Cyan=6
|
||||
Blue=4
|
||||
Violet=13
|
||||
Magenta=5
|
||||
Reset=$(tput sgr0)
|
||||
|
||||
|
|
@ -1,7 +1,11 @@
|
|||
#!/bin/zsh
|
||||
# Set up zsh for interactive use (options, prompt, aliases, etc.)
|
||||
|
||||
while read -r f; do [ -f "$f" ] && source "$f"; done <<EOL
|
||||
"${XDG_CONFIG_HOME}/shell/aliases"
|
||||
"${XDG_CONFIG_HOME}/shell/solarized"
|
||||
EOL
|
||||
unset f
|
||||
|
||||
stty stop undef # Prevent ctrl-s from freezing the terminal.
|
||||
|
||||
[ -f "${XDG_CONFIG_HOME}/shell/aliases" ] && source "${XDG_CONFIG_HOME}/shell/aliases"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue