Update sshconfig to use new vpn setup

.config/bacon/prefs.toml

@@ -0,0 +1,100 @@
+# This is a preferences file for the bacon tool
+# More info at https://github.com/Canop/bacon
+
+
+# Uncomment and change the value (true/false) to
+# specify whether bacon should start in summary mode
+#
+# summary = true
+
+
+# Uncomment and change the value (true/false) to
+# specify whether bacon should start with lines wrapped
+#
+# wrap = false
+
+
+# In "reverse" mode, the focus is at the bottom, item
+# order is reversed, and the status bar is on top
+#
+# reverse = true
+
+
+# The grace period is a delay after a file event before the real
+# task is launched and during which other events will be ignored.
+# This is useful if several events are often sent quasi-simultaneously
+# (eg your editor backups before saving, then renames).
+# You can set it to "none" if it's useless for you.
+#
+# grace_period = "5ms"
+
+
+# Uncomment and change the value (true/false) to
+# specify whether bacon should show a help line.
+#
+# help_line = false
+
+
+# Uncomment and change the value (true/false) to
+# set whether to display the count of changes since last job start
+#
+# show_changes_count = false
+
+
+# Uncomment one of those lines if you don't want the default
+# behavior triggered by a file change. This property can also
+# be set directly in a specific job.
+#
+# on_change_strategy = "kill_then_restart"
+# on_change_strategy = "wait_then_restart"
+
+
+# Exporting "locations" (by setting its 'auto' to true) lets you use
+# them in an external tool, for example as a list of jump locations
+# in an IDE or in a language server.
+# (See https://dystroy.org/bacon/config/#export-locations),
+#
+# Possible line_format parts:
+#  - kind: warning|error|test
+#  - path: complete absolute path to the file
+#  - line: 1-based line number
+#  - column: 1-based column
+#  - message: description of the item
+#  - context: unstyled lines of output, separated with escaped newlines (`\\n`)
+[exports.locations]
+auto = false
+exporter = "locations"
+path = ".bacon-locations"
+line_format = "{kind} {path}:{line}:{column} {message}"
+
+
+# Uncomment and change the key-bindings you want to define
+# (some of those ones are the defaults and are just here for illustration)
+[keybindings]
+# esc = "back"
+# g = "scroll-to-top"
+# shift-g = "scroll-to-bottom"
+# k = "scroll-lines(-1)"
+# j = "scroll-lines(1)"
+# ctrl-c = "quit"
+# ctrl-q = "quit"
+# q = "quit"
+# F5 = "rerun"
+# alt-s = "toggle-summary"
+# alt-w = "toggle-wrap"
+# alt-b = "toggle-backtrace"
+# Home = "scroll-to-top"
+# End = "scroll-to-bottom"
+# Up = "scroll-lines(-1)"
+# Down = "scroll-lines(1)"
+# PageUp = "scroll-pages(-1)"
+# PageDown = "scroll-pages(1)"
+# Space = "scroll-pages(1)"
+# a = "job:check-all"
+# i = "job:initial"
+# c = "job:clippy"
+# c = "job:clippy-all"
+# d = "job:doc-open"
+# t = "job:test"
+# r = "job:run"
+# ctrl-e = "export:analysis"

.config/just/justfile

@@ -55,8 +55,11 @@ cloudflared: (apt "gdebi")
 nvim: (cargo "bob-nvim ripgrep tree-sitter-cli")
     bob use stable
 
