Merge branch 'main' into single-monitor

This commit is contained in:
Andrew Scott 2022-04-03 22:25:21 -04:00
commit d68ca64c0c
Signed by: a
GPG key ID: 3EB62D0BBB8DB381
3 changed files with 96 additions and 17 deletions

View file

@ -0,0 +1,41 @@
# https://github.com/sainnhe/everforest
# https://gist.github.com/sophiabrandt/f013c5980b5f89cd068d8f7f47da2e1c
foreground #d8cacc
background #323d43
selection_foreground #3c474d
selection_background #525c62
url_color #415c6d
cursor #7fbbb3
# black
color0 #4a555b
color8 #525c62
# red
color1 #e68183
color9 #e68183
# green
color2 #a7c080
color10 #a7c080
# yellow
color3 #dbbc7f
color11 #dbbc7f
# blue
color4 #7fbbb3
color12 #7fbbb3
# magenta
color5 #d699b6
color13 #d699b6
# cyan
color6 #83c092
color14 #83c092
# white
color7 #d8caac
color15 #d8caac

View file

@ -1,8 +1,15 @@
" set leader key " set leader key
let g:mapleader = "\<Space>" let g:mapleader = "\<Space>"
" vim hardcodes background color erase even if the terminfo file does
" not contain bce (not to mention that libvte based terminals
" incorrectly contain bce in their terminfo files). This causes
" incorrect background rendering when using a color theme with a
" background color.
let &t_ut=''
syntax enable " Enables syntax highlighing syntax enable " Enables syntax highlighing
set hidden " Required to keep multiple buffers open multiple buffers set hidden " Required to keep multiple buffers open
set nowrap " Display long lines as just one line set nowrap " Display long lines as just one line
set encoding=utf-8 " The encoding displayed set encoding=utf-8 " The encoding displayed
set pumheight=10 " Makes popup menu smaller set pumheight=10 " Makes popup menu smaller
@ -40,18 +47,49 @@ au! BufWritePost $MYVIMRC source % " auto source when writing to init.vim a
" You can't stop me " You can't stop me
cmap w!! w !sudo tee % cmap w!! w !sudo tee %
" neovim-plug-git "" Plugins
" Install neovim-plug-git from AUR
call plug#begin() call plug#begin()
Plug 'preservim/nerdtree', { 'on': 'NERDTreeToggle' } " A fuzzy file finder
Plug 'Raimondi/delimitMate' Plug 'kien/ctrlp.vim'
"Plug 'morhetz/gruvbox' " Comment/Uncomment tool
"Plug 'ryanoasis/vim-devicons' Plug 'scrooloose/nerdcommenter'
"Plug 'neovim/nvim-lsp' " Switch to the begining and the end of a block by pressing %
"Plug 'jackguo380/vim-lsp-cxx-highlight' Plug 'tmhedberg/matchit'
" A Tree-like side bar for better navigation
Plug 'scrooloose/nerdtree'
" A cool status bar
Plug 'vim-airline/vim-airline'
" Airline themes
Plug 'vim-airline/vim-airline-themes'
" Better syntax-highlighting for filetypes in vim
Plug 'sheerun/vim-polyglot'
" Intellisense engine
Plug 'neoclide/coc.nvim', {'branch': 'release'}
" Git integration
Plug 'tpope/vim-fugitive'
" Auto-close braces and scopes
Plug 'jiangmiao/auto-pairs'
""Themes
" Everforest theme
Plug 'sainnhe/everforest'
" Nord
"Plug 'arcticicestudio/nord-vim'
call plug#end() call plug#end()
" Theme " Important!!
"colorscheme gruvbox if has('termguicolors')
set termguicolors
endif
" Set contrast.
" This configuration option should be placed before `colorscheme everforest`.
" Available values: 'hard', 'medium'(default), 'soft'
let g:everforest_background = 'medium'
" For better performance
let g:everforest_better_performance = 1
colorscheme everforest
" plug-in autostart " plug-in autostart
"augroup nerdtree_open "augroup nerdtree_open

View file

@ -283,12 +283,12 @@
:after lsp-mode :after lsp-mode
:commands dap-debug :commands dap-debug
:config :config
((dap-ui-mode 1) (dap-ui-mode 1)
(dap-tooltip-mode 1) (dap-tooltip-mode 1)
(eval-when-compile (eval-when-compile
(require 'cl-lib)) (require 'cl-lib))
(require 'dap-python) (require 'dap-python)
(require 'dap-node))) (require 'dap-node))
(use-package company (use-package company
:config :config