Merge remote-tracking branch 'refs/remotes/origin/main'

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

home/config/nvim/legacy.vim

@@ -79,3 +79,7 @@ let test#strategy = "neovim"
 " Mypy
 nmap <silent> <leader>mp :Mypy<CR>
 
+
+" 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!

home/config/nvim/lua/plugins.lua

@@ -94,7 +94,21 @@ return function(use)
   use({'puremourning/vimspector'})
  	use({'nvim-treesitter/nvim-treesitter-refactor'})
 	use({'RRethy/nvim-treesitter-textsubjects'})
-
   -- use({'airblade/vim-rooter'})
 
+  -- Debugging
+  use 'mfussenegger/nvim-dap'
+
+  local rt = require("rust-tools")
+
+  rt.setup({
+    server = {
+      on_attach = function(_, bufnr)
+        -- Hover actions
+        vim.keymap.set("n", "<C-space>", rt.hover_actions.hover_actions, { buffer = bufnr })
+        -- Code action groups
+        vim.keymap.set("n", "<Leader>a", rt.code_action_group.code_action_group, { buffer = bufnr })
+      end,
+    },
+  })
 end

home/config/nvim/lua/settings.lua

@@ -48,6 +48,9 @@ vim.g.floaterm_keymap_toggle = '<F9>'
 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
 
@@ -120,6 +123,7 @@ vim.api.nvim_set_keymap("n", "<C-K>", ":bnext<CR>", {silent = true})
 vim.api.nvim_set_keymap("n", "<C-o>", ":NERDTreeToggle<CR>", {silent = true})
 
 vim.api.nvim_set_keymap("n", "<F1>", ":set invnumber invrelativenumber<CR>", {silent = true })
+vim.api.nvim_set_keymap("i", "<F1>", "<Esc>", {silent = true })
 vim.api.nvim_set_keymap("n", "<F2>",":SearchSession<CR>", {silent = true })
 vim.api.nvim_set_keymap("n", "<F8>", ":Tagbar<CR>", {silent = true })
 

home/gitconfig

@@ -64,6 +64,7 @@
     newHighlight = green bold 22
 [init]
     templatedir = ~/.git_template
+    defaultBranch = main
 [difftool "sourcetree"]
 	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
 	path = 

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

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