diff --git a/.bash_aliases b/.bash_aliases index 33c7caf..caa1ade 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -8,7 +8,7 @@ hash gls >/dev/null 2>&1 || alias gls="ls" if gls --color > /dev/null 2>&1; then colorflag="--color"; else colorflag="-G"; fi; export CLICOLOR_FORCE=1 -alias ls='gls -AFh ${colorflag} --group-directories-first' +#alias ls='gls -AFh ${colorflag} --group-directories-first' alias setclip='xclip -selection c' alias getclip='xclip -selection clipboard -o' alias config='/usr/bin/git --git-dir=/home/jp/dotfiles --work-tree=/home/jp' @@ -34,8 +34,12 @@ alias cs='config status' # source <(mk completion bash | sed "s/kubectl/mk/g") alias awslocal='aws --endpoint-url http://localhost:4566 --profile test --region eu-central-1' # k3s -export KUBECONFIG=~/.kube/k3s-config +export KUBECONFIG=~/.kube/config alias k=kubectl +alias kn='kubectl config set-context --current --namespace' + + +export CR_PAT=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 complete -F __start_kubectl k alias awslocal='aws --endpoint-url=http://localhost:4566' @@ -44,6 +48,7 @@ alias dcl='docker container ls' alias yank='yank-cli' +export DOMAIN='homelab.com' k_ns_clean () { kubectl get namespace $1 -o json \ | tr -d "\n" | sed "s/\"finalizers\": \[[^]]\+\]/\"finalizers\": []/" \ diff --git a/.bash_profile b/.bash_profile index 1c8eb0c..eefbed8 100644 --- a/.bash_profile +++ b/.bash_profile @@ -17,6 +17,8 @@ fi; [ -f /usr/share/bash-completion/completions/git ] && . /usr/share/bash-completion/completions/git # or source /etc/bash_completion.d/git +command -v timoni >/dev/null && . <(timoni completion bash) + # Enable git branch name completion if file exists if [ -f ~/.git-completion.bash ]; then . ~/.git-completion.bash diff --git a/.bashrc b/.bashrc index 216d436..727756a 100644 --- a/.bashrc +++ b/.bashrc @@ -84,7 +84,7 @@ if [[ $? -eq 0 ]]; then [ ! -f `brew --prefix`/etc/bash_completion ] || . `brew --prefix`/etc/bash_completion fi -unset PROMPT_COMMAND +unset PROMPT_COMMAND complete -C /usr/local/bin/bit bit source <(kubectl completion bash) @@ -93,5 +93,32 @@ if [ -f $HOME/.cargo/env ]; then . "$HOME/.cargo/env" fi -# Add powerline -source /usr/share/powerline/bindings/bash/powerline.sh +export LC_ALL=en_US.UTF-8 +export LANG=en_US.UTF-8 +export LANGUAGE=en_US.UTF-8 + +# powerline +if [ -f `which powerline-daemon` ]; then + powerline-daemon -q + POWERLINE_BASH_CONTINUATION=1 + POWERLINE_BASH_SELECT=1 +fi +if [ -f /home/jp/.local/lib/python3.10/site-packages/powerline/bindings/bash/powerline.sh ]; then + source /home/jp/.local/lib/python3.10/site-packages/powerline/bindings/bash/powerline.sh +fi + +reset_nordvpn() { + sudo iptables -F INPUT + sudo iptables -F OUTPUT + sudo iptables -P OUTPUT ACCEPT +} + +# pnpm +export PNPM_HOME="/home/jp/.local/share/pnpm" +case ":$PATH:" in + *":$PNPM_HOME:"*) ;; + *) export PATH="$PNPM_HOME:$PATH" ;; +esac +# pnpm end + +alias pnpx="pnpm dlx" diff --git a/.extra b/.extra index b4901cc..ff59051 100644 --- a/.extra +++ b/.extra @@ -12,3 +12,6 @@ fi [ -f ~/.fzf.bash ] && source ~/.fzf.bash hash setxkbmap 2>/dev/null && setxkbmap -option caps:swapescape || echo "not esc remapping" + +export OPENAI_API_KEY="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" +export LOCALAI=http://10.42.0.111:8080 diff --git a/.path b/.path index bc7bbb7..305e9f8 100644 --- a/.path +++ b/.path @@ -5,3 +5,5 @@ [[ -d $HOME/.pyenv/shims ]] && export PATH=$PATH:$HOME/.pyenv/shims [[ -d $HOME/.pyenv/bin ]] && export PATH=$PATH:$HOME/.pyenv/bin [[ -d $HOME/.local/bin ]] && export PATH=$PATH:$HOME/.local/bin + +export PATH=$PATH:$HOME/.arkade/bin/ diff --git a/.profile b/.profile index a7dff06..d346c97 100644 --- a/.profile +++ b/.profile @@ -31,7 +31,5 @@ if [ -d "$HOME/.local/bin" ] ; then PATH="$HOME/.local/bin:$PATH" fi -eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv) export PATH="$HOME/.poetry/bin:$PATH" -. "$HOME/.cargo/env" diff --git a/.tmux.conf b/.tmux.conf index a697437..e604530 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -1,4 +1,24 @@ #set-option -g default-shell "/usr/local/bin/bash" +set-option -sa terminal-overrides ",xterm*:Tc" set-option -g default-command "bash -l" set-option -g default-terminal "screen-256color" +# List of plugins +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'tmux-plugins/tmux-sensible' +set -g @plugin 'dreamsofcode-io/catppuccin-tmux' + +set -g @catppuccin_flavour 'latte' + +unbind C-b +set -g prefix C-Space +bind C-space send-prefix + +# Other examples: +# set -g @plugin 'github_username/plugin_name' +# set -g @plugin 'github_username/plugin_name#branch' +# set -g @plugin 'git@github.com:user/plugin' +# set -g @plugin 'git@bitbucket.com:user/plugin' + +# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) +run '~/.tmux/plugins/tpm/tpm'