Update many things and add new colorscheme, termite config, tilda config, Xresource, etc...

This commit is contained in:
2018-04-30 00:37:31 +02:00
parent 304f883c1e
commit 5ef18b7a9d
17 changed files with 646 additions and 67 deletions

View File

@ -1,4 +1,3 @@
#
# aliases
#
@ -6,12 +5,14 @@
alias setclip='xclip -selection c'
alias getclip='xclip -selection clipboard -o'
alias open='xdg-open $1'
alias v='nvim'
alias vi='nvim'
alias vim='nvim'
alias l="ls -lFh"
alias la="ls -lAFh"
alias ll="ls -l"
alias l1="ls -1"
alias ls='ls --color=auto'
alias j="jump"
@ -21,13 +22,21 @@ alias zshrc="nvim ~/.zshrc"
alias bashrc="nvim ~/.bashrc"
alias aliases="nvim ~/.config/aliases"
alias nviminit="nvim ~/.config/nvim/init.vim"
alias termiteconf="nvim ~/.config/termite/config"
alias i3conf="nvim ~/.i3/config"
alias bspwmconf="nvim ~/.config/bspwm/bspwmrc"
alias sxhkdconf="nvim ~/.config/sxhkd/sxhkdrc"
alias tmuxconf="nvim ~/.tmux.conf"
# reload .Xreseources
alias xres="xrdb ~/.Xresources"
# General commands
alias -g gp='| grep -i'
alias pwd='echo $PWD'
# Git aliases
alias gs="git status"
alias gst="git status"
alias gd="git diff"
alias gdh="git diff HEAD"
alias gc="git clone $1 $2"
@ -46,13 +55,17 @@ alias gcp="git cherry-pick $1"
#alias nrb="npm run build";
#alias nrt="npm run test";
alias xres="xrdb ~/.Xresources"
# Pacman
alias pacman="pacman --color=auto $@"
alias pm="pacman $@"
alias pms="pacman -Ss $@"
alias pm='pacman "$@"'
alias pms='pacman -Ss "$@"'
alias pmsi='pacman -Sii "$@"'
alias pmq='pacman -Qs "$@"'
alias pmqi='pacman -Qi "$@"'
alias pmi="sudo pacman -S --color=auto $@"
alias pmr="sudo pacman -Rns $@"
alias pmu="sudo pacman -Syu $@"
alias pmro='sudo pacman -Rns $(pacman -Qtdq)'
alias pmcc='pacman -Qii | awk '\''/^MODIFIED/ {print $2}'\''' #list changed config files
alias cower="cower --color=auto $@"

View File

