diff --git a/.gitconfig b/.gitconfig index 2c51a47..52809bc 100644 --- a/.gitconfig +++ b/.gitconfig @@ -23,3 +23,5 @@ unmerged = yellow [help] autocorrect = 30 +[init] + defautlBranch = main diff --git a/.profile b/.profile index ab8e33d..22c63a2 100644 --- a/.profile +++ b/.profile @@ -1,6 +1,3 @@ -# Fig pre block. Keep at the top of this file. -[[ -f "$HOME/.fig/shell/profile.pre.bash" ]] && builtin source "$HOME/.fig/shell/profile.pre.bash" - # Load profiles from /etc/profile.d if test -d $HOME/.profile.d/; then for profile in $HOME/.profile.d/*.sh; do @@ -8,7 +5,3 @@ if test -d $HOME/.profile.d/; then done unset profile fi - -# Fig post block. Keep at the bottom of this file. -[[ -f "$HOME/.fig/shell/profile.post.bash" ]] && builtin source "$HOME/.fig/shell/profile.post.bash" -. "$HOME/.cargo/env" diff --git a/.tmux.conf b/.tmux.conf index 279668f..e10deb6 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -1,5 +1,16 @@ +# Change command shortcut unbind C-b set -g prefix C-x bind C-x send-prefix -set -g default-terminal "screen-256color" + +# List of plugins +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'tmux-plugins/tmux-sensible' +set -g @plugin 'erikw/tmux-powerline' +set -g @plugin 'tmux-plugins/tmux-open' +#set -g @plugin 'alexchaichan/tmux-spotify-tui' +set-option -g @plugin 'b0o/tmux-autoreload' + +# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) +run '~/.tmux/plugins/tpm/tpm' diff --git a/.tmux/plugins/tmux-autoreload b/.tmux/plugins/tmux-autoreload new file mode 160000 index 0000000..e98aa3b --- /dev/null +++ b/.tmux/plugins/tmux-autoreload @@ -0,0 +1 @@ +Subproject commit e98aa3b74cfd5f2df2be2b5d4aa4ddcc843b2eba diff --git a/.tmux/plugins/tmux-open b/.tmux/plugins/tmux-open new file mode 160000 index 0000000..763d0a8 --- /dev/null +++ b/.tmux/plugins/tmux-open @@ -0,0 +1 @@ +Subproject commit 763d0a852e6703ce0f5090a508330012a7e6788e diff --git a/.tmux/plugins/tmux-powerline b/.tmux/plugins/tmux-powerline new file mode 160000 index 0000000..8e0f92d --- /dev/null +++ b/.tmux/plugins/tmux-powerline @@ -0,0 +1 @@ +Subproject commit 8e0f92da9bd0201c9e1280c6bca02db6bb398bb0 diff --git a/.tmux/plugins/tmux-sensible b/.tmux/plugins/tmux-sensible new file mode 160000 index 0000000..25cb91f --- /dev/null +++ b/.tmux/plugins/tmux-sensible @@ -0,0 +1 @@ +Subproject commit 25cb91f42d020f675bb0a2ce3fbd3a5d96119efa diff --git a/.tmux/plugins/tmux-spotify-tui b/.tmux/plugins/tmux-spotify-tui new file mode 160000 index 0000000..d03e5ec --- /dev/null +++ b/.tmux/plugins/tmux-spotify-tui @@ -0,0 +1 @@ +Subproject commit d03e5ec54487a89b2e0b25e7a49b8f39dee5fea1 diff --git a/.tmux/plugins/tpm b/.tmux/plugins/tpm new file mode 160000 index 0000000..99469c4 --- /dev/null +++ b/.tmux/plugins/tpm @@ -0,0 +1 @@ +Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 diff --git a/linux/.profile.d/deno.sh b/linux/.profile.d/deno.sh new file mode 100644 index 0000000..1c60141 --- /dev/null +++ b/linux/.profile.d/deno.sh @@ -0,0 +1 @@ +export DENO_INSTALL="$HOME/.deno" diff --git a/linux/.zshenv b/linux/.zshenv index a5c6ce7..5ff27e7 100644 --- a/linux/.zshenv +++ b/linux/.zshenv @@ -8,12 +8,12 @@ function appendpath() { } appendpath "$GOPATH/bin" +appendpath "$DENO_INSTALL/bin" appendpath "$HOME/.local/bin" -appendpath $HOME/.local/share/gem/ruby/3.0.0/bin unset appendpath #THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! export SDKMAN_DIR="$HOME/.sdkman" [[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" -. "$HOME/.cargo/env" + diff --git a/linux/.zshrc b/linux/.zshrc index 6fb40dc..7a9eddb 100644 --- a/linux/.zshrc +++ b/linux/.zshrc @@ -9,6 +9,7 @@ export ZSH="$HOME/.oh-my-zsh" # to know which specific one was loaded, run: echo $RANDOM_THEME # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes ZSH_THEME="powerlevel10k/powerlevel10k" +#ZSH_THEME="robbyrussell" # Set list of themes to pick from when loading at random # Setting this variable when ZSH_THEME=random will cause zsh to load @@ -71,9 +72,11 @@ ZSH_CUSTOM=$ZSH/custom # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. plugins=( + aws colored-man-pages colorize command-not-found + dnf docker docker-compose docker-machine @@ -85,24 +88,26 @@ plugins=( gitignore git-prompt golang - httpie + helm jsontools kubectl lein man minikube mvn + oc + operator-sdk pep8 poetry pip profiles pylint python - rustup + ssh-agent themes tmux + vscode web-search - zsh-cargo-completion zsh-navigation-tools ) @@ -116,30 +121,21 @@ source $ZSH/oh-my-zsh.sh # export LANG=en_US.UTF-8 # Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='mvim' -# fi +if [[ -n $SSH_CONNECTION ]]; then + export EDITOR='vim' +else + export EDITOR='nvim' +fi # Compilation flags # export ARCHFLAGS="-arch x86_64" -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. -# For a full list of active aliases, run `alias`. -# -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" - # Setup emacs keymap bindkey -e autoload -U compinit && compinit -source "/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh" +source "/usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh