Von Random 3 years ago
parent 2460959bce
commit 13dc4b614f
  1. 23
      vimplugrc
  2. 4
      vimrc
  3. 5
      xresources
  4. 2
      zshrc

@ -2,18 +2,18 @@
autocmd BufRead *vimplugrc set ft=vim
" enable plugins
execute 'source' fnameescape(plugdir) . '/vim-plug/plug.vim'
execute 'source' fnameescape(plug)
silent!call plug#begin(plugdir)
" plugin manager for self updates
Plug 'junegunn/vim-plug'
" general plugins
Plug 'itchyny/lightline.vim'
Plug 'junegunn/fzf.vim'
Plug 'junegunn/vim-easy-align'
Plug 'lifepillar/vim-solarized8'
Plug 'mhinz/vim-signify'
Plug 'neilhwatson/vim_cf3'
Plug 'NLKNguyen/papercolor-theme'
Plug 'sheerun/vim-polyglot'
Plug 'tpope/vim-commentary'
Plug 'tpope/vim-fugitive'
@ -39,18 +39,17 @@ nmap <Leader>fb :Buffers<CR>
nmap <Leader>fl :Lines<CR>
nmap <Leader>ft :Filetypes<CR>
" lightline
set noshowmode
let g:lightline = {}
let g:lightline.separator = { 'left': "\ue0b0", 'right': "\ue0b2" }
let g:lightline.subseparator = { 'left': "\ue0b1", 'right': "\ue0b3" }
" vimwiki
let g:vimwiki_list = [{'path': '$HOME/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}]
" color theme
if $TERM !~ '^linux'
let &bg = "light"
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
let g:solarized_use16 = 1
let g:solarized_italics = 1
let g:solarized_extra_hi_groups = 1
colorscheme solarized8
set bg=light
colorscheme PaperColor
endif

@ -9,7 +9,6 @@ set belloff=all colorcolumn=80 formatoptions+=j relativenumber breakindent
set keymap=russian-jcukenwintype iminsert=0 imsearch=0
set title titlestring=[%{hostname()}]\ %t\ -\ vim
let g:netrw_liststyle = 1
let g:sh_indent_case_labels = 1
" mappings
@ -32,7 +31,8 @@ noremap! <C-Space> <C-^>
" plugins
let plugrc = expand('$HOME/.vimplugrc')
let plugdir = expand('$HOME/.vim/plugged')
if filereadable(plugrc) && v:version >= 703
let plug = plugdir . '/vim-plug/plug.vim'
if filereadable(plugrc) && filereadable(plug) && v:version >= 703
execute 'source' fnameescape(plugrc)
endif

@ -4,11 +4,11 @@ Xft.antialias: true
Xft.rgba: rgb
Xft.hinting: true
Xft.hintstyle: hintslight
!Xft.dpi: 192
Xft.dpi: 192
#define TERMINUS -xos4-terminus-bold-*-*-*-14-*-*-*-*-*-iso10646-1
#define TERMINUS_SMALL -xos4-terminus-*-*-*-*-12-*-*-*-*-*-iso10646-1
#define FONT xft:Fira Code Retina:size=10
#define FONT xft:Fantasque Sans Mono:size=11
! solarized light
#define COLORFG #657b83
@ -37,7 +37,6 @@ Xft.hintstyle: hintslight
! {{{ urxvt
! fonts
URxvt.font: FONT
URxvt.italicFont: FONT
! misc
URxvt.intensityStyles: false

@ -72,7 +72,7 @@ bindkey '^x^e' edit-command-line
# }}}
# {{{ prompt
prompt_ln1='[ %(!.%F{red}.%F{blue})%n%f %m:%d ]'
prompt_ln2=$'\n%(!.%F{red}.%F{blue})=>>%f '
prompt_ln2=$'\n%(!.%F{red}.%F{blue})$>%f '
prompt_state_file="/tmp/zsh_gitstatus_$$.tmp"
PROMPT="$prompt_ln1$prompt_ln2"
PROMPT2='%_%(!.%F{red}.%F{blue})>%f '

Loading…
Cancel
Save