From 48505be26acc65340aeb8c764f79c06d5433ab34 Mon Sep 17 00:00:00 2001 From: Jaroslaw Konik Date: Fri, 16 May 2025 09:19:00 +0200 Subject: [PATCH] update --- .bashrc | 21 +++++++++++++-------- .zshrc | 22 ---------------------- settings.json | 14 -------------- 3 files changed, 13 insertions(+), 44 deletions(-) delete mode 100644 .zshrc delete mode 100644 settings.json diff --git a/.bashrc b/.bashrc index 33eb94d..a5b7cb1 100644 --- a/.bashrc +++ b/.bashrc @@ -1,9 +1,14 @@ -alias nvim=nvr_git -export EDITOR=nvim -export PATH="$PATH:$HOME/.cargo/bin" -. "$HOME/.cargo/env" +# +# ~/.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +alias ls='ls --color=auto' +alias grep='grep --color=auto' +# PS1='[\u@\h \W]\$ ' eval "$(starship init bash)" -alias export_esp=". /home/jaroslaw/bin/export-esp.sh" -alias get_idf='. $HOME/src/esp/esp-idf/export.sh' -export PATH=$PATH:~/bin/zig -export WGPU_BACKEND=opengl +starship_precmd +alias nvim=nvr_git +alias get_esprs='. $HOME/bin/export-esp.sh' diff --git a/.zshrc b/.zshrc deleted file mode 100644 index 14b9d9d..0000000 --- a/.zshrc +++ /dev/null @@ -1,22 +0,0 @@ -nvr_git () { - local main_module_repo_path=$(git rev-parse --show-superproject-working-tree 2>/dev/null) - local repo_path=$(git rev-parse --show-toplevel 2>/dev/null) - if [[ -z "$main_module_repo_path" ]]; then - main_module_repo_path=$repo_path - fi - - if [ -n "$main_module_repo_path" ]; then - local servername=/tmp/nvr$(echo $main_module_repo_path | tr "/" "_") - nvr -s --servername $servername "$@" - else - /usr/bin/nvim "$@" - fi -} - -alias nvim=nvr_git -export EDITOR=nvim -export PATH="$PATH:$HOME/.cargo/bin" -. "$HOME/.cargo/env" -eval "$(starship init zsh)" -alias export_esp=". /home/jaroslaw/bin/export-esp.sh" -alias get_idf='. $HOME/src/esp/esp-idf/export.sh' diff --git a/settings.json b/settings.json deleted file mode 100644 index 51b8e06..0000000 --- a/settings.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extensions.experimental.affinity": { - "asvetliakov.vscode-neovim": 1 - }, - "keyboard.dispatch": "keyCode", - "workbench.colorTheme": "Catppuccin Mocha", - "editor.fontFamily": "FiraCode Nerd Font", - "editor.fontLigatures": true, - "workbench.productIconTheme": "material-product-icons", - "workbench.iconTheme": "catppuccin-mocha", - "editor.inlayHints.enabled": "offUnlessPressed", - "rust-analyzer.lens.implementations.enable": false, - "remote.autoForwardPortsSource": "hybrid" -} \ No newline at end of file