From eef1c772a4871bbd9aa9d0050123fe99fa4cc43c Mon Sep 17 00:00:00 2001 From: scbj Date: Tue, 19 Nov 2024 11:44:52 +0100 Subject: [PATCH] added paths to bashrc, added keybinding to tmux to detach from session and exit parent shell --- bash-conf-work/.bash_profile | 2 +- bashrc/.bashrc | 11 ++++++----- code/.config/Code/User/settings.json | 10 ++++++---- tmux/.config/tmux/tmux.conf | 2 ++ 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/bash-conf-work/.bash_profile b/bash-conf-work/.bash_profile index 4db8580..f192142 100644 --- a/bash-conf-work/.bash_profile +++ b/bash-conf-work/.bash_profile @@ -3,7 +3,7 @@ # # extend paths -export PATH="$PATH:~/tools/Xilinx/Vivado/2021.1/bin" +export PATH="$PATH:$HOME/tools/Xilinx/Vivado/2021.1/bin" # vivado license export XILINXD_LICENSE_FILE=26140@aberdeen.zhaw.ch diff --git a/bashrc/.bashrc b/bashrc/.bashrc index 3697b54..d9353b0 100644 --- a/bashrc/.bashrc +++ b/bashrc/.bashrc @@ -29,6 +29,8 @@ alias bashsource='source ~/.bashrc' ## short forms for tmux commands alias tma='tmux attach' +alias tmd='tmux detach -P' + alias trs='tmux rename-session' alias trw='tmux rename-window' alias tnw='tmux new-window -c "#{pane_current_path}"' @@ -41,7 +43,9 @@ export TERM="xterm-256color" # extend PATH variable # export PATH=$PATH:~/path/to/add -export PATH=$PATH:$HOME/dotfiles/misc/scripts/ +if [[ "$PATH" != *"dotfiles/misc/scripts/"* ]]; then + export PATH=$PATH:$HOME/dotfiles/misc/scripts/; +fi # setup starship eval "$(starship init bash)" @@ -59,7 +63,4 @@ source ~/.bash_alias # source cargo if available -cargo_env="~/.cargo/env" -if [ -f "${cargo_env}" ]; then - source "${cargo_env}" -fi +source "$HOME/.cargo/env" diff --git a/code/.config/Code/User/settings.json b/code/.config/Code/User/settings.json index 48256fb..5525440 100755 --- a/code/.config/Code/User/settings.json +++ b/code/.config/Code/User/settings.json @@ -44,10 +44,12 @@ "rust-analyzer.lens.implementations.enable": false, "rust-analyzer.lens.run.enable": false, "rust-analyzer.diagnostics.enable": false, - "rust-analyzer.inlayHints.typeHints.enable": false, - "rust-analyzer.inlayHints.chainingHints.enable": false, - "rust-analyzer.inlayHints.closingBraceHints.enable": false, "rust-analyzer.inlayHints.genericParameterHints.const.enable": false, "rust-analyzer.inlayHints.parameterHints.enable": false, - "rust-analyzer.inlayHints.renderColons": false + "rust-analyzer.inlayHints.renderColons": false, + "rust-analyzer.inlayHints.bindingModeHints.enable": true, + "rust-analyzer.inlayHints.closingBraceHints.enable": false, + "rust-analyzer.inlayHints.genericParameterHints.type.enable": true, + "rust-analyzer.inlayHints.typeHints.hideClosureInitialization": true, + "rust-analyzer.inlayHints.typeHints.hideNamedConstructor": true } \ No newline at end of file diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf index d04475b..ff38428 100644 --- a/tmux/.config/tmux/tmux.conf +++ b/tmux/.config/tmux/tmux.conf @@ -20,6 +20,8 @@ bind -n M-Down select-pane -D bind -n M-Up select-pane -U bind -n M-Right select-pane -R +bind k run "tmux detach -P" + # enable mouse support set -g mouse on # bind -n WheelUpPane {