From 63919a2fee0f7a41a5f3dd6b89def7847aa42cae Mon Sep 17 00:00:00 2001 From: Max Richter Date: Mon, 30 Nov 2020 12:55:23 +0100 Subject: [PATCH] some changes --- configs/.bashrc | 2 ++ configs/.zshrc | 16 +++++++++++++--- configs/init.vim | 10 ++++++++-- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/configs/.bashrc b/configs/.bashrc index 5546007..87d5e11 100644 --- a/configs/.bashrc +++ b/configs/.bashrc @@ -125,3 +125,5 @@ alias vim='nvim' alias vim='nvim' alias vim='nvim' alias vim='nvim' + +[[ -s "/home/jim/.gvm/scripts/gvm" ]] && source "/home/jim/.gvm/scripts/gvm" diff --git a/configs/.zshrc b/configs/.zshrc index b393663..7ca7194 100644 --- a/configs/.zshrc +++ b/configs/.zshrc @@ -6,7 +6,6 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]] fi ZSH_THEME="powerlevel10k/powerlevel10k" - plugins=( git zsh-autosuggestions @@ -27,10 +26,21 @@ source $HOME/.dotfiles/configs/zsh/aliases.sh ## LOADING PROGRAMS export PATH="$PATH:$HOME/.yarn/bin" export PATH="$PATH:$HOME/.local/bin" -export PATH="$PATH:$HOME/go/bin" + +## GO STUFF +export GOROOT="/usr/local/bin/go" +export GOPATH="$HOME/go" +export PATH="$PATH:/usr/local/go/bin:$GOPATH/bin" [[ -s $(which direnv) ]] && eval "$(direnv hook zsh)" +if [ -s "$HOME/.pyenv" ]; then + export PYENV_ROOT="$HOME/.pyenv" + export PATH="$PYENV_ROOT/bin:$PATH" + eval "$(pyenv init -)" +fi + + #Java version manager export SDKMAN_DIR="$HOME/.sdkman" [[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" @@ -39,7 +49,7 @@ export SDKMAN_DIR="$HOME/.sdkman" [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh # Go version manager -[[ -s "/$HOME/.gvm/scripts/gvm" ]] && source "/$HOME/.gvm/scripts/gvm" +#[[ -s "/$HOME/.gvm/scripts/gvm" ]] && source "/$HOME/.gvm/scripts/gvm" # Node Version manager export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" diff --git a/configs/init.vim b/configs/init.vim index 8c4671e..dd46eb6 100644 --- a/configs/init.vim +++ b/configs/init.vim @@ -28,6 +28,7 @@ Plug 'tpope/vim-sensible' Plug 'tpope/vim-surround' Plug 'majutsushi/tagbar' Plug 'scrooloose/nerdtree' +Plug 'Xuyuanp/nerdtree-git-plugin' Plug 'scrooloose/nerdcommenter' Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } Plug 'deoplete-plugins/deoplete-jedi' @@ -48,14 +49,19 @@ Plug 'SirVer/ultisnips' Plug 'honza/vim-snippets' Plug 'metakirby5/codi.vim' Plug 'dkarter/bullets.vim' +Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } + +Plug 'HerringtonDarkholme/yats.vim' +Plug 'mhartington/nvim-typescript', {'do': './install.sh'} + " Entertainment -"Plug 'ryanss/vim-hackernews' +" Plug 'ryanss/vim-hackernews' call plug#end() """ Python3 VirtualEnv -let g:python3_host_prog = '/usr/bin/python3' +" let g:python3_host_prog = '/usr/bin/python3' """ Coloring syntax on