diff --git a/home/config/fish/config.fish b/home/config/fish/config.fish index f094746..c589f65 100644 --- a/home/config/fish/config.fish +++ b/home/config/fish/config.fish @@ -10,7 +10,6 @@ if status is-interactive source ~/.config/fish/shell_funcs.fish source ~/.config/fish/shell_aliases.fish - source ~/.config/fish/everquote.fish set PATH $PATH ~/.cargo/bin diff --git a/home/config/nvim/legacy.vim b/home/config/nvim/legacy.vim index 95673c0..a4000e4 100644 --- a/home/config/nvim/legacy.vim +++ b/home/config/nvim/legacy.vim @@ -79,3 +79,7 @@ let test#strategy = "neovim" " Mypy nmap mp :Mypy + +" Rust tags +autocmd BufRead *.rs :setlocal tags=./rusty-tags.vi;/ +autocmd BufWritePost *.rs :silent! exec "!rusty-tags vi --quiet --start-dir=" . expand('%:p:h') . "&" | redraw! diff --git a/home/config/nvim/lua/plugins.lua b/home/config/nvim/lua/plugins.lua index 1cea246..c8749a8 100644 --- a/home/config/nvim/lua/plugins.lua +++ b/home/config/nvim/lua/plugins.lua @@ -94,7 +94,6 @@ return function(use) use({'puremourning/vimspector'}) use({'nvim-treesitter/nvim-treesitter-refactor'}) use({'RRethy/nvim-treesitter-textsubjects'}) - -- use({'airblade/vim-rooter'}) -- Debugging diff --git a/home/config/nvim/lua/settings.lua b/home/config/nvim/lua/settings.lua index 43a64a0..345507a 100644 --- a/home/config/nvim/lua/settings.lua +++ b/home/config/nvim/lua/settings.lua @@ -48,6 +48,9 @@ vim.g.floaterm_keymap_toggle = '' vim.g.floaterm_width = 0.9 vim.g.floaterm_height = 0.9 +vim.g.rustfmt_autosave = 1 +vim.g.rust_use_custom_ctags_defs = 1 + vim.g.tagbar_autofocus=1 diff --git a/home/gitconfig b/home/gitconfig index 0434eda..ee345b2 100644 --- a/home/gitconfig +++ b/home/gitconfig @@ -64,6 +64,7 @@ newHighlight = green bold 22 [init] templatedir = ~/.git_template + defaultBranch = main [difftool "sourcetree"] cmd = opendiff \"$LOCAL\" \"$REMOTE\" path = diff --git a/home/gitignore b/home/gitignore index eb88175..162b83f 100644 --- a/home/gitignore +++ b/home/gitignore @@ -2,12 +2,11 @@ *.DS_Store .tags .tags_sorted* +tags *.sw[nop] .bundle .env -tags .ruby-version -release_package.sh .vs/ .python-version .envrc @@ -15,7 +14,4 @@ __pycache__/ Session.vim venv/ -production_healththankyou_events.json -staging_healththankyou_events.json - shell.nix diff --git a/home/tmux.conf b/home/tmux.conf index fb96764..c9cd7d8 100644 --- a/home/tmux.conf +++ b/home/tmux.conf @@ -27,7 +27,7 @@ bind - split-window -v -c "#{pane_current_path}"# Split panes vertically set -g @continuum-restore 'on' -set-option -g default-command "reattach-to-user-namespace -l fish" +# set-option -g default-command "reattach-to-user-namespace -l fish" set-option -g set-titles on