Update configs

This commit is contained in:
natemaia 2018-06-16 19:09:51 -07:00
parent bc83789790
commit 42a986aba2
5 changed files with 145 additions and 7 deletions

View File

@ -26,7 +26,7 @@ frame_color = "#c0c5ce"
separator_color = frame
frame_width = 1
startup_notification = false
dmenu = /usr/bin/rofi -dmenu -p dunst:
dmenu = /usr/bin/rofi -dmenu -p dunst
browser = /usr/bin/firefox
icon_position = left
icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/

View File

@ -1,5 +1,5 @@
[dmenu]
dmenu_command = rofi -location 3 -yoffset 35 -xoffset -10 -width 37 -font "DejaVu Sans Mono 10" -padding 20 -line-padding 4 -hide-scrollbar -password
dmenu_command = rofi -location 3 -yoffset 35 -xoffset -10 -width 37 -font "DejaVu Sans Mono 11" -padding 20 -line-padding 4 -hide-scrollbar -password
[editor]
terminal = termite

View File

@ -71,7 +71,7 @@ set clear_filters_on_dir_change true
set line_numbers false
set one_indexed false
set save_tabs_on_exit true
set wrap_scroll true
set wrap_scroll false
set global_inode_type_filter
set show_hidden true
set show_hidden_bookmarks true

View File

@ -48,6 +48,20 @@
# Note: When using rifle in ranger, there is an additional flag "c" for
# only running the current file even if you have marked multiple files.
# -- Alternative example for opening files using xdg-open
# Replace your rifle.conf with this file to use xdg-open as your file opener.
# This is, of course, adaptable for use with any other file opener.
# else = xdg-open "$1"
# You need an "editor" and "pager" in order to use certain functions in ranger:
# label editor = "$EDITOR" -- "$@"
# label pager = "$PAGER" -- "$@"
# -- End example
#-------------------------------------------
# Text
#
@ -133,6 +147,7 @@ ext xcf, has gimp, X, flag f = gimp -- "$@"
# Archives
#
ext to|torrent, flag f, has deluge = deluge "$1"
ext to|torrent, flag f, has transmission = transmission "$1"
ext 7z|ace|ar|arc|xar|xpi|xz|zip|gz, has aunpack = aunpack -- "$@"
ext bz2?|cab|cpio|cpt|deb|dgc|dmg, has aunpack = aunpack -- "$@"
ext iso|jar|msi|pkg|rar|shar|tar|tgz, has aunpack = aunpack -- "$@"

View File

