From 4f61cff44005575de7cc0611a14cb72aaf8984fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Fernando=20Carri=C3=B3n?= Date: Thu, 26 Aug 2021 18:42:22 +0200 Subject: [PATCH] refresh macos --- any/bash/.bash_profile | 28 ++++++++ any/bash/.bashrc | 61 ++++++++++------- any/bash/.profile | 51 -------------- any/vim/.vim/coc-settings.json | 9 +++ any/vim/.vim/spell/en.utf-8.add | 35 ++++++++++ any/vim/.vim/spell/en.utf-8.add.spl | Bin 0 -> 492 bytes any/vim/.vim/vimrc | 100 +++++++++++++++++++++++----- 7 files changed, 195 insertions(+), 89 deletions(-) create mode 100644 any/bash/.bash_profile delete mode 100644 any/bash/.profile create mode 100644 any/vim/.vim/coc-settings.json create mode 100644 any/vim/.vim/spell/en.utf-8.add create mode 100644 any/vim/.vim/spell/en.utf-8.add.spl diff --git a/any/bash/.bash_profile b/any/bash/.bash_profile new file mode 100644 index 0000000..ab47cc4 --- /dev/null +++ b/any/bash/.bash_profile @@ -0,0 +1,28 @@ +# ~/.bash_profile + +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/bin" ]; then + export PATH="$HOME/bin:$PATH" +fi + +[ -d "$HOME/devel/venvs" ] && export WORKON_HOME=~/devel/venvs +[ -d "$HOME/devel/go" ] && export GOPATH=$HOME/devel/go +[ -d /usr/local/go/bin ] && export PATH=/usr/local/go/bin:$PATH +[ -d "$HOME/.local/bin" ] && export PATH=$HOME/.local/bin:$PATH + +export LC_ALL=en_US.UTF-8 +export LANG=en_US.UTF-8 + +if command -v go 1>/dev/null 2>&1 +then + export PATH=$PATH:$(go env GOPATH)/bin +fi + +if [[ "$OSTYPE" == "linux-gnu"* && ! -f /etc/debian_version ]] +then + echo +fi + +[ -f ~/.bash_profile.local ] && . "$HOME/.bash_profile.local" + +[ -f "$HOME/.bashrc" ] && . "$HOME/.bashrc" diff --git a/any/bash/.bashrc b/any/bash/.bashrc index 332366b..d331b69 100644 --- a/any/bash/.bashrc +++ b/any/bash/.bashrc @@ -33,6 +33,41 @@ HISTFILESIZE=4096 # update the values of LINES and COLUMNS. shopt -s checkwinsize +if [ -d "$HOME/.pyenv" ]; then + export PYENV_ROOT="$HOME/.pyenv" + export PATH="$PYENV_ROOT/bin:$PATH" + if command -v pyenv 1>/dev/null 2>&1; then + if ! shopt -q extglob + then + resetextglob=true + shopt -s extglob + fi + if [[ "${OSTYPE%%+([[:digit:].])}" == "darwin" ]] + then + eval "$(pyenv init --path)" + fi + if $resetextglob + then + shopt -u extglob + fi + eval "$(pyenv init -)" + eval "$(pyenv virtualenv-init -)" + fi +fi + +if [[ -s "$HOME/.gvm/scripts/gvm" ]]; then + source "$HOME/.gvm/scripts/gvm" +fi + +if [[ "$OSTYPE" == "linux-gnu"* && -f /etc/debian_version ]] +then + # if [ -d $HOME/.pyenv ] + # then + # pyenv3 + # export HI="hi" + # fi + echo +fi #### Includes #### ################## @@ -42,36 +77,16 @@ shopt -s checkwinsize # See /usr/share/doc/bash-doc/examples in the bash-doc package. if [ -f ~/.bash_aliases ]; then - . ~/.bash_aliases + . "$HOME/.bash_aliases" fi if [ -f ~/.bash_functions ]; then - . ~/.bash_functions + . "$HOME/.bash_functions" fi # Machine Specific Configs if [ -f ~/.bashrc.local ]; then - . ~/.bashrc.local + . "$HOME/.bashrc.local" fi #### - -if [[ "$OSTYPE" == "linux-gnu"* && -f /etc/debian_version ]] -then - if [ -d "$HOME/.pyenv" ]; then - export PYENV_ROOT="$HOME/.pyenv" - export PATH="$PYENV_ROOT/bin:$PATH" - if command -v pyenv 1>/dev/null 2>&1; then - touch ~/foo - eval "$(pyenv init -)" - eval "$(pyenv virtualenv-init -)" - fi - fi - if [ -d $HOME/.pyenv ] - then - pyenv3 - export HI="hi" - fi -fi - -[[ -s "/home/crthaze/.gvm/scripts/gvm" ]] && source "/home/crthaze/.gvm/scripts/gvm" diff --git a/any/bash/.profile b/any/bash/.profile deleted file mode 100644 index 7d3e95a..0000000 --- a/any/bash/.profile +++ /dev/null @@ -1,51 +0,0 @@ -# ~/.profile: executed by the command interpreter for login shells. -# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login -# exists. -# see /usr/share/doc/bash/examples/startup-files for examples. -# the files are located in the bash-doc package. - -# set PATH so it includes user's private bin if it exists -if [ -d "$HOME/bin" ]; then - export PATH="$HOME/bin:$PATH" -fi - -export GOPATH=$HOME/devel/go -if [ -d /usr/local/go/bin ] -then - export PATH=/usr/local/go/bin:$PATH -fi -if [ -d $HOME/.local/bin ] -then - export PATH=$HOME/.local/bin:$PATH -fi -if which go -then - export PATH=$PATH:$(go env GOPATH)/bin -fi - -#PATH="/usr/local/opt/python/libexec/bin:$PATH" - -if [ -f ~/.profile.local ]; then - . ~/.profile.local -fi - -# if running bash -if [ -n "$BASH_VERSION" ]; then - # include .bashrc if it exists - if [ -f "$HOME/.bashrc" ]; then - . "$HOME/.bashrc" - fi -fi - -if [[ "$OSTYPE" == "linux-gnu"* && ! -f /etc/debian_version ]] -then - if [ -d "$HOME/.pyenv" ]; then - export PYENV_ROOT="$HOME/.pyenv" - export PATH="$PYENV_ROOT/bin:$PATH" - if command -v pyenv 1>/dev/null 2>&1; then - touch ~/foo - eval "$(pyenv init -)" - fi - # eval "$(pyenv virtualenv-init -)" - fi -fi diff --git a/any/vim/.vim/coc-settings.json b/any/vim/.vim/coc-settings.json new file mode 100644 index 0000000..cbac8e1 --- /dev/null +++ b/any/vim/.vim/coc-settings.json @@ -0,0 +1,9 @@ +{ + "languageserver": { + "golang": { + "command": "gopls", + "rootPatterns": ["go.mod", ".vim/", ".git/", ".hg/"], + "filetypes": ["go"] + } + } +} diff --git a/any/vim/.vim/spell/en.utf-8.add b/any/vim/.vim/spell/en.utf-8.add new file mode 100644 index 0000000..ca86a66 --- /dev/null +++ b/any/vim/.vim/spell/en.utf-8.add @@ -0,0 +1,35 @@ +Workiva +Carrión +Cloudformation +SRE +SLIs +SLOs +SLAs +SLI +Microservice +Kubernetes +Simons +blog +SRE's +PRs +metadata +nextgen +deployer +repo +Wspend +App +workflow +DaemonSet +CronJob +dev +pentest +eu +APM +infre +Wdata +K8s +wiki +CLI +diego +SLA +SLO diff --git a/any/vim/.vim/spell/en.utf-8.add.spl b/any/vim/.vim/spell/en.utf-8.add.spl new file mode 100644 index 0000000000000000000000000000000000000000..e57720c1329e06db2a3eb9843f153f53efe0177e GIT binary patch literal 492 zcmZ8dF-`+95cK%cQbgz^nv_v0npCt1D1tyliA3+@oXF&2Tj#q3ItqTo6ZioCp@3N@ zY0yc#d*j)ev7aZ8DcZUo|0;!xGqYG$)@`;vHffKjw-LGrtx+Rj4ON)BfqV{M_ym+H zy=Fak0Uau=NNcc#K}!k`E&~yd7uE&zdtt1DB|*T%iIi!pBimq?P2LXRpkZIj@gU^d zabZPmL9D*&WGE9wEkV!P3i4q!4O;qFIfJkbmZXGi*I>t7%e-v4^h)lUU3gwwQEK^{ zGLRLg$CO>l^|1r@bU&o@8h?zfo9N