From c9c8c36c5c1ac6f2109126c307e851612bb0cf85 Mon Sep 17 00:00:00 2001 From: lanxu Date: Fri, 16 Feb 2018 23:18:34 +0200 Subject: [PATCH] Fixed fonts --- .Xresources | 13 +++++++++---- .vimrc | 18 +++++++++++------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.Xresources b/.Xresources index 3112f71..5cf4ba4 100644 --- a/.Xresources +++ b/.Xresources @@ -10,8 +10,12 @@ Xft.rgba: rgb !#include ".Xresources.d/theme_gruvbox-dark" URxvt.perl-ext-common: default,matcher,clipboard -URxvt.font: xft:Fira Code:size=10:style=Regular -URxvt.boldFont: xft:Fira Code:size=10:style=Bold +URxvt.font: xft:Fura Code Nerd Font:size=10:style=Regular +URxvt.boldFont: xft:Fura Code Nerd Font:size=10:style=Bold +!URxvt.font: xft:Fira Code:size=10:style=Regular +!URxvt.boldFont: xft:Fira Code:size=10:style=Bold +!URxvt.font: xft:DejaVu Sans Mono:size=10:style=Regular +!URxvt.boldFont: xft:DejaVu Sans Mono:size=10:style=Bold URxvt.url-launcher: firefox URxvt.matcher.button: 1 URxvt*scrollBar: false @@ -24,8 +28,9 @@ URxvt.keysym.M-C-v: perl:clipboard:paste_escaped URxvt.iso14755: false URxvt.iso14755_52: false URxvt*termName: rxvt-unicode-256color - -XTerm*faceName: xft:Fira Code:size=10:style=Regular +XTerm*faceName: xft:Fura Code Nerd Font:size=10:style=Regular +!XTerm*faceName: xft:DejaVu Sans Mono:size=10:style=Regular +!XTerm*faceName: xft:Fira Code:size=10:style=Regular XTerm*faceSize: 10 XTerm.scaleHeight: 0.90 XTerm*termName: xterm-256color diff --git a/.vimrc b/.vimrc index 09cd755..57760f7 100644 --- a/.vimrc +++ b/.vimrc @@ -107,6 +107,7 @@ filetype plugin indent on "set tags+=~/.vim/tags/sdl "set tags+=~/.vim/tags/boost "set tags+=~/.vim/tags/opencv2 +"set tags+=~/.vim/tags/mesa " build tags of your own project with Ctrl-F12 "map :!ctags -R --sort=yes --c++-kinds=+p --fields=+iaS --extra=+q ../src/ @@ -120,11 +121,12 @@ filetype plugin indent on "let OmniCpp_MayCompleteScope = 1 " autocomplete after :: "let OmniCpp_DefaultNamespaces = ["std", "_GLIBCXX_STD", "cv", "boost"] "au BufNewFile,BufRead,BufEnter *.cpp,*.hpp,*.cc,*.hh set omnifunc=omni#cpp#complete#Main -" automatically open and close the popup menu / preview window +"" automatically open and close the popup menu / preview window "au CursorMovedI,InsertLeave * if pumvisible() == 0|silent! pclose|endif "set completeopt=menuone,menu,longest,preview "map :e %:p:s,.h$,.X123X,:s,.cpp$,.h,:s,.X123X$,.cpp, "map :e %:p:s,.hh$,.X123X,:s,.cc$,.hh,:s,.X123X$,.cc, + " Uncomment the following to have Vim jump to the last position when " reopening a file if has("autocmd") @@ -132,10 +134,6 @@ if has("autocmd") endif -" Indentation -set shiftwidth=8 -set softtabstop=8 - if has("gui_running") " GUI is running or is about to start. " Maximize gvim window. @@ -149,7 +147,8 @@ if has("gui_running") set guioptions-=r "remove right-hand scroll bar set guioptions-=L "remove left-hand scroll bar - set guifont=Fira\ Code\ 10 + "set guifont=DejaVu\ Sans\ Mono\ 10 + set guifont=Fura\ Code\ Nerd\ Font\ 10 "set guifont=Fira\ Mono\ 10 "set guifont=Source\ Code\ Pro\ 10 "set guifont=Terminus\ 11 @@ -173,7 +172,7 @@ inoremap :tabnew " YouCompleteMe let g:ycm_add_preview_to_completeopt=0 let g:ycm_confirm_extra_conf=0 -let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py' +let g:ycm_global_ycm_extra_conf = '~/.vim/.ycm_extra_conf.py' set completeopt-=preview set ssop-=options " do not store global and local values in a session @@ -211,6 +210,7 @@ let g:jsdoc_enable_es6 = 1 autocmd BufWritePre *.js %s/\s\+$//e autocmd BufWritePre *.cpp %s/\s\+$//e +" Indentation set tabstop=4 set softtabstop=0 set expandtab @@ -230,3 +230,7 @@ augroup lexical autocmd FileType textile call lexical#init() autocmd FileType text call lexical#init({ 'spell': 0 }) augroup END + +"let g:ale_linters = { +""\ 'cpp': ['cppcheck'], +""\}