Merge branch 'master' into babel

coc-settings.json

@@ -8,6 +8,11 @@
 		"latex": {
 			"command": "/sbin/texlab",
 			"filetypes": [ "tex","bib","plaintex","context" ]
+		},
+		"bash": {
+			"command": "bash-language-server",
+			"args": ["start"],
+			"filetypes": ["sh","bash"]
         },
 		"golang": {
 			"command": "gopls",

init.vim

@@ -21,7 +21,6 @@ Plug 'antoyo/vim-licenses'
 Plug 'flazz/vim-colorschemes'
 Plug 'xiyaowong/transparent.nvim'
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
-Plug 'github/copilot.vim', {'branch': 'release'}
 call plug#end()
 filetype plugin indent on
 " to ignore plugin indent changes, instead use:
@@ -29,9 +28,9 @@ filetype plugin on
 
 """ General
 " indentation
-set tabstop=2                " tabs only count for 4 spaces
+set tabstop=4                " tabs only count for 4 spaces
-set shiftwidth=2             " when indenting use 4 spaces
+set shiftwidth=4             " when indenting use 4 spaces
-set expandtab                " don't use tab characters
+set expandtab              " use tab characters
 set autoindent
 
 " view
@@ -103,12 +102,8 @@ nmap <silent><nowait> gr <Plug>(coc-references)
 " syntax highlighting
 syntax on
 set background=dark
+highlight Normal ctermbg=none
 colorscheme solarized8_dark
-highlight Normal ctermbg=none
-highlight Normal guibg=none
-highlight NonText guibg=none
-highlight Normal ctermbg=none
-highlight NonText ctermbg=none
 
 """ Project-Specific Settings
 
@@ -165,7 +160,3 @@ nnoremap <leader>f :Files<CR>
 nnoremap <leader>F :tabnew<CR>:Files<CR>
 nnoremap <leader>g :GFiles<CR>
 nnoremap <leader>G :tabnew<CR>:GFiles<CR>
-
-" Copilot
-imap <silent><script><expr> <C-J> copilot#Accept("\<CR>")
-let g:copilot_no_tab_map = v:true