-node: (cargo "fnm")
-    fnm install --lts
+node:
+    #!/usr/bin/env bash
+    PROFILE=/dev/null bash -c 'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash'
+    source ~/.config/nvm/nvm.sh
+    nvm install node
 
 nix:
     sh <(curl -L https://nixos.org/nix/install) --daemon

.config/nvim/init.lua

@@ -447,7 +447,6 @@ require('lazy').setup({
   },
   { import = 'plugins' },
 }, {
-  concurrency = 2,
   ui = {
     -- If you are using a Nerd Font: set icons to an empty table which will use the
     -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table

.config/nvim/lazy-lock.json

@@ -1,40 +1,40 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
+  "LuaSnip": { "branch": "master", "commit": "8d7aa7a7b7c0875e4878d1d2590924bc1c229305" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform.nvim": { "branch": "master", "commit": "a6f5bdb78caa305496357d17e962bbc4c0b392e2" },
-  "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
-  "gitsigns.nvim": { "branch": "main", "commit": "4c40357994f386e72be92a46f41fc1664c84c87d" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
-  "lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" },
-  "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
-  "lazygit.nvim": { "branch": "main", "commit": "b9eae3badab982e71abab96d3ee1d258f0c07961" },
-  "luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
-  "mason-tool-installer.nvim": { "branch": "main", "commit": "374c78d3ebb5c53f43ea6bd906b6587b5e899b9e" },
-  "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
-  "mini.nvim": { "branch": "main", "commit": "b612a069d1fe99300da43629e0e9c7a1a9b0acda" },
-  "neo-tree.nvim": { "branch": "main", "commit": "e96fd85bf18bc345dab332b345098fa5460dffac" },
-  "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
-  "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" },
-  "nvim-cmp": { "branch": "main", "commit": "5a11682453ac6b13dbf32cd403da4ee9c07ef1c3" },
-  "nvim-lint": { "branch": "master", "commit": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8" },
-  "nvim-lspconfig": { "branch": "master", "commit": "9e932edb0af4e20880685ddb96a231669fbe8091" },
-  "nvim-treesitter": { "branch": "master", "commit": "bb06afa3f1111780932b3c5493ad65473ce85f9d" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "158377d700596367a91ea41818f76abdbf75a232" },
-  "nvim-ufo": { "branch": "main", "commit": "a52c92c3bbaa10f0c9b547a50adaa8c7d8b29f94" },
+  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "conform.nvim": { "branch": "master", "commit": "6a28c90082a67f62a323ab90d988e000a718a8c7" },
+  "fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" },
+  "gitsigns.nvim": { "branch": "main", "commit": "7c27a30450130cd59c4994a6755e3c5d74d83e76" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" },
+  "lazy.nvim": { "branch": "main", "commit": "7c493713bc2cb392706866eeba53aaef6c8e9fc6" },
+  "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
+  "lazygit.nvim": { "branch": "main", "commit": "56760339a81cd1540d5a72fd9d93010a2677b55d" },
+  "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "mini.nvim": { "branch": "main", "commit": "0a8a1072137d916406507c941698a4bfa9dbbe7a" },
+  "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
+  "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
+  "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
+  "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
+  "nvim-lint": { "branch": "master", "commit": "16b21a7d04d06661f92f273a0744fd81fb19e09e" },
+  "nvim-lspconfig": { "branch": "master", "commit": "59a6766cbf32c7e4cf3ed685ccad7ffe1dde8c40" },
+  "nvim-treesitter": { "branch": "master", "commit": "1c111e3e8f42c85b16cb4bf30e4254fcb5607817" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "a2a334900d3643de585ac5c6140b03403454124f" },
+  "nvim-ufo": { "branch": "main", "commit": "522d719d421fc42b95577d9624048d8348d326ea" },
   "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
-  "onedark.nvim": { "branch": "master", "commit": "67a74c275d1116d575ab25485d1bfa6b2a9c38a6" },
+  "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "f22496dfdd46da4d571f5254c72eff65ff5a1c27" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "d227e6c9879bb50af35cd733461198666981d482" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope-yadm.nvim": { "branch": "main", "commit": "23043463b0bb2529bb478eaf816b6445f788aae2" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
+  "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
-  "vim-tmux-navigator": { "branch": "master", "commit": "424b5caa154bff34dc258ee53cec5a8e36cf7ea8" },
-  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
+  "vim-tmux-navigator": { "branch": "master", "commit": "a9b52e7d36114d40350099f254b5f299a35df978" },
+  "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
 }

.config/nvim/lua/plugins/git.lua

@@ -70,7 +70,7 @@ return {
         map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
         map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })
         map('n', '<leader>hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' })
-        map('n', '<leader>hu', gitsigns.stage_hunk, { desc = 'git [u]ndo stage hunk' })
+        map('n', '<leader>hu', gitsigns.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' })
         map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' })
         map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' })
         map('n', '<leader>hb', gitsigns.blame_line, { desc = 'git [b]lame line' })
@@ -80,8 +80,9 @@ return {
         end, { desc = 'git [D]iff against last commit' })
         -- Toggles
         map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' })
-        map('n', '<leader>tD', gitsigns.preview_hunk_inline, { desc = '[T]oggle git show [D]eleted' })
+        map('n', '<leader>tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' })
       end,
     },
   },
 }
+

.config/nvim/lua/plugins/lsp.lua

@@ -97,11 +97,6 @@ return {
             })
           end
 
-          -- Disable ruff hovers in favor of pyright
-          if client and client.name == 'ruff' then
-            client.server_capabilities.hoverProvider = false
-          end
-
           -- The following code creates a keymap to toggle inlay hints in your
           -- code, if the language server you are using supports them
           --
