diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 72e8ffc..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/.zshrc b/.zshrc index 0e8ca17..cb90013 100644 --- a/.zshrc +++ b/.zshrc @@ -10,11 +10,6 @@ export ZSH=$HOME/.oh-my-zsh # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes ZSH_THEME="af-magic" -# Set list of themes to pick from when loading at random -# Setting this variable when ZSH_THEME=random will cause zsh to load -# a theme from this variable instead of looking in $ZSH/themes/ -# If set to an empty array, this variable will have no effect. -# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) # Uncomment the following line to use case-sensitive completion. # CASE_SENSITIVE="true" @@ -30,38 +25,11 @@ ZSH_THEME="af-magic" DISABLE_UPDATE_PROMPT="true" # Uncomment the following line to change how often to auto-update (in days). -# export UPDATE_ZSH_DAYS=13 +export UPDATE_ZSH_DAYS=14 -# Uncomment the following line if pasting URLs and other text is messed up. -# DISABLE_MAGIC_FUNCTIONS="true" - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" # Uncomment the following line to display red dots whilst waiting for completion. -# COMPLETION_WAITING_DOTS="true" - -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. -# DISABLE_UNTRACKED_FILES_DIRTY="true" - -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# You can set one of the optional three formats: -# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# or set a custom format using the strftime function format specifications, -# see 'man strftime' for details. -# HIST_STAMPS="mm/dd/yyyy" - -# Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder +COMPLETION_WAITING_DOTS="true" # Which plugins would you like to load? # Standard plugins can be found in $ZSH/plugins/ @@ -72,34 +40,16 @@ plugins=(git) source $ZSH/oh-my-zsh.sh -# User configuration -# export MANPATH="/usr/local/man:$MANPATH" +export EDITOR='vim' -# You may need to manually set your language environment -# 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 - -# 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" +# NVM export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion -alias code="codium" +#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" \ No newline at end of file diff --git a/setup.sh b/setup.sh new file mode 100755 index 0000000..094d0af --- /dev/null +++ b/setup.sh @@ -0,0 +1,19 @@ +echo "installing nvm" +curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash + +echo "installing sdkman" +curl -s "https://get.sdkman.io" | bash + +echo "linking .zshrc" +if [ -f ~/.zshrc ]; then + echo ".zshrc exists removing" + rm ~/.zshrc +fi +ln -s ~/dotfiles/.zshrc ~/.zshrc + +echo "linking .vimrc" +if [ -f ~/.vimrc ]; then + echo ".vimrc exists removing" + rm ~/.vimrc +fi +ln -s ~/dotfiles/.vimrc ~/.vimrc \ No newline at end of file