lanxu/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed fonts

Browse Source
This commit is contained in:
lanxu 2018-02-16 23:18:34 +02:00
parent 274d5bfc13
commit c9c8c36c5c
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.Xresources
View File

@ -10,8 +10,12 @@ Xft.rgba: rgb
!#include ".Xresources.d/theme_gruvbox-dark" !#include ".Xresources.d/theme_gruvbox-dark"
URxvt.perl-ext-common: default,matcher,clipboard URxvt.perl-ext-common: default,matcher,clipboard
URxvt.font: xft:Fira Code:size=10:style=Regular URxvt.font: xft:Fura Code Nerd Font:size=10:style=Regular
URxvt.boldFont: xft:Fira Code:size=10:style=Bold 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.url-launcher: firefox
URxvt.matcher.button: 1 URxvt.matcher.button: 1
URxvt*scrollBar: false URxvt*scrollBar: false
@ -24,8 +28,9 @@ URxvt.keysym.M-C-v: perl:clipboard:paste_escaped
URxvt.iso14755: false URxvt.iso14755: false
URxvt.iso14755_52: false URxvt.iso14755_52: false
URxvt*termName: rxvt-unicode-256color URxvt*termName: rxvt-unicode-256color
XTerm*faceName: xft:Fura Code Nerd Font:size=10:style=Regular
XTerm*faceName: xft:Fira Code: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*faceSize: 10
XTerm.scaleHeight: 0.90 XTerm.scaleHeight: 0.90
XTerm*termName: xterm-256color XTerm*termName: xterm-256color

18
.vimrc
View File

@ -107,6 +107,7 @@ filetype plugin indent on
"set tags+=~/.vim/tags/sdl "set tags+=~/.vim/tags/sdl
"set tags+=~/.vim/tags/boost "set tags+=~/.vim/tags/boost
"set tags+=~/.vim/tags/opencv2 "set tags+=~/.vim/tags/opencv2
"set tags+=~/.vim/tags/mesa
" build tags of your own project with Ctrl-F12 " build tags of your own project with Ctrl-F12
"map <C-F12> :!ctags -R --sort=yes --c++-kinds=+p --fields=+iaS --extra=+q ../src/<CR> "map <C-F12> :!ctags -R --sort=yes --c++-kinds=+p --fields=+iaS --extra=+q ../src/<CR>
@ -120,11 +121,12 @@ filetype plugin indent on
"let OmniCpp_MayCompleteScope = 1 " autocomplete after :: "let OmniCpp_MayCompleteScope = 1 " autocomplete after ::
"let OmniCpp_DefaultNamespaces = ["std", "_GLIBCXX_STD", "cv", "boost"] "let OmniCpp_DefaultNamespaces = ["std", "_GLIBCXX_STD", "cv", "boost"]
"au BufNewFile,BufRead,BufEnter *.cpp,*.hpp,*.cc,*.hh set omnifunc=omni#cpp#complete#Main "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 "au CursorMovedI,InsertLeave * if pumvisible() == 0|silent! pclose|endif
"set completeopt=menuone,menu,longest,preview "set completeopt=menuone,menu,longest,preview
"map <C-TAB> :e %:p:s,.h$,.X123X,:s,.cpp$,.h,:s,.X123X$,.cpp,<CR> "map <C-TAB> :e %:p:s,.h$,.X123X,:s,.cpp$,.h,:s,.X123X$,.cpp,<CR>
"map <C-TAB> :e %:p:s,.hh$,.X123X,:s,.cc$,.hh,:s,.X123X$,.cc,<CR> "map <C-TAB> :e %:p:s,.hh$,.X123X,:s,.cc$,.hh,:s,.X123X$,.cc,<CR>
" Uncomment the following to have Vim jump to the last position when " Uncomment the following to have Vim jump to the last position when
" reopening a file " reopening a file
if has("autocmd") if has("autocmd")
@ -132,10 +134,6 @@ if has("autocmd")
endif endif
" Indentation
set shiftwidth=8
set softtabstop=8
if has("gui_running") if has("gui_running")
" GUI is running or is about to start. " GUI is running or is about to start.
" Maximize gvim window. " Maximize gvim window.
@ -149,7 +147,8 @@ if has("gui_running")
set guioptions-=r "remove right-hand scroll bar set guioptions-=r "remove right-hand scroll bar
set guioptions-=L "remove left-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=Fira\ Mono\ 10
"set guifont=Source\ Code\ Pro\ 10 "set guifont=Source\ Code\ Pro\ 10
"set guifont=Terminus\ 11 "set guifont=Terminus\ 11
@ -173,7 +172,7 @@ inoremap <C-t> <Esc>:tabnew<CR>
" YouCompleteMe " YouCompleteMe
let g:ycm_add_preview_to_completeopt=0 let g:ycm_add_preview_to_completeopt=0
let g:ycm_confirm_extra_conf=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 completeopt-=preview
set ssop-=options " do not store global and local values in a session 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 *.js %s/\s\+$//e
autocmd BufWritePre *.cpp %s/\s\+$//e autocmd BufWritePre *.cpp %s/\s\+$//e
" Indentation
set tabstop=4 set tabstop=4
set softtabstop=0 set softtabstop=0
set expandtab set expandtab
@ -230,3 +230,7 @@ augroup lexical
autocmd FileType textile call lexical#init() autocmd FileType textile call lexical#init()
autocmd FileType text call lexical#init({ 'spell': 0 }) autocmd FileType text call lexical#init({ 'spell': 0 })
augroup END augroup END
"let g:ale_linters = {
""\ 'cpp': ['cppcheck'],
""\}