@ -13,24 +13,35 @@ set softtabstop=4 " spaces to enter for each tab
set shiftwidth=4 " amount of spaces for indentation
set shortmess+=aAcIws " Hide or shorten certain messages
" enable mouse.. sgr is better but not every term supports it
" ------ leader mapping ------
let g:mapleader = ','
map <Space> ,
" ------ enable additional features ------
" enable mouse
set mouse=a
if has('mouse_sgr')
" sgr mouse is better but not every term supports it
set ttymouse=sgr
endif
" syntax highlighting with true colors in the terminal
" syntax highlighting
syntax enable
if has('termguicolors') && $DISPLAY !=? ''
" true color in the terminal
set termguicolors
" fix true colours in some terminals
" fix true color in some terminals (nvim doesn't have this issue)
if !has('nvim') && !($TERM =~? 'xterm' || &term =~? 'xterm')
let $TERM = 'xterm-256color'
let &term = 'xterm-256color'
endif
endif
" change cursor shape for different modes
" change cursor shape for different editing modes (nvim does this by default)
if !has('nvim') && exists('$TMUX')
let &t_SI = "\<Esc>Ptmux;\<Esc>\e[5 q\<Esc>\\"
let &t_SR = "\<Esc>Ptmux;\<Esc>\e[4 q\<Esc>\\"
@ -41,6 +52,12 @@ elseif !has('nvim')
let &t_EI = "\e[2 q"
endif
" ------ basic maps ------
" open ranger as a file chooser using the function below
nnoremap <leader>r :call <SID>ranger()<CR>
" paste while in insert mode
inoremap <silent><C-v> <Esc>:set paste<CR>a<C-r>+<Esc>:set nopaste<CR>a
@ -51,10 +68,17 @@ nnoremap n nzzzv
nnoremap N Nzzzv
nnoremap <Tab> ==j
" re-visual text after changing indent
vnoremap > >gv
vnoremap < <gv
" j = gj :: k = gk while preserving numbered jumps ie. 12j or 30k
nnoremap <buffer><silent><expr>j v:count ? 'j' : 'gj'
nnoremap <buffer><silent><expr>k v:count ? 'k' : 'gk'
" ------ autocmd ------
" Reload changes if file changed outside of vim requires autoread
augroup load_changed_file
autocmd!
@ -67,3 +91,102 @@ augroup save_cursor_position
autocmd!
autocmd BufReadPost * call setpos(".", getpos("'\""))
augroup END
" ------ adv maps ------
" toggle line numbers
nnoremap <silent> <Leader>nn
\ :if &number <Bar>
\ set nonumber
\ <Bar> else <Bar>
\ set number
\ <Bar> endif<CR>
" strip trailing whitespace
nnoremap <silent> <Leader>ss
\ :let _p = getpos(".") <Bar>
\ let _s = (@/ != '') ? @/ : '' <Bar>
\ %s/\s\+$//e <Bar>
\ let @/ = _s <Bar>
\ nohlsearch <Bar>
\ unlet _s <Bar>
\ call setpos('.', _p) <Bar>
\ unlet _p <CR>
" global replace
vnoremap <Leader>sw "hy
\ :let b:sub = input('global replacement: ') <Bar>
\ if b:sub !=? '' <Bar>
\ let b:rep = substitute(getreg('h'), '/', '\\/', 'g') <Bar>
\ execute '%s/'.b:rep."/".b:sub.'/g' <Bar>
\ unlet b:sub b:rep <Bar>
\ endif <CR>
nnoremap <Leader>sw
\ :let b:sub = input('global replacement: ') <Bar>
\ if b:sub !=? '' <Bar>
\ execute "%s/<C-r><C-w>/".b:sub.'/g' <Bar>
\ unlet b:sub <Bar>
\ endif <CR>
" prompt before each replace
vnoremap <Leader>cw "hy
\ :let b:sub = input('interactive replacement: ') <Bar>
\ if b:sub !=? '' <Bar>
\ let b:rep = substitute(getreg('h'), '/', '\\/', 'g') <Bar>
\ execute '%s/'.b:rep.'/'.b:sub.'/gc' <Bar>
\ unlet b:sub b:rep <Bar>
\ endif <CR>
nnoremap <Leader>cw
\ :let b:sub = input('interactive replacement: ') <Bar>
\ if b:sub !=? '' <Bar>
\ execute "%s/<C-r><C-w>/".b:sub.'/gc' <Bar>
\ unlet b:sub <Bar>
\ endif <CR>
" highlight long lines
let w:longlines = matchadd('ColorColumn', '\%'.&tw.'v', &tw)
nnoremap <silent> <Leader>ll
\ :if exists('w:longlines') <Bar>
\ silent! call matchdelete(w:longlines) <Bar>
\ unlet w:longlines <Bar>
\ elseif &textwidth > 0 <Bar>
\ let w:longlines = matchadd('ColorColumn', '\%'.&textwidth.'v', &textwidth) <Bar>
\ else <Bar>
\ let w:longlines = matchadd('ColorColumn', '\%80v', 80) <Bar>
\ endif <CR>
" local keyword jump
nnoremap <Leader>fw
\ [I:let b:jump = input('Go To: ') <Bar>
\ if b:jump !=? '' <Bar>
\ execute "normal! ".b:jump."[\t" <Bar>
\ unlet b:jump <Bar>
\ endif <CR>
" open ranger as a file chooser
function! <SID>ranger()
let l:temp = tempname()
execute 'silent !st -e ranger --choosefiles='.shellescape(l:temp).' $PWD'
if !filereadable(temp)
redraw!
return
endif
let l:names = readfile(l:temp)
if empty(l:names)
redraw!
return
endif
execute 'edit '.fnameescape(l:names[0])
for l:name in l:names[1:]
execute 'argadd '.fnameescape(l:name)
endfor
redraw!
endfunction