summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Coquand <marc@mccd.space>2024-07-16 14:37:42 -0500
committerMarc Coquand <marc@mccd.space>2024-07-16 14:37:42 -0500
commitbf3d786d0711b23d09ce2cd09f2b8bcb41196e72 (patch)
tree18c4cc3c3126a26129acea221818711407da33cc
parent0f7e6e7763774eb848b929b7cf1c6f8026e8fe49 (diff)
downloadbsd-bf3d786d0711b23d09ce2cd09f2b8bcb41196e72.tar.gz
bsd-bf3d786d0711b23d09ce2cd09f2b8bcb41196e72.tar.bz2
bsd-bf3d786d0711b23d09ce2cd09f2b8bcb41196e72.zip
Vim
-rw-r--r--vim/pack/downloads/opt/snippets/snippets.vim9
-rw-r--r--vimrc19
2 files changed, 17 insertions, 11 deletions
diff --git a/vim/pack/downloads/opt/snippets/snippets.vim b/vim/pack/downloads/opt/snippets/snippets.vim
index 92f0af7..40743b2 100644
--- a/vim/pack/downloads/opt/snippets/snippets.vim
+++ b/vim/pack/downloads/opt/snippets/snippets.vim
@@ -1,14 +1,17 @@
autocmd FileType go
- \ :iabbrev <buffer> err@ if err != nil {<CR><CR>}<Left><Up><Tab>
+ \ :iabbrev <buffer> err@ if err != nil {<CR><CR>}<Left><Up><tab>
autocmd FileType go
- \ :iabbrev <buffer> h@ <Backspace><Esc>^ifunc <Esc>A(c *gin.Context) {<CR><CR>}<Left><Up><Tab>
+ \ :iabbrev <buffer> h@ <Backspace><Esc>^ifunc <Esc>A(c *gin.Context) {<CR><CR>}<Left><Up><tab>
autocmd FileType go
- \ :iabbrev <buffer> t@ <Backspace><Esc>^ifunc <Esc>A(t *testing.T) {<CR><CR>}<Left><Up><Tab>
+ \ :iabbrev <buffer> t@ <Backspace><Esc>^ifunc <Esc>A(t *testing.T) {<CR><CR>}<Left><Up><tab>
autocmd FileType go
+ \ :iabbrev <buffer> s@ <Backspace><Esc>^itype <Esc>A struct {<CR><CR>}<Up><tab>
+
+autocmd FileType go
\ :iabbrev <buffer> f@ <Backspace><Esc>^ifunc <Esc>A() {<CR><CR>}<Esc><Up><Up>f(li
autocmd FileType go
diff --git a/vimrc b/vimrc
index a4a83fc..decc4ff 100644
--- a/vimrc
+++ b/vimrc
@@ -22,12 +22,14 @@ syntax on
set background=light
set termguicolors
colorscheme quiet
-hi Normal guifg=black guibg=#FFFFEA
+set t_Co=256
+set tgc
+hi Normal guifg=black guibg=#FEFFFA
""hi Keyword ctermfg=black cterm=bold
-hi SpellBad term=reverse term=underline guibg=#FFFFEA
-hi SpellCap term=reverse term=underline guibg=#FFFFEA
-hi SpellRare term=reverse term=underline guibg=#FFFFEA
-hi SpellLocal term=reverse term=underline guibg=#FFFFEA
+hi SpellBad term=reverse term=underline guibg=#FEFFFA
+hi SpellCap term=reverse term=underline guibg=#FEFFFA
+hi SpellRare term=reverse term=underline guibg=#FEFFFA
+hi SpellLocal term=reverse term=underline guibg=#FEFFFA
"" Cursor - switch between line and full when going to insert mode
let &t_SI = "\<Esc>[6 q"
@@ -162,14 +164,15 @@ autocmd Filetype markdown setlocal spell
" Keybindings
let mapleader=" "
noremap , :
+nnoremap é <C-o>
noremap <leader>e :e! **/*
-noremap <silent> gd mB:LspGotoDefinition<Enter>
+noremap <silent> gd :LspGotoDefinition<Enter>
noremap <silent> ]d :LspDiagNext<Enter>
noremap <silent> [d :LspDiagPrev<Enter>
noremap <silent> ]c :cnext<Enter>
noremap <silent> [c :cprev<Enter>
-noremap <silent> gs mB:LspDocumentSymbol<Enter>
-noremap <silent> gr mB:LspGotoImpl<Enter>
+noremap <silent> gs :LspDocumentSymbol<Enter>
+noremap <silent> gr :LspGotoImpl<Enter>
noremap <leader>ca :LspCodeAction<Enter>
noremap <leader>cr :LspRename<Enter>
noremap <leader>m :make<Enter>