From cff3e112efbd796e7c461895731a22dfdaf23972 Mon Sep 17 00:00:00 2001 From: Tine Jozelj Date: Sun, 21 Mar 2021 08:23:10 +0100 Subject: [PATCH] another package manager --- tmux/tmux.conf | 10 ++++++++++ vim/vimrc | 23 +++++++++++++---------- zsh/zshrc | 3 ++- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 59d542a..a4e827b 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -36,3 +36,13 @@ bind-key -T copy-mode-vi 'V' send -X rectangle-toggle bind-key -T copy-mode-vi 'y' send -X copy-selection bind-key -T copy-mode-vi Enter send -X copy-selection bind p paste-buffer + +# Plugins +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin "arcticicestudio/nord-tmux" + +## Install TPM if it's not yet installed +if "test ! -d ~/.tmux/plugins/tpm" \ + "run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'" +run '~/.tmux/plugins/tpm/tpm' + diff --git a/vim/vimrc b/vim/vimrc index 7edc3ac..82a00c2 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -9,14 +9,17 @@ autocmd VimEnter * if len(filter(values(g:plugs), '!isdirectory(v:val.dir)')) \| PlugInstall --sync | source $MYVIMRC \| endif -call plug#begin('~/.vim/plugged') "--- Plugins +call plug#begin('~/.vim/plugged') +Plug 'arcticicestudio/nord-vim' +Plug 'ojroques/vim-oscyank' Plug 'tpope/vim-fugitive' Plug 'airblade/vim-gitgutter' Plug 'vim-airline/vim-airline' Plug 'junegunn/fzf.vim' Plug 'preservim/nerdtree' +Plug 'ctrlpvim/ctrlp.vim' Plug 'editorconfig/editorconfig-vim' @@ -29,6 +32,8 @@ Plug 'jparise/vim-graphql' Plug 'kevinoid/vim-jsonc' Plug 'neoclide/coc.nvim', {'branch': 'release'} +call plug#end() +"--- CodeServer Configurations let g:coc_global_extensions = [ \ 'coc-tsserver', \ 'coc-prettier', @@ -43,9 +48,8 @@ if isdirectory('./node_modules') && isdirectory('./node_modules/eslint') let g:coc_global_extensions += ['coc-eslint'] endif "--- TMUX/Clipboard fixes -Plug 'ojroques/vim-oscyank' - set t_Co=256 +set t_ut= " Set Vim-specific sequences for RGB colors " Fixes 'termguicolors' usage in vim+tmux " :h xterm-true-color @@ -71,15 +75,14 @@ if exists('##TextYankPost') autocmd TextYankPost * silent! if v:event.operator ==# 'y' | call YankOSC52(join(v:event["regcontents"],"\n")) | endif augroup END endif -"--- Themes -set t_ut= -Plug 'arcticicestudio/nord-vim' +"--- VIM Configuration -"--- -call plug#end() - -:set number +"- Keybindings +let g:ctrlp_map = '' +let g:ctrlp_cmd = 'CtrlP' +"- Visuals +set number let g:nord_cursor_line_number_background = 1 let g:nord_underline = 1 let g:nord_italic = 1 diff --git a/zsh/zshrc b/zsh/zshrc index 11f5e08..4c42d51 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -27,7 +27,8 @@ kubectl () { KUBECTL_COMPLETE=1 fi } -source /usr/share/nvm/init-nvm.sh +export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # Starship export STARSHIP_CONFIG=~/.starship.toml