summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian T <julian@jtle.dk>2021-01-28 23:57:33 +0100
committerJulian T <julian@jtle.dk>2021-01-28 23:57:33 +0100
commit78d50457a6497bf75ec5600edb60d4835e7d770e (patch)
tree8dc8b48271629a8cf09d9018d77bc5679201c5c6
parent398cc9d2b4c0008c373799d47579ff21c9ce58a1 (diff)
Vim and shell changed
-rw-r--r--vim-core/.vim/vimrc8
-rw-r--r--vim-extra/.vim/extra.vim13
-rw-r--r--zsh/.zshrc3
3 files changed, 18 insertions, 6 deletions
diff --git a/vim-core/.vim/vimrc b/vim-core/.vim/vimrc
index 70f3382..60b2e6b 100644
--- a/vim-core/.vim/vimrc
+++ b/vim-core/.vim/vimrc
@@ -98,16 +98,18 @@ filetype plugin indent on " required
map <leader>mm :make V=1<CR>
map <leader>mf :make flash V=1<CR>
+" Style enforcement
+ autocmd FileType go setlocal noet
+
" Enforcing filetypes
autocmd BufRead,BufNewFile *.ino set filetype=c
autocmd BufRead,BufNewFile *.asc set filetype=asciidoc
autocmd BufRead,BufNewFile *.nix set filetype=nix
+ autocmd BufRead,BufNewFile *.tsx set filetype=typescript
+
" Highlightning And colors
set termguicolors
- " let g:one_allow_italics = 1
- let g:gruvbox_italic = 1
- colorscheme gruvbox
" Spell check
diff --git a/vim-extra/.vim/extra.vim b/vim-extra/.vim/extra.vim
index 716fed2..c2d7e21 100644
--- a/vim-extra/.vim/extra.vim
+++ b/vim-extra/.vim/extra.vim
@@ -21,7 +21,7 @@
Plugin 'tpope/vim-unimpaired'
Plugin 'tpope/vim-commentary'
- Plugin 'godlygeek/tabular'
+ "Plugin 'godlygeek/tabular'
" Editor config
Plugin 'sgur/vim-editorconfig'
@@ -35,13 +35,14 @@
" Plugin 'ntk148v/vim-horizon'
" Git
- Plugin 'tpope/vim-fugitive'
+ " Plugin 'tpope/vim-fugitive'
" File support
" Plugin 'cespare/vim-toml'
"Plugin 'lervag/vimtex'
" Plugin 'aklt/plantuml-syntax'
" Plugin 'LnL7/vim-nix'
+ Plugin 'dart-lang/dart-vim-plugin'
" Plugin 'vimwiki/vimwiki'
@@ -73,6 +74,9 @@
" let g:LanguageClient_setOmnifunc = 1
let g:LanguageClient_hoverPreview = "Never"
let g:LanguageClient_useVirtualText = "No"
+ let g:LanguageClient_loggingFile = "/tmp/lsp.log"
+ let g:LanguageClient_loggingLevel = "DEBUG"
+
" Setup lsp servers
let g:LanguageClient_serverCommands = {
@@ -81,4 +85,9 @@
\ 'python' : ['pyls'],
\ 'go' : ['gopls'],
\ 'rust' : ['rls'],
+ \ 'typescript' : ['tsserver'],
\ }
+
+ " let g:one_allow_italics = 1
+ let g:gruvbox_italic = 1
+ colorscheme gruvbox
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 316401a..774beef 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -90,6 +90,7 @@ export SUDO_EDITOR=$EDITOR
export TERM="xterm-256color"
export PATH=$PATH:$HOME/Scripts/bin
export PATH=$PATH:$HOME/go/bin
+export PATH=$PATH:$HOME/.local/bin
export WORDCHARS='*?.[]~=&;!#$%^(){}<>'
#
@@ -98,6 +99,7 @@ export WORDCHARS='*?.[]~=&;!#$%^(){}<>'
alias vim="$EDITOR"
alias ls='ls --color=auto'
alias etckeep="/usr/bin/git --git-dir=/etc/.git --work-tree=/etc/"
+alias vim="echo no"
#
# Functions
@@ -130,4 +132,3 @@ function goto {
echo cd $(</tmp/where)
fi
}
-