[2024-08-14] Clean up .vimrc and init.vim

This commit is contained in:
Andrew Conlin 2024-08-14 11:03:47 +01:00 committed by Andrew Conlin
parent 69b3e94577
commit 89e99d1128
2 changed files with 22 additions and 38 deletions

View File

@ -3,12 +3,7 @@ let &packpath=&runtimepath
source ~/.vimrc source ~/.vimrc
call plug#begin() call plug#begin()
"Plug 'morhetz/gruvbox'
Plug 'ellisonleao/gruvbox.nvim' Plug 'ellisonleao/gruvbox.nvim'
"Plug 'vim-airline/vim-airline'
"Plug 'vim-airline/vim-airline-themes'
"Plug 'ghifarit53/tokyonight-vim'
"Plug 'airblade/vim-gitgutter'
Plug 'folke/tokyonight.nvim' Plug 'folke/tokyonight.nvim'
Plug 'nvim-lua/plenary.nvim' Plug 'nvim-lua/plenary.nvim'
Plug 'nvim-tree/nvim-web-devicons' Plug 'nvim-tree/nvim-web-devicons'
@ -16,21 +11,8 @@ Plug 'MunifTanjim/nui.nvim'
Plug 'nvim-neo-tree/neo-tree.nvim', { 'branch': 'v3.x' } Plug 'nvim-neo-tree/neo-tree.nvim', { 'branch': 'v3.x' }
Plug 'lewis6991/gitsigns.nvim' " OPTIONAL: for git status Plug 'lewis6991/gitsigns.nvim' " OPTIONAL: for git status
Plug 'nvim-tree/nvim-web-devicons' " OPTIONAL: for file icons Plug 'nvim-tree/nvim-web-devicons' " OPTIONAL: for file icons
"Plug 'romgrk/barbar.nvim'
Plug 'freddiehaddad/feline.nvim' Plug 'freddiehaddad/feline.nvim'
"Plug 'epwalsh/obsidian.nvim'
"Plug 'hrsh7th/nvim-cmp'
Plug 'neovim/nvim-lspconfig' Plug 'neovim/nvim-lspconfig'
"Plug 'hrsh7th/cmp-nvim-lsp'
"Plug 'hrsh7th/cmp-buffer'
"Plug 'hrsh7th/cmp-path'
"Plug 'hrsh7th/cmp-cmdline'
"Plug 'hrsh7th/nvim-cmp'
" For vsnip users.
"Plug 'hrsh7th/cmp-vsnip'
"Plug 'hrsh7th/vim-vsnip'
"Plug 'rafamadriz/friendly-snippets'
"Plug 'mathworks/MATLAB-extension-for-vscode'
" main one " main one
Plug 'ms-jpq/coq_nvim', {'branch': 'coq'} Plug 'ms-jpq/coq_nvim', {'branch': 'coq'}
" 9000+ Snippets " 9000+ Snippets
@ -41,28 +23,16 @@ Plug 'justinhj/battery.nvim'
Plug 'MunifTanjim/nui.nvim' Plug 'MunifTanjim/nui.nvim'
Plug 'rcarriga/nvim-notify' Plug 'rcarriga/nvim-notify'
Plug 'folke/noice.nvim' Plug 'folke/noice.nvim'
"Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app && npx --yes yarn install' }
Plug 'luukvbaal/statuscol.nvim' Plug 'luukvbaal/statuscol.nvim'
"Plug 'linrongbin16/lsp-progress.nvim'
call plug#end() call plug#end()
set bg=dark
colo default
"let g:airline_theme = 'gruvbox'
"let g:airline_powerline_fonts = 1
set noshowmode set noshowmode
if exists("g:neovide") if exists("g:neovide")
set guifont=GeistMono_Nerd_Font:h10:cANSI:qDRAFT set guifont=GeistMono_Nerd_Font:h10:cANSI:qDRAFT
endif endif
"set updatetime=100
"set signcolumn=yes:1
"let &stc='%s%=%{v:relnum?v:relnum:v:lnum} '
set laststatus=3 set laststatus=3
set spell
" .config/nvim/lua/init.lua " .config/nvim/lua/init.lua
lua require('init') lua require('init')

View File

@ -5,6 +5,10 @@ filetype indent on
syntax on syntax on
set cursorline set cursorline
set cursorcolumn set cursorcolumn
set nospell
" disable wrapping
set nowrap
" relative line numbers " relative line numbers
set number set number
@ -12,20 +16,30 @@ set relativenumber
" colours " colours
set termguicolors set termguicolors
colo tokyonight set bg=dark
colo quiet
highlight Keyword gui=bold
highlight Comment gui=italic
highlight Constant guifg=#999999
highlight NormalFloat guibg=#333333
highlight CursorLineNr guibg=NONE gui=bold
""" MARKDOWN
" have j and k navigate visual lines rather than logical ones in markdown " have j and k navigate visual lines rather than logical ones in markdown
autocmd FileType markdown nmap <buffer> j gj " wrap text and split on words
autocmd FileType markdown nmap <buffer> k gk " turn spell check on
autocmd FileType markdown
\nmap <buffer> j gj|
\nmap <buffer> k gk|
\setlocal wrap|
\setlocal linebreak|
\setlocal nolist|
\setlocal spell|
\setlocal spelllang=en_gb|
" use H and L for beginning/end of line " use H and L for beginning/end of line
map H ^ map H ^
map L $ map L $
" wrap text and split on words
set wrap
set linebreak
set nolist
set shiftwidth=4 set shiftwidth=4
set tabstop=4 set tabstop=4