Compare commits
10 Commits
terry
...
007064ce60
| Author | SHA1 | Date | |
|---|---|---|---|
| 007064ce60 | |||
| 01596d9078 | |||
| 1920d0d9e1 | |||
| 819fe5bf5c | |||
| 1587972276 | |||
| da9adb5159 | |||
| edeaa7de39 | |||
| 9d9917a7cd | |||
| aefbefc503 | |||
| 54e0c89967 |
8
bashrc
8
bashrc
@@ -62,7 +62,7 @@ if [ "$color_prompt" = yes ]; then
|
|||||||
else
|
else
|
||||||
color="\033[1;35m"
|
color="\033[1;35m"
|
||||||
fi
|
fi
|
||||||
PS1="${color}┌── \u\033[33m::\033[34m\w\033[0m\n${color}└▷ \033[0m"
|
PS1="${color}╭── \u\033[33m::\033[34m\w\033[0m\n${color}╰▶ \033[0m"
|
||||||
else
|
else
|
||||||
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
|
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
|
||||||
fi
|
fi
|
||||||
@@ -88,12 +88,6 @@ alias ll='ls -alF'
|
|||||||
alias la='ls -A'
|
alias la='ls -A'
|
||||||
alias l='ls -CF'
|
alias l='ls -CF'
|
||||||
|
|
||||||
bind '"\e[A": history-search-backward'
|
|
||||||
bind '"\e[B": history-search-forward'
|
|
||||||
|
|
||||||
export PATH=~/.config/dotfiles/bin/:$PATH
|
|
||||||
alias u=update
|
|
||||||
|
|
||||||
# Add an "alert" alias for long running commands. Use like so:
|
# Add an "alert" alias for long running commands. Use like so:
|
||||||
# sleep 10; alert
|
# sleep 10; alert
|
||||||
alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
|
alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
|
||||||
|
|||||||
0
bin/compress-pdf
Executable file → Normal file
0
bin/compress-pdf
Executable file → Normal file
71
init.vim
71
init.vim
@@ -4,6 +4,9 @@ set nocompatible
|
|||||||
" PLUGNIS ###########################################################{{{
|
" PLUGNIS ###########################################################{{{
|
||||||
call plug#begin()
|
call plug#begin()
|
||||||
|
|
||||||
|
" Conquer of Completion
|
||||||
|
Plug 'neoclide/coc.nvim', {'branch': 'release'}
|
||||||
|
|
||||||
" General plugins
|
" General plugins
|
||||||
Plug 'vim-airline/vim-airline'
|
Plug 'vim-airline/vim-airline'
|
||||||
Plug 'vim-airline/vim-airline-themes'
|
Plug 'vim-airline/vim-airline-themes'
|
||||||
@@ -13,7 +16,6 @@ Plug 'tpope/vim-abolish'
|
|||||||
|
|
||||||
" Language specific plugins
|
" Language specific plugins
|
||||||
|
|
||||||
|
|
||||||
" Rust
|
" Rust
|
||||||
Plug 'rust-lang/rust.vim'
|
Plug 'rust-lang/rust.vim'
|
||||||
|
|
||||||
@@ -26,6 +28,9 @@ Plug 'cespare/vim-toml'
|
|||||||
" Pug
|
" Pug
|
||||||
Plug 'digitaltoad/vim-pug'
|
Plug 'digitaltoad/vim-pug'
|
||||||
|
|
||||||
|
" Spandex
|
||||||
|
Plug 'rust-spandex/spandex.vim'
|
||||||
|
|
||||||
call plug#end()
|
call plug#end()
|
||||||
|
|
||||||
" Line numbers and syntaxic coloration
|
" Line numbers and syntaxic coloration
|
||||||
@@ -40,6 +45,7 @@ set expandtab
|
|||||||
set tabstop=4
|
set tabstop=4
|
||||||
set shiftwidth=4
|
set shiftwidth=4
|
||||||
set autoindent
|
set autoindent
|
||||||
|
set tw=120
|
||||||
" }}}
|
" }}}
|
||||||
|
|
||||||
" UI CONFIG #########################################################{{{
|
" UI CONFIG #########################################################{{{
|
||||||
@@ -141,22 +147,57 @@ let g:markdown_composer_browser = 'firefox'
|
|||||||
let g:instant_markdown_autostart = 0
|
let g:instant_markdown_autostart = 0
|
||||||
" }}}
|
" }}}
|
||||||
|
|
||||||
function! s:check_back_space() abort
|
" COC CONFIG ########################################################{{{
|
||||||
let col = col('.') - 1
|
|
||||||
return !col || getline('.')[col - 1] =~ '\s'
|
" Use `[g` and `]g` to navigate diagnostics
|
||||||
|
" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
|
||||||
|
nmap <silent> gp <Plug>(coc-diagnostic-prev)
|
||||||
|
nmap <silent> gn <Plug>(coc-diagnostic-next)
|
||||||
|
|
||||||
|
" GoTo code navigation.
|
||||||
|
nmap <silent> gd <Plug>(coc-definition)
|
||||||
|
nmap <silent> gy <Plug>(coc-type-definition)
|
||||||
|
nmap <silent> gi <Plug>(coc-implementation)
|
||||||
|
nmap <silent> gr <Plug>(coc-references)
|
||||||
|
|
||||||
|
" Add `:Format` command to format current buffer.
|
||||||
|
command! -nargs=0 Format :call CocAction('format')
|
||||||
|
|
||||||
|
" Use K to show documentation in preview window.
|
||||||
|
nnoremap <silent> K :call <SID>show_documentation()<CR>
|
||||||
|
|
||||||
|
|
||||||
|
function! s:show_documentation()
|
||||||
|
if (index(['vim','help'], &filetype) >= 0)
|
||||||
|
execute 'h '.expand('<cword>')
|
||||||
|
elseif (coc#rpc#ready())
|
||||||
|
call CocActionAsync('doHover')
|
||||||
|
else
|
||||||
|
execute '!' . &keywordprg . " " . expand('<cword>')
|
||||||
|
endif
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
" Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable
|
||||||
|
" delays and poor user experience.
|
||||||
|
set updatetime=300
|
||||||
|
|
||||||
|
" Highlight the symbol and its references when holding the cursor.
|
||||||
|
autocmd CursorHold * silent call CocActionAsync('highlight')
|
||||||
|
|
||||||
|
" Symbol renaming.
|
||||||
|
nmap <leader>rn <Plug>(coc-rename)
|
||||||
|
|
||||||
|
" Formatting selected code.
|
||||||
|
xmap <leader>f <Plug>(coc-format-selected)
|
||||||
|
nmap <leader>f <Plug>(coc-format-selected)
|
||||||
|
|
||||||
|
" Autoclose preview
|
||||||
|
autocmd CursorMovedI * if pumvisible() == 0|pclose|endif
|
||||||
|
autocmd InsertLeave * if pumvisible() == 0|pclose|endif
|
||||||
|
|
||||||
|
" Complete on tab
|
||||||
|
inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
|
||||||
|
" }}}
|
||||||
|
|
||||||
" CUSTOM THINGS DEPENDING ON ENV ####################################{{{
|
" CUSTOM THINGS DEPENDING ON ENV ####################################{{{
|
||||||
let g:rustfmt_autosave = 1
|
let g:rustfmt_autosave = 1
|
||||||
let g:ale_linters = {}
|
|
||||||
let g:ale_c_parse_compile_commands=1
|
|
||||||
let g:ale_elm_ls_use_global = 1
|
|
||||||
let g:ale_linters_ignore = { 'elm': ['make'] }
|
|
||||||
let g:ale_lint_on_text_changed = 0
|
|
||||||
if $NVIM_DISABLE_PYTHON_LINTER == '1'
|
|
||||||
let g:ale_linters.python = []
|
|
||||||
endif
|
|
||||||
if $NVIM_DISABLE_JAVA_LINTER == '1'
|
|
||||||
let g:ale_linters.java = []
|
|
||||||
endif
|
|
||||||
|
|||||||
@@ -1,107 +0,0 @@
|
|||||||
# ZSH Theme - Preview: http://dl.dropbox.com/u/4109351/pics/gnzh-zsh-theme.png
|
|
||||||
# Based on bira theme
|
|
||||||
|
|
||||||
# load some modules
|
|
||||||
autoload -U colors zsh/terminfo # Used in the colour alias below
|
|
||||||
colors
|
|
||||||
setopt prompt_subst
|
|
||||||
|
|
||||||
# make some aliases for the colours: (coud use normal escap.seq's too)
|
|
||||||
for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
|
|
||||||
eval PR_$color='%{$fg[${(L)color}]%}'
|
|
||||||
done
|
|
||||||
eval PR_NO_COLOR="%{$terminfo[sgr0]%}"
|
|
||||||
eval PR_BOLD="%{$terminfo[bold]%}"
|
|
||||||
|
|
||||||
# Check the UID
|
|
||||||
if [[ $UID -ge 1000 ]]; then # normal user
|
|
||||||
# If ssh
|
|
||||||
if [[ -n "$SSH_CLIENT" || -n "$SSH2_CLIENT" ]]; then
|
|
||||||
eval PR_USER='${PR_GREEN}%n@%M${PR_NO_COLOR}'
|
|
||||||
eval PR_USER_OP='${PR_GREEN}%#${PR_NO_COLOR}'
|
|
||||||
local PR_ARROW_UP='${PR_GREEN}┌── ${PR_NO_COLOR}'
|
|
||||||
local PR_ARROW_DOWN='${PR_GREEN}└${PR_NO_COLOR}'
|
|
||||||
local PR_PROMPT='$PR_GREEN▷$PR_NO_COLOR'
|
|
||||||
else
|
|
||||||
eval PR_USER='${PR_MAGENTA}%n@%M${PR_NO_COLOR}'
|
|
||||||
eval PR_USER_OP='${PR_BLUE}%#${PR_NO_COLOR}'
|
|
||||||
local PR_PROMPT='$PR_MAGENTA▷$PR_NO_COLOR'
|
|
||||||
local PR_ARROW_UP='$PR_MAGENTA┌── ${PR_NO_COLOR}'
|
|
||||||
local PR_ARROW_DOWN='$PR_MAGENTA└${PR_NO_COLOR}'
|
|
||||||
fi
|
|
||||||
elif [[ $UID -eq 0 ]]; then # root
|
|
||||||
eval PR_USER='${PR_RED}%n${PR_NO_COLOR}'
|
|
||||||
eval PR_USER_OP='${PR_RED}%#${PR_NO_COLOR}'
|
|
||||||
local PR_ARROW_UP='${PR_RED}┌── ${PR_NO_COLOR}'
|
|
||||||
local PR_ARROW_DOWN='${PR_RED}└${PR_NO_COLOR}'
|
|
||||||
local PR_PROMPT='$PR_RED▷$PR_NO_COLOR'
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check if we are on SSH or not
|
|
||||||
if [[ -n "$SSH_CLIENT" || -n "$SSH2_CLIENT" ]]; then
|
|
||||||
eval PR_HOST='${PR_GREEN}%M${PR_NO_COLOR}' #SSH
|
|
||||||
else
|
|
||||||
eval PR_HOST='${PR_BLUE}%M${PR_NO_COLOR}' # no SSH
|
|
||||||
fi
|
|
||||||
|
|
||||||
# local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
|
|
||||||
truncated_pwd() {
|
|
||||||
local max_allowed_size=$(( `tput cols` - 30 ))
|
|
||||||
local path_name=$(print -rD $PWD)
|
|
||||||
local new_path_name=""
|
|
||||||
local truncated=0
|
|
||||||
while [ ${#path_name} -gt $max_allowed_size ]; do
|
|
||||||
truncated=1
|
|
||||||
new_path_name=`echo $path_name | cut -d '/' -f 2-`
|
|
||||||
if [[ "$new_path_name" == "$path_name" ]]; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
path_name=$new_path_name
|
|
||||||
done
|
|
||||||
if [ $truncated -eq 1 ]; then
|
|
||||||
echo "~/.../"$path_name
|
|
||||||
else
|
|
||||||
echo $path_name
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
local user_host='$PR_BOLD${PR_USER}$PR_BOLD'
|
|
||||||
local current_dir='$PR_BOLD%{$PR_BLUE%}$(truncated_pwd)$PR_NO_COLOR%}'
|
|
||||||
local rvm_ruby=''
|
|
||||||
if which rvm-prompt &> /dev/null; then
|
|
||||||
rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
|
|
||||||
else
|
|
||||||
if which rbenv &> /dev/null; then
|
|
||||||
rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
local return_code=""
|
|
||||||
local git_branch='$(git_prompt_info)'
|
|
||||||
|
|
||||||
local PR_TEMP=""
|
|
||||||
|
|
||||||
command -v vcgencmd > /dev/null && PR_TEMP=' ${PR_GREEN}‹$(vcgencmd measure_temp | cut -d = -f 2)›${PR_NO_COLOR}'
|
|
||||||
|
|
||||||
local PR_DATE='${PR_BOLD}${PR_MAGENTA}[%D{%H:%M}]${PR_NO_COLOR}'
|
|
||||||
|
|
||||||
#PROMPT="${user_host} ${current_dir} ${rvm_ruby}${git_branch}$PR_PROMPT "
|
|
||||||
separator='${PR_YELLOW}::${PR_NO_COLOR}'
|
|
||||||
tty | read tty_value
|
|
||||||
if [[ $tty_value == *pts* ]]; then # if in a tty
|
|
||||||
PROMPT="$PR_ARROW_UP${PR_DATE} ${user_host}${separator}${PR_NO_COLOR}${current_dir} ${rvm_ruby}${git_branch}${PR_TEMP}
|
|
||||||
$PR_ARROW_DOWN$PR_PROMPT ${PR_NO_COLOR}"
|
|
||||||
return_code="%(?.%{$PR_GREEN%}%? ↵%{$PR_NO_COLOR%}.%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
|
|
||||||
else
|
|
||||||
eval PR_NO_COLOR="$PR_WHITE"
|
|
||||||
PROMPT="${user_host} ${current_dir} ${rvm_ruby} ${git_branch}> ${PR_NO_COLOR}"
|
|
||||||
return_code="%(?.%{$PR_GREEN%}%? <%{$PR_NO_COLOR%}.%{$PR_RED%}%? <%{$PR_NO_COLOR%})"
|
|
||||||
fi
|
|
||||||
RPS1=" ${return_code}"
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="%{$PR_YELLOW%}‹"
|
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="›%{$PR_NO_COLOR%}"
|
|
||||||
|
|
||||||
TMOUT=30
|
|
||||||
TRAPALRM() {
|
|
||||||
zle reset-prompt
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user