diff --git a/README.md b/README.md index ee2676d..9c40707 100644 --- a/README.md +++ b/README.md @@ -5,20 +5,26 @@ Built around Bash. Most supervitamined replacements stay optional. ## My friend programs - fish shell, fisher plugin manager -- bash, [starship](https://starship.rs/) super prompt, [hishtory](https://github.com/ddworken/hishtory), [ls exa](https://github.com/rivy/rust.exa) -- terminal multiplexer: [tmux](https://github.com/tmux/tmux), plugin manager [tpm](https://github.com/tmux-plugins/tpm) and session manager [tmuxp](https://github.com/tmux-python/tmuxp) +- bash, [starship](https://starship.rs/) super prompt, + [hishtory](https://github.com/ddworken/hishtory), + [ls exa](https://github.com/rivy/rust.exa) +- terminal multiplexer: [tmux](https://github.com/tmux/tmux), plugin manager + [tpm](https://github.com/tmux-plugins/tpm) and session manager + [tmuxp](https://github.com/tmux-python/tmuxp) - a swiss-knife to make life easier: [fzf](https://github.com/junegunn/fzf) -- git: configuration and the terminal manager [tig](https://jonas.github.io/tig/) +- git: configuration and the terminal manager + [tig](https://jonas.github.io/tig/) - vim: [vundle](https://github.com/VundleVim/Vundle.vim) -- languages: python, perl, java with [sdkman](https://sdkman.io/) - +- languages: python, perl, java with [sdkman](https://sdkman.io/) ## Configuration file -a sample file (located in *~/config/chezmoi/chezmoi.toml*) +a sample file (located in _~/config/chezmoi/chezmoi.toml_) ```toml [data] + # unix username + username = "" # git configuration git_email = "" git_alias = "" @@ -26,12 +32,6 @@ a sample file (located in *~/config/chezmoi/chezmoi.toml*) projectdir = "~/work" # deployment path for "d" command (java deploy) deploydir = "~/dist" - # Java versions from sdkman - java6_version = "6.0.119-zulu" - java7_version = "7.0.342-zulu" - java8_version = "8.0.302-open" - java11_version = "11.0.12-open" - java20_version = "20-open" # extra certificate for NodeJs (PEM file) to trust HTTPS proxy extra_ca_cert = "~/config/security/ca-node.pem" # Java truststore for Maven to trust HTTPS proxy @@ -45,4 +45,3 @@ a sample file (located in *~/config/chezmoi/chezmoi.toml*) tmux_favorite3 = "myusualsshpassword" tmux_favorite4 = "export TERM=xterm" ``` - diff --git a/dot_bashrc.d/sdkman.bashrc.tmpl b/dot_bashrc.d/sdkman.bashrc.tmpl index 3446cc7..8f81527 100644 --- a/dot_bashrc.d/sdkman.bashrc.tmpl +++ b/dot_bashrc.d/sdkman.bashrc.tmpl @@ -1,12 +1,3 @@ #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" - -# java -if [ -n "$(LC_ALL=C type -t sdk)" ] && [ "$(LC_ALL=C type -t sdk)" = function ]; then - alias java6='sdk use java {{ .java6_version }}' - alias java7='sdk use java {{ .java7_version }}' - alias java8='sdk use java {{ .java8_version }}' - alias java11='sdk use java {{ .java11_version}}' - alias jv='java -version' -fi diff --git a/dot_tmux.conf b/dot_tmux.conf.tmpl similarity index 98% rename from dot_tmux.conf rename to dot_tmux.conf.tmpl index d2088ce..f475fbb 100644 --- a/dot_tmux.conf +++ b/dot_tmux.conf.tmpl @@ -55,7 +55,7 @@ setw -g visual-activity on # Auto rename set-option -g automatic-rename on -set-option -g automatic-rename-format '#{b:pane_current_path}' +set-option -g automatic-rename-format '#{b;s/{{ .username }}/~/:pane_current_path}' # Allows us to use C-a a to send commands to a TMUX session inside # another TMUX session