diff --git a/tmux/tmux.conf b/tmux/tmux.conf index a4e827b..78d1fa9 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -37,12 +37,33 @@ 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 +# Theme + +# Default colors +set-option -g status-style fg=colour238,bg=colour255 + +# Window titles +set-window-option -g window-status-style fg=default,bg=default +set-window-option -g window-status-current-style fg=black,bold,bg=default +set-window-option -g window-status-activity-style fg=default,noreverse,bg=default + +# Pane borders +set-option -g pane-border-style fg=colour250,bg=default +set-option -g pane-active-border-style fg=colour75,bg=default + +# Message text +set-option -g message-style fg=colour75,bg=default +set-option -g message-command-style fg=colour35,bg=default + +# Copy mode +set-window-option -g mode-style fg=default,bg=colour250 + +# Clock mode +set-window-option -g clock-mode-colour colour75 +set-window-option -g clock-mode-style 24 + # 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' +set-option -g @prefix_highlight_fg 'colour255' +set-option -g @prefix_highlight_bg 'colour75' +set-option -g @prefix_highlight_copy_mode_attr 'fg=colour255,bg=colour176' diff --git a/vim/coc-settings.json b/vim/coc-settings.json index c248fc4..52752fa 100644 --- a/vim/coc-settings.json +++ b/vim/coc-settings.json @@ -1,4 +1,12 @@ { + "languageserver": { + "terraform": { + "command": "terraform-ls", + "filetypes": ["terraform", "tf"], + "initializationOptions": {}, + "settings": {} + } + }, "eslint.autoFixOnSave": true, "eslint.filetypes": [ "javascript", @@ -11,12 +19,14 @@ "javascript", "javascriptreact", "typescript", - "typescriptreact" +"typescriptreact", +"json", + "graphql" ], "tsserver.formatOnType": true, "coc.preferences.formatOnType": true, "yaml.schemaStore.enable": true, "yaml.schemas": { - "kubernetes": "/*.yaml" +"kubernetes": "/*.yaml" } } diff --git a/vim/vimrc b/vim/vimrc index 0f7f623..2430610 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -77,11 +77,7 @@ if exists('##TextYankPost') augroup END endif "--- VIM Configuration - -"- NERDTree -" Start NERDTree when Vim is started without file arguments. -autocmd StdinReadPre * let s:std_in=1 -autocmd VimEnter * if argc() == 0 && !exists('s:std_in') | NERDTree | endif +command! -nargs=0 Prettier :CocCommand prettier.formatFile "- Keybindings let g:ctrlp_map = ''