@ -5,12 +5,11 @@
" Plugins
call plug#begin('~/.config/nvim/plugged')
Plug 'vim-airline/vim-airline' " fancy statusline
Plug 'vim-airline/vim-airline-themes' " themes for vim-airline
Plug 'NLKNguyen/papercolor-theme' " PaperColor Theme (old: [vim-colors-solarized])
Plug 'itchyny/lightline.vim'
Plug 'scrooloose/nerdtree' " file tree browser
Plug 'ctrlpvim/ctrlp.vim' " fuzzy file finder
Plug 'bronson/vim-trailing-whitespace'
Plug 'altercation/vim-colors-solarized'
Plug 'ryanoasis/vim-devicons' " awesome icons
Plug 'tiagofumo/vim-nerdtree-syntax-highlight'
Plug 'ashisha/image.vim' " Display images in vim
@ -40,21 +39,22 @@ Plug 'lervag/vimtex'
call plug#end()
" Theme
syntax enable
"set background=dark
colorscheme solarized
colorscheme PaperColor
if has('gui_running')
" set dark/light background based on time
if (strftime("%H") < 20 && strftime("%H") > 7 )
set background=light
else
set background=dark
endif
" Enable snipMate compatibility feature.
"let g:neosnippet#enable_snipmate_compatibility = 1
"let g:neosnippet#snippets_directory='~/.vim/bundle/vim-snippets/snippets'
" always light background if gui is running
if has('gui_running')
set background=light
endif
"deoplete settings
let g:deoplete#enable_at_startup = 1
@ -103,15 +103,16 @@ endif
" toggle gundo
nnoremap <leader>u :MundoToggle<CR>
" Toggle number lines
map <C-S-l> :set number!<CR>:set relativenumber!<CR>
" general
set relativenumber
set number
set history=200 "set Ex command history
set autoread " detect when a file is changed
au FocusGained * :checktime "workaround for autoread: neovim/#1936
set cursorline
set mouse=a " mouse function
set backspace=indent,eol,start " backspace multiple lines
" enable global undo
set undofile
@ -170,8 +171,8 @@ nnoremap j gj
nnoremap k gk
" fast movement
nnoremap J 5j
nnoremap K 5k
map J 5j
map K 5k
" cursor to begin or end of line
nnoremap B ^
@ -181,9 +182,11 @@ nnoremap E $
vmap < <gv
vmap > >gv
" Faster delete. Doesnt work actually
inoremap <C-BS> db
inoremap <C-Del> dw
" Faster delete.
nmap <C-BS> <C-W>
nmap <C-h> db
nmap <C-Del> dw
imap <C-Del> <ESC>dwi
" turn off last search highlight
map <esc> :noh<cr>
@ -194,22 +197,28 @@ nnoremap gV `[v`]
" jk is escape
inoremap jk <ESC>
call togglebg#map("<F5>") "Toggle background dark/light
map <F6> :IndentLinesToggle<CR>
" Toggle background dark/light
map <F5> :let &background = ( &background == "dark"? "light" : "dark" )<CR>
" Toggle number lines
map <F6> :set number!<CR>:set relativenumber!<CR>
" Toggle | for indent lines
map <F7> :IndentLinesToggle<CR>
" vim-airline
" lightline
let g:lightline = { 'colorscheme': 'PaperColor' }
let g:airline_theme='badwolf'
let g:airline_left_sep = ''
let g:airline_left_alt_sep = ''
let g:airline_right_sep = ''
let g:airline_right_alt_sep = ''
let g:airline_symbols_branch = ''
let g:airline_symbols_readonly = ''
let g:airline_symbols_linenr = ''
let g:airline_powerline_fonts = 1 "required for devicons
" vim-airline (old, now using lightline)
"let g:airline_theme='papercolor'
"let g:airline_left_sep = ''
"let g:airline_left_alt_sep = ''
"let g:airline_right_sep = ''
"let g:airline_right_alt_sep = ''
"let g:airline_symbols_branch = ''
"let g:airline_symbols_readonly = ''
"let g:airline_symbols_linenr = ''
"let g:airline_powerline_fonts = 1 "required for devicons
" Enable Airline Tabbar
let g:airline#extensions#tabline#enabled = 1
"let g:airline#extensions#tabline#enabled = 1
set encoding=utf8
set guifont=DroidSansMonoForPowerline\ Nerd\ Font

79
config/termite/config Normal file
View File

@ -0,0 +1,79 @@
[options]
allow_bold = true
clickable_url = true
dynamic_title = true
font = Monospace 16
font = Roboto-Medium 11
font = DejaVuSansMono 11
font = Roboto Mono Light for Powerline 11
font = DejaVu Sans Mono for Powerline 11
font = Roboto Mono for Powerline 11
#geometry = 640x480
#icon_name = terminal
scroll_on_output = false
scroll_on_keystroke = true
# "system", "on" or "off"
cursor_blink = system # system, on, off
cursor_shape = block # block, ibeam, underline
# set size hints for the window
#size_hints = false
# "off", "left" or "right"
scrollbar = off
[colors]
# If unset, will reverse foreground and background
# highlight = #2f2f2f
# special
foreground = #ebdbb2
foreground_bold = #ebdbb2
cursor = #ebdbb2
#background = #1d2021
background = #1c1c1c
# black
color0 = #282828
color8 = #928374
# red
color1 = #cc241d
color9 = #fb4934
# green
color2 = #98971a
color10 = #b8bb26
# yellow
color3 = #d79921
color11 = #fabd2f
# blue
color4 = #458588
color12 = #83a598
# magenta
color5 = #b16286
color13 = #d3869b
# cyan
color6 = #689d6a
color14 = #8ec07c
# white
color7 = #a89984
color15 = #ebdbb2
[hints]
#font = Monospace 12
#foreground = #dcdccc
#background = #3f3f3f
#active_foreground = #e68080
#active_background = #3f3f3f
#padding = 2
#border = #3f3f3f
#border_width = 0.5
#roundness = 2.0
# vim: ft=dosini cms=#%s

