From 57dbb0a250baee410c545c89a602330e52abbbe3 Mon Sep 17 00:00:00 2001 From: Easton Potokar Date: Mon, 6 Jan 2025 16:17:33 -0500 Subject: [PATCH 1/3] Fix nvm just install --- .config/bacon/prefs.toml | 100 ++++++++++++++++++++++++++++++++++++ .config/just/justfile | 4 +- .config/nvim/lazy-lock.json | 2 +- .config/zsh/.zshrc | 1 + 4 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 .config/bacon/prefs.toml diff --git a/.config/bacon/prefs.toml b/.config/bacon/prefs.toml new file mode 100644 index 0000000..811080d --- /dev/null +++ b/.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" diff --git a/.config/just/justfile b/.config/just/justfile index bb09a87..5ed9e2a 100644 --- a/.config/just/justfile +++ b/.config/just/justfile @@ -57,8 +57,8 @@ nvim: (cargo "bob-nvim ripgrep tree-sitter-cli") node: #!/usr/bin/env bash - PROFILE=/dev/null bash -c 'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v1.40.1/install.sh | bash' - source ~/.nvm/nvm.sh + 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: diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 4d9f3f2..9055d43 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -7,7 +7,7 @@ "fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" }, "gitsigns.nvim": { "branch": "main", "commit": "7c27a30450130cd59c4994a6755e3c5d74d83e76" }, "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" }, - "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, + "lazy.nvim": { "branch": "main", "commit": "7c493713bc2cb392706866eeba53aaef6c8e9fc6" }, "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, "lazygit.nvim": { "branch": "main", "commit": "56760339a81cd1540d5a72fd9d93010a2677b55d" }, "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 119c033..fab83d2 100644 --- a/.config/zsh/.zshrc +++ b/.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" From ef7fd3a78a4e13a7ed18a7957b7411832d4bd331 Mon Sep 17 00:00:00 2001 From: Easton Potokar Date: Tue, 4 Feb 2025 20:17:03 -0500 Subject: [PATCH 2/3] Tmux pane renaming --- .config/tmux/tmux.conf | 3 +++ .gitignore | 26 ++++++++++++++++++++++++++ .ssh/config | 4 ++++ .zshenv | 2 +- 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 63d7bbc..b84e78f 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -40,6 +40,9 @@ 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 '%%'" + # ----------------------- Plugins ----------------------- # # List of plugins diff --git a/.gitignore b/.gitignore index e06caee..4dbba42 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,32 @@ /.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 .bash* diff --git a/.ssh/config b/.ssh/config index 365e20a..a59909e 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,3 +1,7 @@ +Host dgx01 + HostName dgx01 + User epotokar + Host ssh.eastonpots.com ProxyCommand /usr/local/bin/cloudflared access ssh --hostname %h diff --git a/.zshenv b/.zshenv index a4f4e3f..1f7a90f 100644 --- a/.zshenv +++ b/.zshenv @@ -14,7 +14,7 @@ export VISUAL="nvim" # cargo [ -d "$HOME/.cargo" ] && . "$HOME/.cargo/env" # nvm (https://github.com/nvm-sh/nvm?tab=readme-ov-file#install--update-script) -[ -d "$HOME/.nvm" ] && . "$HOME/.nvm/nvm.sh" # This loads nvm +[ -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" From 63181f9e6a50218e9d17a11b0121ccf5f680f40d Mon Sep 17 00:00:00 2001 From: Easton Potokar Date: Fri, 7 Mar 2025 14:50:35 -0500 Subject: [PATCH 3/3] Update sshconfig to use new vpn setup --- .config/tmux/tmux.conf | 3 +++ .gitignore | 5 +++++ .ssh/config | 16 +++++++++++++--- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index b84e78f..936a509 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -43,6 +43,9 @@ 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 diff --git a/.gitignore b/.gitignore index 4dbba42..34a842f 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,11 @@ /.config/nautilus /.config/odmpy /.config/rerun +/.config/AliceVision +/.config/code-server +/.config/marimo +/.config/sqlitebrowser +/.config/systemd .bash* diff --git a/.ssh/config b/.ssh/config index a59909e..a534c2d 100644 --- a/.ssh/config +++ b/.ssh/config @@ -2,15 +2,21 @@ Host dgx01 HostName dgx01 User epotokar -Host ssh.eastonpots.com - ProxyCommand /usr/local/bin/cloudflared access ssh --hostname %h +Host potlab_cf + ProxyCommand /usr/local/bin/cloudflared access ssh --hostname ssh.eastonpots.com -Host work +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 @@ -23,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