diff --git a/config/.config/nvim/lua/treesitter.lua b/config/.config/nvim/lua/treesitter.lua new file mode 100644 index 0000000..26fdf8b --- /dev/null +++ b/config/.config/nvim/lua/treesitter.lua @@ -0,0 +1,20 @@ +require('nvim-treesitter.configs').setup { + -- A list of parser names, or "all" + ensure_installed = { "c", "lua", "vim", "java", "kotlin"}, + + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + + highlight = { + -- `false` will disable the whole extension + enable = true, + + disable = {"java"}, + + -- Setting this to true will run `:h syntax` and tree-sitter at the same time. + -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). + -- Using this option may slow down your editor, and you may see some duplicate highlights. + -- Instead of true it can also be a list of languages + additional_vim_regex_highlighting = false, + }, +} diff --git a/tmux/.tmux/osiris-theme.conf b/tmux/.tmux/osiris-theme.conf index 439c633..54beaf8 100644 --- a/tmux/.tmux/osiris-theme.conf +++ b/tmux/.tmux/osiris-theme.conf @@ -68,18 +68,16 @@ set -g message-command-style bg=brightblack,fg=cyan set -g status-style fg=white,bg=black set -g status-left '#{?pane_synchronized, ¤ ,}#{?window_zoomed_flag, ↕ ,}' -set -g status-right '#H' set -g status-right "#{cpu_bg_color}#{cpu_fg_color} CPU:#{cpu_percentage} #{fg=black}$right_alt_sep#{ram_fg_color}#{ram_bg_color} RAM:#{ram_percentage} #{ram_bg_color} #[fg=black]$right_sep#[fg=default]#[bg=default] #H" set -g status-right-length 55 - set -g pane-border-style fg=brightblack,bg=black set -g pane-active-border-style fg=colour104,bg=black set-window-option -g window-status-style fg=colour104,bg=default set-window-option -g window-status-current-style fg=colour147,bg=default set-window-option -g window-status-activity-style bg=default,fg=yellow -set-window-option -g window-status-separator "#[fg=colour104]#[bg=default]$left_alt_sep" +set-window-option -g window-status-separator " #[fg=colour104]#[bg=default]$left_alt_sep " # Custom styling, http://www.hamvocke.com/blog/a-guide-to-customizing-your-tmux-conf/ diff --git a/tmux/.tmuxinator/dev.yml b/tmux/.tmuxinator/dev.yml index fa49b56..61b3022 100644 --- a/tmux/.tmuxinator/dev.yml +++ b/tmux/.tmuxinator/dev.yml @@ -2,25 +2,27 @@ name: dev windows: - - main: + - gmscore: layout: 02a8,363x89,0,0[363x74,0,0,14,363x14,0,75{181x14,0,75,15,181x14,182,75,17}] panes: - main: - - cd ~/ + - hgd gmscore + - vim -S ~/.sessions/gmscore.vim - other: - - cd ~/ + - hgd gmscore - other2: - - cd ~/ + - hgd gmscore - - secondary: + - experimental: layout: 02a8,363x89,0,0[363x74,0,0,14,363x14,0,75{181x14,0,75,15,181x14,182,75,17}] panes: - main: - - cd ~/ + - hgd experimental + - vim -S ~/.sessions/experimental.vim - other: - - cd ~/ + - hgd experimental - other2: - - cd ~/ + - hgd experimental - notes: layout: 02a8,363x89,0,0[363x74,0,0,14,363x14,0,75{181x14,0,75,15,181x14,182,75,17}] panes: @@ -34,3 +36,13 @@ windows: - other2: - hgd notes - cd ../company/users/cnieves/ + - vim: + layout: 02a8,363x89,0,0[363x74,0,0,14,363x14,0,75{181x14,0,75,15,181x14,182,75,17}] + panes: + - main: + - cd ~/.vim/prefs + - vim -S ~/.sessions/vim.vim + - other: + - cd ~/.vim/prefs + - other2: + - cd ~/.vim/prefs diff --git a/vim/.vim/prefs/init.vim b/vim/.vim/prefs/init.vim deleted file mode 100644 index e69de29..0000000 diff --git a/vim/.vim/prefs/plugins.vim b/vim/.vim/prefs/plugins.vim index 8fa6aee..8ebf266 100644 --- a/vim/.vim/prefs/plugins.vim +++ b/vim/.vim/prefs/plugins.vim @@ -14,6 +14,8 @@ Plug 'onsails/lspkind.nvim' " required only for diagnostics Plug 'folke/trouble.nvim' +Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} + " UI EXTENSIONS Plug 'ntpeters/vim-better-whitespace' "auto-set tab/space size Plug 'junegunn/fzf.vim' @@ -21,7 +23,7 @@ Plug 'vim-airline/vim-airline' " ... Plug 'nathanaelkane/vim-indent-guides' Plug 'Konfekt/vim-scratchpad' Plug 'guns/xterm-color-table.vim' -" Plug 'kyazdani42/nvim-web-devicons' +Plug 'kyazdani42/nvim-web-devicons' " Plug 'ryanoasis/vim-devicons' " INTEGRATION diff --git a/vim/.vimrc b/vim/.vimrc index b5b8c47..cfcabb3 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -60,16 +60,17 @@ set scrolloff=3 " Minumum lines to keep above and below cursor " makes sure that when opening, files are normal, i.e. not folded. set nofoldenable +set foldmethod=syntax let g:clipboard = #{ \ name: 'xsel', \ copy: { - \ '+': ['xclip', '--nodetach', '-i', '-b'], - \ '*': ['xclip', '--nodetach', '-i', '-p'], + \ '+': ['xsel', '--nodetach', '-i', '-b'], + \ '*': ['xsel', '--nodetach', '-i', '-p'], \ }, \ paste: { - \ '+': ['xclip', '-o', '-b'], - \ '*': ['xclip', '-o', '-p'], + \ '+': ['xsel', '-o', '-b'], + \ '*': ['xsel', '-o', '-p'], \ }, \ cache_enabled: 1, \ } @@ -79,7 +80,6 @@ set updatetime=100 call plug#begin('~/.vim/plugged') source ~/.vim/prefs/plugins.vim - source ~/.vim/prefs/init.vim if filereadable(expand("~/.vimrc.local")) source ~/.vim/prefs/google.vim endif @@ -96,6 +96,18 @@ call plug#begin('~/.vim/plugged') " source ~/.vim/prefs/ycm.vim call plug#end() " required +" Require CiderLSP and Diagnostics modules +" IMPORTANT: Must come after plugins are loaded +lua << EOF + -- CiderLSP + vim.opt.completeopt = { "menu", "menuone", "noselect" } + + require 'lspconfig' + require("lsp") + require("diagnostics") + require("treesitter") + +EOF source ~/.vim/prefs/cmp.vim source ~/.vim/prefs/google_comments.vim " source ~/.vim/prefs/ale.vim diff --git a/zsh/.bash_profile.local b/zsh/.bash_profile.local index 82f0303..b9957ec 100644 --- a/zsh/.bash_profile.local +++ b/zsh/.bash_profile.local @@ -2,6 +2,7 @@ # Google Specific # --------------- # For running crow against a remote X server +xhost + export PATH=$PATH:/google/src/head/depot/google3/experimental/users/cnieves/util export XAUTHORITY=~/.Xauthority export GOROOT=/usr/lib/google-golang