From 779b3ec1ed805a8ed980f5bcfeec79d66a8e45e6 Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Fri, 15 Sep 2023 12:19:16 -0400 Subject: [PATCH] Do some vim tweaks --- bash/.bashrc | 1 + nvim/.config/nvim/colors.vim | 4 +- nvim/.config/nvim/colors/jcs.vim | 66 ++++++++++++++++++++++ nvim/.config/{ => nvim}/colors/minimal.vim | 0 nvim/.config/nvim/completion.lua | 2 +- nvim/.config/nvim/init.vim | 6 +- nvim/.config/nvim/plugs.vim | 13 ++--- nvim/.config/nvim/rust.lua | 3 - tmuxinator/tmuxinator/infra.yml | 51 +++++++++++++++++ 9 files changed, 129 insertions(+), 17 deletions(-) create mode 100644 nvim/.config/nvim/colors/jcs.vim rename nvim/.config/{ => nvim}/colors/minimal.vim (100%) create mode 100644 tmuxinator/tmuxinator/infra.yml diff --git a/bash/.bashrc b/bash/.bashrc index 48f5b63..82e4214 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -59,6 +59,7 @@ function vim-resume { alias vim-res="vim-resume" alias vn="vim-new" alias vr="vim-resume" +alias talon="~/Install/talon/run.sh" # enable programmable completion features if ! shopt -oq posix; then diff --git a/nvim/.config/nvim/colors.vim b/nvim/.config/nvim/colors.vim index 4ce9226..32ecdc9 100644 --- a/nvim/.config/nvim/colors.vim +++ b/nvim/.config/nvim/colors.vim @@ -1,6 +1,8 @@ set termguicolors set background=light -colorscheme base16-grayscale-light +"colorscheme base16-grayscale-light +colorscheme quiet +"colorscheme minimal "colorscheme off "syntax off diff --git a/nvim/.config/nvim/colors/jcs.vim b/nvim/.config/nvim/colors/jcs.vim new file mode 100644 index 0000000..b2463ab --- /dev/null +++ b/nvim/.config/nvim/colors/jcs.vim @@ -0,0 +1,66 @@ +" vim:sw=8:ts=8 +" +" act like t_Co=0 but use (256) color on just a few things +" + +set background=light + +hi clear +if exists("syntax_on") + syntax reset +endif + +let colors_name = "jcs" + +hi Comment cterm=NONE ctermfg=242 +hi Constant cterm=underline ctermfg=NONE +hi CursorLineNr cterm=bold ctermfg=244 +hi DiffAdd cterm=bold ctermfg=NONE +hi DiffChange cterm=bold ctermfg=NONE +hi DiffDelete cterm=bold ctermfg=NONE +hi DiffText cterm=reverse ctermfg=NONE +hi Directory cterm=bold ctermfg=NONE +hi Error cterm=NONE ctermfg=NONE ctermbg=224 +hi ErrorMsg cterm=NONE ctermfg=NONE ctermbg=224 +hi FoldColumn cterm=standout ctermfg=NONE +hi Folded cterm=standout ctermfg=NONE +hi Identifier cterm=underline ctermfg=NONE +hi Ignore cterm=bold ctermfg=NONE +hi IncSearch cterm=reverse ctermfg=NONE +hi LineNr cterm=NONE ctermfg=248 +hi MatchParen cterm=bold ctermfg=none ctermbg=185 +hi ModeMsg cterm=bold ctermfg=NONE +hi MoreMsg cterm=bold ctermfg=NONE +hi NonText cterm=bold ctermfg=NONE +hi PreProc cterm=underline ctermfg=NONE +hi Pmenu cterm=NONE ctermfg=NONE ctermbg=253 +hi PmenuSel cterm=bold ctermfg=NONE ctermbg=253 +hi Question cterm=standout ctermfg=NONE +hi Search cterm=reverse ctermfg=NONE +hi SignColumn cterm=NONE ctermfg=NONE ctermbg=NONE +hi SpellBad cterm=NONE ctermfg=NONE ctermbg=224 +hi SpellLocal cterm=NONE ctermfg=NONE ctermbg=223 +hi Special cterm=bold ctermfg=NONE +hi SpecialKey cterm=bold ctermfg=NONE +hi Statement cterm=bold ctermfg=NONE +hi StatusLine cterm=bold,reverse ctermfg=NONE +hi StatusLineNC cterm=reverse ctermfg=NONE +hi TabLine cterm=reverse ctermfg=NONE ctermbg=NONE +hi Title cterm=bold ctermfg=NONE +hi Todo cterm=bold,standout ctermfg=185 ctermbg=0 +hi Type cterm=bold ctermfg=NONE +hi Underlined cterm=underline ctermfg=NONE +hi VertSplit cterm=reverse ctermfg=NONE +hi Visual cterm=reverse ctermfg=NONE ctermbg=NONE +hi VisualNOS cterm=bold,underline ctermfg=NONE +hi WarningMsg cterm=standout ctermfg=NONE +hi WildMenu cterm=standout ctermfg=NONE + +hi ColorColumn cterm=NONE ctermfg=NONE ctermbg=252 + +" for highlighting stray spaces/tabs (requires match statements in vimrc) +hi ExtraWhitespace cterm=reverse ctermfg=185 ctermbg=NONE + +" mostly for nerdtree +hi VertSplit cterm=bold ctermfg=240 ctermbg=NONE + diff --git a/nvim/.config/colors/minimal.vim b/nvim/.config/nvim/colors/minimal.vim similarity index 100% rename from nvim/.config/colors/minimal.vim rename to nvim/.config/nvim/colors/minimal.vim diff --git a/nvim/.config/nvim/completion.lua b/nvim/.config/nvim/completion.lua index b3e9417..82e022f 100644 --- a/nvim/.config/nvim/completion.lua +++ b/nvim/.config/nvim/completion.lua @@ -46,7 +46,7 @@ cmp.setup { }, sources = { { name = 'buffer' }, - -- { name = 'nvim_lsp' }, + { name = 'nvim_lsp' }, -- { name = 'spell' }, { name = 'path' }, }, diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index 6b67f52..a5a4e65 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -4,11 +4,11 @@ let $FZF_DEFAULT_COMMAND='rg --files --follow --hidden -g "!{node_modules/*,.git source $HOME/.config/nvim/plug/plug.vim source $HOME/.config/nvim/plugs.vim -" source $HOME/.config/nvim/treesitter.lua -" source $HOME/.config/nvim/rust.lua +"source $HOME/.config/nvim/treesitter.lua +source $HOME/.config/nvim/rust.lua source $HOME/.config/nvim/completion.lua -syntax off +"syntax off filetype plugin indent on "augroup filetypedetect " au! BufRead,BufNewFile *.hurl setfiletype hurl diff --git a/nvim/.config/nvim/plugs.vim b/nvim/.config/nvim/plugs.vim index 9335cec..af0e142 100644 --- a/nvim/.config/nvim/plugs.vim +++ b/nvim/.config/nvim/plugs.vim @@ -16,7 +16,7 @@ Plug 'tpope/vim-obsession' Plug 'tpope/vim-fugitive' " whose fault is it " Language support -" Plug 'nvim-treesitter/nvim-treesitter', { 'do': ':TSUpdate' } +Plug 'nvim-treesitter/nvim-treesitter', { 'do': ':TSUpdate' } " Plug 'ntietz/tla.vim' " Plug 'fatih/vim-go' " Plug 'pest-parser/pest.vim' @@ -26,7 +26,7 @@ Plug 'editorconfig/editorconfig-vim' " Make things real pretty " Plug 'flazz/vim-colorschemes' -Plug 'rafi/awesome-vim-colorschemes' +" Plug 'rafi/awesome-vim-colorschemes' " Completions <3 Plug 'hrsh7th/nvim-cmp', { 'branch': 'main' } @@ -35,9 +35,9 @@ Plug 'hrsh7th/cmp-buffer', { 'branch': 'main' } Plug 'L3MON4D3/LuaSnip', {'tag': 'v1.*'} " Rust support -" Plug 'simrat39/rust-tools.nvim' +Plug 'simrat39/rust-tools.nvim' -" Plug 'neovim/nvim-lspconfig' +Plug 'neovim/nvim-lspconfig' Plug 'nvim-lua/plenary.nvim' " Nice hovers @@ -48,9 +48,4 @@ Plug 'github/copilot.vim', { 'branch': 'release' } " Uncomment this line to disable copilot let g:copilot_enabled = 0 -Plug 'chriskempson/base16-vim' -Plug 'pbrisbin/vim-colors-off', { 'branch': 'main' } -Plug 'vim-scripts/zenesque.vim' -Plug 't184256/vim-boring' - call plug#end() diff --git a/nvim/.config/nvim/rust.lua b/nvim/.config/nvim/rust.lua index 8ac1601..70ad2dd 100644 --- a/nvim/.config/nvim/rust.lua +++ b/nvim/.config/nvim/rust.lua @@ -2,9 +2,6 @@ local rt = require("rust-tools") local capabilities = require('cmp_nvim_lsp').default_capabilities() --- " Manually trigger completions --- inoremap coc#refresh() - rt.setup({ server = { on_attach = function(_, bufnr) diff --git a/tmuxinator/tmuxinator/infra.yml b/tmuxinator/tmuxinator/infra.yml new file mode 100644 index 0000000..9d97555 --- /dev/null +++ b/tmuxinator/tmuxinator/infra.yml @@ -0,0 +1,51 @@ +# /home/nicholas/.config/tmuxinator/blog.yml + +name: infra +root: ~/Code/infrastructure + +# Optional tmux socket +# socket_name: foo + +# Note that the pre and post options have been deprecated and will be replaced by +# project hooks. + +# Project hooks + +# Runs on project start, always +# on_project_start: command + +# Run on project start, the first time +# on_project_first_start: command + +# Run on project start, after the first time +# on_project_restart: command + +# Run on project exit ( detaching from tmux session ) +# on_project_exit: command + +# Run on project stop +# on_project_stop: command + +# Runs in each window and pane before window/pane specific commands. Useful for setting up interpreter versions. +# pre_window: rbenv shell 2.0.0-p247 + +# Pass command line options to tmux. Useful for specifying a different tmux.conf. +# tmux_options: -f ~/.tmux.mac.conf + +# Change the command to call tmux. This can be used by derivatives/wrappers like byobu. +# tmux_command: byobu + +# Specifies (by name or index) which window will be selected on project startup. If not set, the first window is used. +# startup_window: editor + +# Specifies (by index) which pane of the specified window will be selected on project startup. If not set, the first pane is used. +# startup_pane: 1 + +# Controls whether the tmux session should be attached to automatically. Defaults to true. +# attach: false + +windows: + - shell: + - clear + - editor: + - vim-resume