View File

@ -0,0 +1,77 @@
[options]
allow_bold = true
clickable_url = true
dynamic_title = true
font = Monospace 16
font = Roboto-Medium 11
font = DejaVuSansMono 11
font = Roboto Mono Light for Powerline 11
font = DejaVu Sans Mono for Powerline 11
font = Roboto Mono for Powerline 11
#geometry = 640x480
#icon_name = terminal
scroll_on_output = false
scroll_on_keystroke = true
# "system", "on" or "off"
cursor_blink = system # system, on, off
cursor_shape = block # block, ibeam, underline
# set size hints for the window
#size_hints = false
# "off", "left" or "right"
scrollbar = off
[colors]
# If unset, will reverse foreground and background
# highlight = #2f2f2f
# special
foreground = #4d4d4c
foreground_bold = #4d4d4c
cursor = #4d4d4c
background = #eeeeee
# black
color0 = #ededed
color8 = #969694
# red
color1 = #d7005f
color9 = #d7005f
# green
color2 = #718c00
color10 = #718c00
# yellow
color3 = #d75f00
color11 = #d75f00
# blue
color4 = #4271ae
color12 = #4271ae
# magenta
color5 = #8959a8
color13 = #8959a8
# cyan
color6 = #3e999f
color14 = #3e999f
# white
color7 = #4d4d4c
color15 = #f5f5f5
[hints]
#font = Monospace 12
#foreground = #dcdccc
#background = #3f3f3f
#active_foreground = #e68080
#active_background = #3f3f3f
#padding = 2
#border = #3f3f3f
#border_width = 0.5
#roundness = 2.0
# vim: ft=dosini cms=#%s

106
config/tilda/config_0 Normal file
View File

@ -0,0 +1,106 @@
tilda_config_version="1.4.1"
command="tmux new-session -As tilda"
font="Monospace 11"
key="grave"
addtab_key="<Shift><Control>t"
fullscreen_key="F11"
toggle_transparency_key="F12"
toggle_searchbar_key="<Shift><Control>f"
closetab_key="<Shift><Control>w"
nexttab_key="<Control>Page_Down"
prevtab_key="<Control>Page_Up"
movetableft_key="<Shift><Control>Page_Up"
movetabright_key="<Shift><Control>Page_Down"
gototab_1_key="<Alt>1"
gototab_2_key="<Alt>2"
gototab_3_key="<Alt>3"
gototab_4_key="<Alt>4"
gototab_5_key="<Alt>5"
gototab_6_key="<Alt>6"
gototab_7_key="<Alt>7"
gototab_8_key="<Alt>8"
gototab_9_key="<Alt>9"
gototab_10_key="<Alt>0"
copy_key="<Shift><Control>c"
paste_key="<Shift><Control>v"
quit_key="<Shift><Control>q"
title="Tilda"
background_color="white"
# working_dir=""
web_browser="xdg-open"
increase_font_size_key="<Control>equal"
decrease_font_size_key="<Control>minus"
normalize_font_size_key="<Control>0"
# show_on_monitor=""
word_chars="-A-Za-z0-9,./?%&#:_"
lines=5000
max_width=1920
max_height=333
min_width=1
min_height=1
x_pos=0
y_pos=27
tab_pos=0
expand_tabs=false
show_single_tab=false
backspace_key=0
delete_key=1
d_set_title=3
command_exit=1
scheme=0
slide_sleep_usec=5000
animation_orientation=0
timer_resolution=200
auto_hide_time=0
on_last_terminal_exit=0
prompt_on_exit=false
palette_scheme=0
non_focus_pull_up_behaviour=0
cursor_shape=0
# show_on_monitor_number=0
# title_max_length_flag=false
title_max_length=103
palette = {60909, 60909, 60909, 55255, 0, 24415, 29041, 35980, 0, 55255, 24415, 0, 16962, 29041, 44718, 35209, 22873, 43176, 15934, 39321, 40863, 19789, 19789, 19532, 38550, 38550, 38036, 55255, 0, 24415, 29041, 35980, 0, 55255, 24415, 0, 16962, 29041, 44718, 35209, 22873, 43176, 15934, 39321, 40863, 62965, 62965, 62965}
scrollbar_pos=2
back_red=61166
back_green=61166
back_blue=61166
text_red=19789
text_green=19789
text_blue=19532
cursor_red=21845
cursor_green=22359
cursor_blue=21331
scroll_history_infinite=false
scroll_on_output=false
notebook_border=false
antialias=true
scrollbar=false
grab_focus=true
above=true
notaskbar=true
bold=true
blinks=true
scroll_on_key=true
bell=true
run_command=true
pinned=true
animation=true
hidden=true
set_as_desktop=false
centered_horizontally=false
centered_vertically=false
enable_transparency=true
# double_buffer=false
auto_hide_on_focus_lost=true
auto_hide_on_mouse_leave=false
title_behaviour=2
inherit_working_dir=true
command_login_shell=false
start_fullscreen=false
confirm_close_tab=false
# image=""
# scroll_background=false
# use_image=false
transparency=0
back_alpha=58975

