von/vdotfiles
1
0
Fork 0
Code Activity

back to solarized, since there is still no better vim theme yet, truecolor may wait

Browse source
This commit is contained in:
Von Random 2016-05-11 18:32:30 +03:00
parent 71c634feba
commit cf3311e4ee
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rc.lua
View file

@ -763,7 +763,7 @@ client.connect_signal(
-- don't forget you sync this file -- don't forget you sync this file
-- this shit runs every time you restart your wm, dumbass. -- this shit runs every time you restart your wm, dumbass.
---- set keyboard layouts ---- set keyboard layouts
awful.util.spawn_with_shell('setxkbmap -layout us,ru -variant altgr-intl,typewriter -option ctrl:nocaps,grp:win_space_toggle,grp_led:scroll,compose:menu') awful.util.spawn_with_shell('setxkbmap -layout us,ru -variant altgr-intl,typewriter -option ctrl:nocaps,grp:win_space_toggle,grp_led:caps,compose:menu')
---- populate xrdb with .Xresources config ---- populate xrdb with .Xresources config
if exists('/home/von/.Xresources') then if exists('/home/von/.Xresources') then
awful.util.spawn_with_shell('xrdb /home/von/.Xresources') awful.util.spawn_with_shell('xrdb /home/von/.Xresources')

8
shellrc
View file

@ -33,9 +33,6 @@ dotfiles="${HOME}/vdotfiles"
comp_enabled=true comp_enabled=true
vcs_enabled=true vcs_enabled=true
# nvim true color
export NVIM_TUI_ENABLE_TRUE_COLOR=1
export MYSQL_PS1="mysql [\d]> " export MYSQL_PS1="mysql [\d]> "
export SSH_AUTH_SOCK="${HOME}/.ssh/ssh_auth_sock" export SSH_AUTH_SOCK="${HOME}/.ssh/ssh_auth_sock"
export TIME_STYLE='long-iso' export TIME_STYLE='long-iso'
@ -88,9 +85,12 @@ fi
alias la='ls -FA' alias la='ls -FA'
alias ll='ls -lha' alias ll='ls -lha'
alias ld='ls -lhda' alias ld='ls -lhda'
# diff and colordiff
if is_exec colordiff; then if is_exec colordiff; then
alias diff='command colordiff' alias diff='command colordiff -u'
fi fi
alias rdiff='diff -urx.svn'
# mount # mount
alias mountiso='sudo mount -t iso9660 -o loop' alias mountiso='sudo mount -t iso9660 -o loop'

1
tmux.conf
View file

@ -42,7 +42,6 @@ set -g set-titles "off"
set -g status-left-length "20" set -g status-left-length "20"
set -g status-right-length "40" set -g status-right-length "40"
set -g terminal-override "rxvt-unicode*:sitm@,ritm@" set -g terminal-override "rxvt-unicode*:sitm@,ritm@"
set -g terminal-override "*-*:Tc"
set -g default-terminal "screen-256color" set -g default-terminal "screen-256color"
set -g status-position "top" set -g status-position "top"
set -g status-justify "centre" set -g status-justify "centre"

10
vimrc
View file

@ -1,7 +1,6 @@
set nocompatible set nocompatible
set background=dark set background=light
set backspace=indent,eol,start set backspace=indent,eol,start
set cursorline
set foldmethod=marker set foldmethod=marker
set history=50 set history=50
set hlsearch set hlsearch
@ -91,7 +90,6 @@ if v:version >= 700
" colorschemes " colorschemes
Plug 'vdrandom/forked-solarized.vim' Plug 'vdrandom/forked-solarized.vim'
Plug 'NLKNguyen/papercolor-theme'
" syntax highlight plugins " syntax highlight plugins
Plug 'puppetlabs/puppet-syntax-vim' Plug 'puppetlabs/puppet-syntax-vim'
@ -108,6 +106,7 @@ if v:version >= 700
" lightline options " lightline options
" 'active': { 'right': [ ['lineinfo', 'percent'] ] }, " 'active': { 'right': [ ['lineinfo', 'percent'] ] },
let g:lightline = { let g:lightline = {
\ 'colorscheme': 'solarized_dark',
\ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" }, \ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" },
\ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" }, \ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" },
\ 'component': { 'readonly': '%{&readonly?"\ue0a2":""}' }, \ 'component': { 'readonly': '%{&readonly?"\ue0a2":""}' },
@ -142,7 +141,10 @@ if v:version >= 700
set mouse= set mouse=
endif endif
colorscheme PaperColor let g:solarized_bold=0
let g:solarized_italic=0
let g:solarized_visibility='low'
colorscheme solarized
else else
set statusline=%F%m%r%h%w\ [FORMAT=%{&ff}]\ [TYPE=%Y]\ [POS=%04l,%04v][%p%%]\ [LEN=%L] set statusline=%F%m%r%h%w\ [FORMAT=%{&ff}]\ [TYPE=%Y]\ [POS=%04l,%04v][%p%%]\ [LEN=%L]