@@ -131,17 +126,19 @@ return {
       --  - settings (table): Override the default settings passed when initializing the server.
       --        For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
       local servers = {
-        -- C++
-        clangd = {},
+        -- clangd = {},
+        -- gopls = {},
+        -- pyright = {},
+        -- rust_analyzer = {},
+        -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
+        --
+        -- Some languages (like typescript) have entire language plugins that can be useful:
+        --    https://github.com/pmizio/typescript-tools.nvim
+        --
+        -- But for many setups, the LSP (`ts_ls`) will work just fine
+        -- ts_ls = {},
+        --
 
-        -- python
-        pyright = {},
-        ruff = {},
-
-        -- rust
-        rust_analyzer = {},
-
-        -- lua
         lua_ls = {
           -- cmd = {...},
           -- filetypes = { ...},

.config/tmux/tmux.conf

@@ -40,6 +40,12 @@ bind -r Left previous-window
 bind-key -n C-S-Left swap-window -t -1\; select-window -t -1
 bind-key -n C-S-Right swap-window -t +1\; select-window -t +1
 
+# rename pane starts empty
+bind-key , command-prompt "rename-window '%%'"
+
+# restart panes
+bind-key k respawn-pane -k
+
 # ----------------------- Plugins ----------------------- # 
 
 # List of plugins

.config/zsh/.zshrc

@@ -7,6 +7,7 @@ fi
 
 # Aliases
 alias c='clear'
+alias ch='clear && tmux clear-history'
 alias open='xdg-open'
 alias lg="lazygit"
 alias nv="nvim"

.gitignore

@@ -34,6 +34,37 @@
 /.config/arduino-ide
 /.config/PrusaSlicer
 /.config/syncthing
+/.config/Kingsoft
+/.config/VCG
+/.config/VSCodium
+/.config/autostart
+/.config/catkin
+/.config/cef_user_data
+/.config/chromium
+/.config/act
+/.config/cura
+/.config/enchant
+/.config/eog
+/.config/evolution
+/.config/evince
+/.config/gedit
+/.config/glib-2.0
+/.config/go
+/.config/gthumb
+/.config/gtk-3.0
+/.config/gtk-4.0
+/.config/helix
+/.config/htop
+/.config/ibus
+/.config/menus
+/.config/nautilus
+/.config/odmpy
+/.config/rerun
+/.config/AliceVision
+/.config/code-server
+/.config/marimo
+/.config/sqlitebrowser
+/.config/systemd
 .bash*
 
 

.ssh/config

@@ -1,12 +1,22 @@
-Host ssh.eastonpots.com
-  ProxyCommand /usr/local/bin/cloudflared access ssh --hostname %h
+Host dgx01
+  HostName dgx01
+  User epotokar
 
-Host work
+Host potlab_cf
+  ProxyCommand /usr/local/bin/cloudflared access ssh --hostname ssh.eastonpots.com
+
+Host work_cf
   ProxyCommand /usr/local/bin/cloudflared access ssh --hostname work.eastonpots.com
+
 Host potlab
   HostName 192.168.0.6
   User contagon
 
+Host work
+  HostName 10.8.0.2
+  User contagon
+  ProxyJump potlab
+
 Host nrec
   HostName atr-share.rec.ri.cmu.edu
   User epotokar
@@ -19,6 +29,10 @@ Host bb
   HostName bitbucket.org
   IdentityFile ~/.ssh/bb
 
+Host bb_aqua
+  HostName bitbucket.org
+  IdentityFile ~/.ssh/bb_aqua
+
 Host nrec
   HostName atr-share.rec.ri.cmu.edu
   User epotokar

.zshenv

@@ -13,8 +13,8 @@ export VISUAL="nvim"
 [ -d "$HOME/.local/share/bob" ] && export PATH="$PATH:$HOME/.local/share/bob/nvim-bin"
 # cargo 
 [ -d "$HOME/.cargo" ] && . "$HOME/.cargo/env"
-fnm=$(which fnm)
-[ "" != "$fnm" ] && eval "$(fnm env --use-on-cd --shell zsh)"
+# nvm (https://github.com/nvm-sh/nvm?tab=readme-ov-file#install--update-script)
+[ -d "$HOME/.config/nvm" ] && . "$HOME/.config/nvm/nvm.sh"  # This loads nvm
 [ -d "$HOME/.nix-profile" ] && . $HOME/.nix-profile/etc/profile.d/nix.sh
 [ -d "$HOME/.pixi" ] && export PATH="$HOME/.pixi/bin:$PATH"