Play with colors--and make it worse...
This commit is contained in:
parent
ee86aae463
commit
4abd1a6ffc
10 changed files with 120 additions and 57 deletions
3
Makefile
3
Makefile
|
@ -42,3 +42,6 @@ clean:
|
||||||
|
|
||||||
mac:
|
mac:
|
||||||
sudo mv /etc/{zprofile,zprofile.old}
|
sudo mv /etc/{zprofile,zprofile.old}
|
||||||
|
infocmp -x tmux-256color > ~/tmux-256color.src
|
||||||
|
sed -i "" -e "s/pairs#0x10000/pairs#0x1000/" ~/tmux-256color.src
|
||||||
|
/usr/bin/tic -x ~/tmux-256color.src
|
||||||
|
|
|
@ -1,28 +1,28 @@
|
||||||
# Colors (Solarized Dark)
|
# Colors (One Dark)
|
||||||
colors:
|
colors:
|
||||||
# Default colors
|
# Default colors
|
||||||
primary:
|
primary:
|
||||||
background: '0x002b36'
|
background: '0x1e2127'
|
||||||
foreground: '0x839496'
|
foreground: '0xabb2bf'
|
||||||
|
|
||||||
# Normal colors
|
# Normal colors
|
||||||
normal:
|
normal:
|
||||||
black: '0x073642'
|
black: '0x1e2127'
|
||||||
red: '0xdc322f'
|
red: '0xe06c75'
|
||||||
green: '0x859900'
|
green: '0x98c379'
|
||||||
yellow: '0xb58900'
|
yellow: '0xd19a66'
|
||||||
blue: '0x268bd2'
|
blue: '0x61afef'
|
||||||
magenta: '0xd33682'
|
magenta: '0xc678dd'
|
||||||
cyan: '0x2aa198'
|
cyan: '0x56b6c2'
|
||||||
white: '0xeee8d5'
|
white: '0xabb2bf'
|
||||||
|
|
||||||
# Bright colors
|
# Bright colors
|
||||||
bright:
|
bright:
|
||||||
black: '0x002b36'
|
black: '0x5c6370'
|
||||||
red: '0xcb4b16'
|
red: '0xe06c75'
|
||||||
green: '0x586e75'
|
green: '0x98c379'
|
||||||
yellow: '0x657b83'
|
yellow: '0xd19a66'
|
||||||
blue: '0x839496'
|
blue: '0x61afef'
|
||||||
magenta: '0x6c71c4'
|
magenta: '0xc678dd'
|
||||||
cyan: '0x93a1a1'
|
cyan: '0x56b6c2'
|
||||||
white: '0xfdf6e3'
|
white: '0xffffff'
|
||||||
|
|
|
@ -1,28 +1,24 @@
|
||||||
# Colors (Solarized Light)
|
|
||||||
colors:
|
colors:
|
||||||
# Default colors
|
|
||||||
primary:
|
primary:
|
||||||
background: '0xfdf6e3'
|
background: '0xf8f8f8'
|
||||||
foreground: '0x586e75'
|
foreground: '0x2a2b33'
|
||||||
|
|
||||||
# Normal colors
|
|
||||||
normal:
|
normal:
|
||||||
black: '0x073642'
|
black: '0x000000'
|
||||||
red: '0xdc322f'
|
red: '0xde3d35'
|
||||||
green: '0x859900'
|
green: '0x3e953a'
|
||||||
yellow: '0xb58900'
|
yellow: '0xd2b67b'
|
||||||
blue: '0x268bd2'
|
blue: '0x2f5af3'
|
||||||
magenta: '0xd33682'
|
magenta: '0xa00095'
|
||||||
cyan: '0x2aa198'
|
cyan: '0x3e953a'
|
||||||
white: '0xeee8d5'
|
white: '0xbbbbbb'
|
||||||
|
|
||||||
# Bright colors
|
|
||||||
bright:
|
bright:
|
||||||
black: '0x002b36'
|
black: '0x000000'
|
||||||
red: '0xcb4b16'
|
red: '0xde3d35'
|
||||||
green: '0x586e75'
|
green: '0x3e953a'
|
||||||
yellow: '0x657b83'
|
yellow: '0xd2b67b'
|
||||||
blue: '0x839496'
|
blue: '0x2f5af3'
|
||||||
magenta: '0x6c71c4'
|
magenta: '0xa00095'
|
||||||
cyan: '0x93a1a1'
|
cyan: '0x3e953a'
|
||||||
white: '0xfdf6e3'
|
white: '0xffffff'
|
||||||
|
|
|
@ -18,14 +18,5 @@ cat $alacritty/alacritty-base.yml $alacritty/themes/$new_color.yml >> $alacritty
|
||||||
echo $new_color > $color_file
|
echo $new_color > $color_file
|
||||||
|
|
||||||
if [[ $TMUX ]]; then
|
if [[ $TMUX ]]; then
|
||||||
for pane_info in $(tmux list-panes -a -F '#{pane_id}-#{pane_current_command}'); do
|
|
||||||
IFS=- read pane cmd <<< "$pane_info"
|
|
||||||
|
|
||||||
if [[ $cmd == "vim" ]]; then
|
|
||||||
echo "sending to $pane"
|
|
||||||
tmux send-keys -t $pane ":call ChangeBackground()" ENTER
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
tmux source-file $HOME/.tmux/${new_color}.conf
|
tmux source-file $HOME/.tmux/${new_color}.conf
|
||||||
fi
|
fi
|
||||||
|
|
3
bin/bin/git-checkout-all
Executable file
3
bin/bin/git-checkout-all
Executable file
|
@ -0,0 +1,3 @@
|
||||||
|
for branch in $(git branch --all | grep '^\s*remotes' | egrep --invert-match '(:?HEAD|master)$'); do
|
||||||
|
git branch --track "${branch##*/}" "$branch"
|
||||||
|
done
|
67
tmux-256color.src
Normal file
67
tmux-256color.src
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
# Reconstructed via infocmp from file: /Users/atomaka/.terminfo/74/tmux-256color
|
||||||
|
tmux-256color|tmux with 256 colors,
|
||||||
|
OTbs, OTpt, am, hs, km, mir, msgr, xenl, AX, G0,
|
||||||
|
colors#256, cols#80, it#8, lines#24, pairs#4096, U8#1,
|
||||||
|
acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
|
||||||
|
bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
|
||||||
|
clear=\E[H\E[J, cnorm=\E[34h\E[?25h, cr=^M,
|
||||||
|
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
|
||||||
|
cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
|
||||||
|
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM,
|
||||||
|
cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
|
||||||
|
dl=\E[%p1%dM, dl1=\E[M, dsl=\E]0;\007, ed=\E[J, el=\E[K,
|
||||||
|
el1=\E[1K, enacs=\E(B\E)0, flash=\Eg, fsl=^G, home=\E[H,
|
||||||
|
hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
|
||||||
|
il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS,
|
||||||
|
invis=\E[8m, is2=\E)0, kDC=\E[3;2~, kEND=\E[1;2F,
|
||||||
|
kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D, kNXT=\E[6;2~,
|
||||||
|
kPRV=\E[5;2~, kRIT=\E[1;2C, kbs=^H, kcbt=\E[Z, kcub1=\EOD,
|
||||||
|
kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~,
|
||||||
|
kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
|
||||||
|
kf12=\E[24~, kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R,
|
||||||
|
kf16=\E[1;2S, kf17=\E[15;2~, kf18=\E[17;2~,
|
||||||
|
kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~,
|
||||||
|
kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~,
|
||||||
|
kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S,
|
||||||
|
kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~, kf31=\E[18;5~,
|
||||||
|
kf32=\E[19;5~, kf33=\E[20;5~, kf34=\E[21;5~,
|
||||||
|
kf35=\E[23;5~, kf36=\E[24;5~, kf37=\E[1;6P, kf38=\E[1;6Q,
|
||||||
|
kf39=\E[1;6R, kf4=\EOS, kf40=\E[1;6S, kf41=\E[15;6~,
|
||||||
|
kf42=\E[17;6~, kf43=\E[18;6~, kf44=\E[19;6~,
|
||||||
|
kf45=\E[20;6~, kf46=\E[21;6~, kf47=\E[23;6~,
|
||||||
|
kf48=\E[24;6~, kf49=\E[1;3P, kf5=\E[15~, kf50=\E[1;3Q,
|
||||||
|
kf51=\E[1;3R, kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~,
|
||||||
|
kf55=\E[18;3~, kf56=\E[19;3~, kf57=\E[20;3~,
|
||||||
|
kf58=\E[21;3~, kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~,
|
||||||
|
kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R, kf7=\E[18~,
|
||||||
|
kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~,
|
||||||
|
kind=\E[1;2B, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
|
||||||
|
kri=\E[1;2A, nel=\EE, op=\E[39;49m, rc=\E8, rev=\E[7m,
|
||||||
|
ri=\EM, ritm=\E[23m, rmacs=^O, rmcup=\E[?1049l, rmir=\E[4l,
|
||||||
|
rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
|
||||||
|
rs2=\Ec\E[?1000l\E[?25h, sc=\E7,
|
||||||
|
setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
|
||||||
|
setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
|
||||||
|
sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
|
||||||
|
sgr0=\E[m\017, sitm=\E[3m, smacs=^N, smcup=\E[?1049h,
|
||||||
|
smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
|
||||||
|
tbc=\E[3g, tsl=\E]0;, vpa=\E[%i%p1%dd, Cr=\E]112\007,
|
||||||
|
Cs=\E]12;%p1%s\007, E0=\E(B, E3=\E[3J,
|
||||||
|
Ms=\E]52;%p1%s;%p2%s\007, S0=\E(%p1%c, Se=\E[2 q,
|
||||||
|
Smulx=\E[4\:%p1%dm, Ss=\E[%p1%d q, TS=\E]0;,
|
||||||
|
kDC3=\E[3;3~, kDC4=\E[3;4~, kDC5=\E[3;5~, kDC6=\E[3;6~,
|
||||||
|
kDC7=\E[3;7~, kDN=\E[1;2B, kDN3=\E[1;3B, kDN4=\E[1;4B,
|
||||||
|
kDN5=\E[1;5B, kDN6=\E[1;6B, kDN7=\E[1;7B, kEND3=\E[1;3F,
|
||||||
|
kEND4=\E[1;4F, kEND5=\E[1;5F, kEND6=\E[1;6F,
|
||||||
|
kEND7=\E[1;7F, kHOM3=\E[1;3H, kHOM4=\E[1;4H,
|
||||||
|
kHOM5=\E[1;5H, kHOM6=\E[1;6H, kHOM7=\E[1;7H,
|
||||||
|
kIC3=\E[2;3~, kIC4=\E[2;4~, kIC5=\E[2;5~, kIC6=\E[2;6~,
|
||||||
|
kIC7=\E[2;7~, kLFT3=\E[1;3D, kLFT4=\E[1;4D,
|
||||||
|
kLFT5=\E[1;5D, kLFT6=\E[1;6D, kLFT7=\E[1;7D,
|
||||||
|
kNXT3=\E[6;3~, kNXT4=\E[6;4~, kNXT5=\E[6;5~,
|
||||||
|
kNXT6=\E[6;6~, kNXT7=\E[6;7~, kPRV3=\E[5;3~,
|
||||||
|
kPRV4=\E[5;4~, kPRV5=\E[5;5~, kPRV6=\E[5;6~,
|
||||||
|
kPRV7=\E[5;7~, kRIT3=\E[1;3C, kRIT4=\E[1;4C,
|
||||||
|
kRIT5=\E[1;5C, kRIT6=\E[1;6C, kRIT7=\E[1;7C, kUP=\E[1;2A,
|
||||||
|
kUP3=\E[1;3A, kUP4=\E[1;4A, kUP5=\E[1;5A, kUP6=\E[1;6A,
|
||||||
|
kUP7=\E[1;7A, rmxx=\E[29m, smxx=\E[9m,
|
|
@ -5,6 +5,8 @@ bind-key r source-file ~/.tmux.conf \; display-message " ✱ ~/.tmux.conf is rel
|
||||||
set -g default-terminal "tmux-256color"
|
set -g default-terminal "tmux-256color"
|
||||||
set -ag terminal-overrides ",xterm-256color:RGB"
|
set -ag terminal-overrides ",xterm-256color:RGB"
|
||||||
|
|
||||||
|
set-option -g default-shell /opt/homebrew/bin/zsh
|
||||||
|
|
||||||
# faster escaping? From neovim CheckHealth
|
# faster escaping? From neovim CheckHealth
|
||||||
set-option -sg escape-time 10
|
set-option -sg escape-time 10
|
||||||
|
|
||||||
|
|
11
vim/.vimrc
11
vim/.vimrc
|
@ -3,6 +3,7 @@ call plug#begin('~/.vim/plugged')
|
||||||
|
|
||||||
" colors
|
" colors
|
||||||
Plug 'altercation/vim-colors-solarized'
|
Plug 'altercation/vim-colors-solarized'
|
||||||
|
Plug 'rakr/vim-one'
|
||||||
|
|
||||||
" keepers
|
" keepers
|
||||||
Plug 'airblade/vim-gitgutter'
|
Plug 'airblade/vim-gitgutter'
|
||||||
|
@ -162,9 +163,11 @@ map <Leader>sz :so ~/.vimrc<cr>
|
||||||
set cursorline " Highlight current line
|
set cursorline " Highlight current line
|
||||||
set cursorcolumn " Highlight current column
|
set cursorcolumn " Highlight current column
|
||||||
|
|
||||||
|
let &t_8f = "\<Esc>[38:2:%lu:%lu:%lum"
|
||||||
|
let &t_8b = "\<Esc>[48:2:%lu:%lu:%lum"
|
||||||
set termguicolors
|
set termguicolors
|
||||||
syntax enable
|
syntax enable
|
||||||
colorscheme solarized
|
colorscheme one
|
||||||
|
|
||||||
highlight ExtraWhitespace ctermbg=196
|
highlight ExtraWhitespace ctermbg=196
|
||||||
|
|
||||||
|
@ -183,9 +186,3 @@ function! ZoomState()
|
||||||
return ''
|
return ''
|
||||||
endif
|
endif
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
" colors
|
|
||||||
function! ChangeBackground()
|
|
||||||
let &background=readfile(glob("~/.config/atomaka/color.yml"))[0]
|
|
||||||
endfunction
|
|
||||||
call ChangeBackground()
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ alias .....="cd ../../../.."
|
||||||
alias a="ls -l --human-readable --all --color=auto"
|
alias a="ls -l --human-readable --all --color=auto"
|
||||||
alias agc="ag-count"
|
alias agc="ag-count"
|
||||||
alias agh="ag --hidden"
|
alias agh="ag --hidden"
|
||||||
|
alias awsi="aws sts get-caller-identity"
|
||||||
alias awsp="aws-profile"
|
alias awsp="aws-profile"
|
||||||
alias b="bundle"
|
alias b="bundle"
|
||||||
alias be="bundle exec"
|
alias be="bundle exec"
|
||||||
|
|
|
@ -23,6 +23,9 @@ if [[ "$OSTYPE" == darwin* ]]; then
|
||||||
source $HOME/.aliases-mac
|
source $HOME/.aliases-mac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# vim mode
|
||||||
|
bindkey -v
|
||||||
|
|
||||||
# Bind insert_sudo function
|
# Bind insert_sudo function
|
||||||
zle -N insert-sudo
|
zle -N insert-sudo
|
||||||
bindkey "^z" insert-sudo
|
bindkey "^z" insert-sudo
|
||||||
|
|
Loading…
Reference in a new issue