106
config/tilda/config_1 Normal file
View File

@ -0,0 +1,106 @@
tilda_config_version="1.4.1"
command="tmux new-session -As tilda"
font="Monospace 11"
key="grave"
addtab_key="<Shift><Control>t"
fullscreen_key="F11"
toggle_transparency_key="F12"
toggle_searchbar_key="<Shift><Control>f"
closetab_key="<Shift><Control>w"
nexttab_key="<Control>Page_Down"
prevtab_key="<Control>Page_Up"
movetableft_key="<Shift><Control>Page_Up"
movetabright_key="<Shift><Control>Page_Down"
gototab_1_key="<Alt>1"
gototab_2_key="<Alt>2"
gototab_3_key="<Alt>3"
gototab_4_key="<Alt>4"
gototab_5_key="<Alt>5"
gototab_6_key="<Alt>6"
gototab_7_key="<Alt>7"
gototab_8_key="<Alt>8"
gototab_9_key="<Alt>9"
gototab_10_key="<Alt>0"
copy_key="<Shift><Control>c"
paste_key="<Shift><Control>v"
quit_key="<Shift><Control>q"
title="Tilda"
background_color="white"
# working_dir=""
web_browser="xdg-open"
increase_font_size_key="<Control>equal"
decrease_font_size_key="<Control>minus"
normalize_font_size_key="<Control>0"
# show_on_monitor=""
word_chars="-A-Za-z0-9,./?%&#:_"
lines=5000
max_width=1366
max_height=368
min_width=1
min_height=1
x_pos=0
y_pos=27
tab_pos=0
expand_tabs=false
show_single_tab=false
backspace_key=0
delete_key=1
d_set_title=3
command_exit=1
scheme=0
slide_sleep_usec=5000
animation_orientation=0
timer_resolution=200
auto_hide_time=0
on_last_terminal_exit=0
prompt_on_exit=false
palette_scheme=0
non_focus_pull_up_behaviour=0
cursor_shape=0
# show_on_monitor_number=0
# title_max_length_flag=false
title_max_length=103
palette = {60909, 60909, 60909, 55255, 0, 24415, 29041, 35980, 0, 55255, 24415, 0, 16962, 29041, 44718, 35209, 22873, 43176, 15934, 39321, 40863, 19789, 19789, 19532, 38550, 38550, 38036, 55255, 0, 24415, 29041, 35980, 0, 55255, 24415, 0, 16962, 29041, 44718, 35209, 22873, 43176, 15934, 39321, 40863, 62965, 62965, 62965}
scrollbar_pos=2
back_red=61166
back_green=61166
back_blue=61166
text_red=19789
text_green=19789
text_blue=19532
cursor_red=21845
cursor_green=22359
cursor_blue=21331
scroll_history_infinite=false
scroll_on_output=false
notebook_border=false
antialias=true
scrollbar=false
grab_focus=true
above=true
notaskbar=true
bold=true
blinks=true
scroll_on_key=true
bell=true
run_command=true
pinned=true
animation=true
hidden=true
set_as_desktop=false
centered_horizontally=false
centered_vertically=false
enable_transparency=true
# double_buffer=false
auto_hide_on_focus_lost=true
auto_hide_on_mouse_leave=false
title_behaviour=2
inherit_working_dir=true
command_login_shell=false
start_fullscreen=false
confirm_close_tab=false
# image=""
# scroll_background=false
# use_image=false
transparency=0
back_alpha=58975