Update vim

This commit is contained in:
Marco Thomas
2021-01-20 23:35:41 +01:00
parent a979879fdc
commit e54a06fbed
4 changed files with 34 additions and 19 deletions

View File

@@ -1,11 +1,9 @@
# _ _ _ _ # __ _ _ _ _
# | | (_) | | | # / /_ _| | __ _ ___ _ __(_) |_| |_ _ _
# __ _| | __ _ ___ _ __ _| |_| |_ _ _ # / / _` | |/ _` |/ __| '__| | __| __| | | |
# / _` | |/ _` |/ __| '__| | __| __| | | | # _ / / (_| | | (_| | (__| | | | |_| |_| |_| |
# | (_| | | (_| | (__| | | | |_| |_| |_| | # (_)_/ \__,_|_|\__,_|\___|_| |_|\__|\__|\__, |
# \__,_|_|\__,_|\___|_| |_|\__|\__|\__, | # |___/
# __/ |
# |___/
# #
# ~ M. Thomas # ~ M. Thomas
@@ -33,7 +31,7 @@ font:
normal: normal:
family: FiraCode Nerd Font Mono family: FiraCode Nerd Font Mono
style: Regular style: Regular
size: 10 size: 9
colors: colors:
primary: primary:
@@ -70,7 +68,7 @@ colors:
cyan: '#56B6C2' cyan: '#56B6C2'
white: '#D8D8D8' white: '#D8D8D8'
background_opacity: 1 background_opacity: 0.98
selection: selection:
save_to_clipboard: true save_to_clipboard: true

View File

@@ -1,3 +1,13 @@
# ___ _____
# / (_)___ /
# / /| | |_ \
# _ / / | |___) |
# (_)_/ |_|____/
#
# ~ M. Thomas
# ============================== General Setup
# Set Mod Keys # Set Mod Keys
set $mod Mod4 set $mod Mod4
floating_modifier $mod floating_modifier $mod

View File

@@ -4,7 +4,7 @@ set synctex-editor-command "nvr --remote +%{line} %{input}"
map d recolor true map d recolor true
map w recolor false map w recolor false
set recolor true set recolor false
#set notification-error-bg "#FC2929" #set notification-error-bg "#FC2929"
#set notification-error-fg "#18191E" #set notification-error-fg "#18191E"

View File

@@ -14,13 +14,14 @@ call plug#begin()
Plug 'joshdick/onedark.vim' " color scheme Plug 'joshdick/onedark.vim' " color scheme
Plug 'tpope/vim-sleuth' " intendations Plug 'tpope/vim-sleuth' " auto file-specific intendations
Plug 'jiangmiao/auto-pairs' " pair completion Plug 'jiangmiao/auto-pairs' " pair completion
Plug 'airblade/vim-gitgutter' " git Plug 'airblade/vim-gitgutter' " git
Plug 'itchyny/lightline.vim' " bar Plug 'itchyny/lightline.vim' " bar
Plug 'mengelbrecht/lightline-bufferline' " bufferline
Plug 'ryanoasis/vim-devicons' " icons in bar Plug 'ryanoasis/vim-devicons' " icons in bar
if executable("fzf") if executable("fzf")
@@ -54,6 +55,7 @@ set ruler
set showmatch " highlights paranthesis set showmatch " highlights paranthesis
set mat=5 set mat=5
set colorcolumn=1337
set noswapfile " can be problematic on some systems set noswapfile " can be problematic on some systems
set confirm " can't quit without saving set confirm " can't quit without saving
set noshowmode " don't show mode in status set noshowmode " don't show mode in status
@@ -67,6 +69,7 @@ set scrolloff=5 " min lines above or below the cursor
" ============================== Statusline " ============================== Statusline
set laststatus=2 set laststatus=2
set showtabline=2
function! GitStatus() function! GitStatus()
let [a,m,r] = GitGutterGetHunkSummary() let [a,m,r] = GitGutterGetHunkSummary()
@@ -74,22 +77,26 @@ function! GitStatus()
endfunction endfunction
function! FileNameWithIcon() abort function! FileNameWithIcon() abort
return winwidth(0) > 70 ? WebDevIconsGetFileTypeSymbol() . ' ' . expand('%:t') : '' return winwidth(0) > 70 ? WebDevIconsGetFileTypeSymbol() . ' ' . expand('%:T') : ''
endfunction endfunction
let g:lightline = { let g:lightline = { 'colorscheme': 'one' }
\ 'colorscheme': 'onedark',
\ }
let g:lightline.component_function = { 'gitstatus': 'GitStatus' } let g:lightline.component_function = { 'gitstatus': 'GitStatus' }
let g:lightline.component = { 'filename_with_icon': '%{FileNameWithIcon()}' } let g:lightline.component = { 'filename_with_icon': '%{FileNameWithIcon()}' }
let g:lightline.active = { let g:lightline.active = {
\ 'left': [['mode', 'readonly'], ['filename_with_icon', 'modified'], ['gitstatus']], \ 'left': [['mode', 'readonly'], ['filename_with_icon', 'modified']],
\ 'right': [['lineinfo'], ['percent'], ['fileformat', 'fileencoding', 'filetype']] \ 'right': [['lineinfo'], ['percent'], ['gitstatus', 'fileformat', 'fileencoding', 'filetype']]
\ } \ }
let g:lightline.subseparator = { 'left': '|', 'right': '|' } let g:lightline.subseparator = { 'left': '', 'right': '' }
let g:lightline.separator = { 'left': '', 'right': '' }
" tab bar
let g:lightline.tabline = {'left': [['buffers']]}
let g:lightline.component_expand = {'buffers': 'lightline#bufferline#buffers'}
let g:lightline.component_type = {'buffers': 'tabsel'}
" ============================== Indents and Whitespaces " ============================== Indents and Whitespaces
set list set list