Update a few configurations and scripts

This commit is contained in:
natemaia 2018-12-13 02:08:45 -08:00
parent fbe965b8c7
commit 98ae5d737b
3 changed files with 34 additions and 36 deletions

View File

@ -3,18 +3,20 @@
" Arch defaults
runtime! archlinux.vim
" system clipboard (requires +clipboard)
set clipboard^=unnamed,unnamedplus
" additional settings
set modeline " enable vim modelines
set hlsearch " highlight search items
set incsearch " searches are performed as you type
set clipboard^=unnamed,unnamedplus " system clipboard (requires +clipboard)
set number " enable line numbers
set confirm " ask confirmation like save before quit.
set wildmenu " Tab completion menu when using command mode
set expandtab " Tab key inserts spaces not tabs
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
set modeline " enable vim modelines
set hlsearch " highlight search items
set incsearch " searches are performed as you type
set number " enable line numbers
set confirm " ask confirmation like save before quit.
set wildmenu " Tab completion menu when using command mode
set expandtab " Tab key inserts spaces not tabs
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
let g:netrw_altv = 1
let g:netrw_liststyle = 3
@ -36,22 +38,31 @@ endif
" syntax highlighting
syntax enable
if has('termguicolors') && $DISPLAY !=? '' && &t_Co == 256
set termguicolors " true colors in the terminal
let g:jinx_colors = 'night' " night or day
try
colorscheme jinx
catch
colorscheme evening
endtry
set linebreak breakindent
set list listchars=tab:>>,trail:~
" fix true colors in some terminals (neovim doesn't seem to have this issue)
" midnight, night, or day
let g:jinx_colors = 'midnight'
try
colorscheme jinx
catch
colorscheme slate
endtry
if $TERM !=? 'linux'
set termguicolors
" true colors in terminals (neovim doesn't need this)
if !has('nvim') && !($TERM =~? 'xterm' || &term =~? 'xterm')
let $TERM = 'xterm-256color'
let &term = 'xterm-256color'
endif
else
colorscheme slate
if has('multi_byte') && $TERM !=? 'linux'
set listchars=tab:»»,trail:•
set fillchars=vert:┃ showbreak=
endif
endif
" change cursor shape for different editing modes, neovim does this by default
@ -67,15 +78,6 @@ if !has('nvim')
endif
endif
set linebreak " wrap lines at full words rather than the last character to fit
set breakindent " wrapped lines match the same indent level
set list listchars=tab:>>,trail:~
if has('multi_byte') && $DISPLAY !=? ''
set listchars=tab:»»,trail:•
set fillchars=vert:┃ showbreak=
endif
" ------ commands ------
command! D Explore

View File

@ -15,8 +15,5 @@ fi
[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
[ -f ~/.xprofile ] && . ~/.xprofile
# don't put commands below the exec line
# launch the session
# launch the session, don't put commands below the exec line
exec openbox-session

View File

@ -25,5 +25,4 @@ xset s 1200 1300
xset dpms 1200 1300 1400
# keyboard repeat rate
kbdrate -d 400 -r 50
xset r rate 350 60