Compare commits

..

No commits in common. "6d026bc90e070dd5507827cace87311822eb1e30" and "ccb2a67d464c4c4de1cd7774214064d77e878610" have entirely different histories.

2 changed files with 7 additions and 18 deletions

View File

@ -41,12 +41,6 @@ function install_shfmt() {
GO111MODULE=on go install mvdan.cc/sh/v3/cmd/shfmt@latest GO111MODULE=on go install mvdan.cc/sh/v3/cmd/shfmt@latest
} }
function install_shellcheck() {
# Install shellcheck
[[ "$(uname)" == "Darwin" ]] && brew install shellcheck
emerge shellcheck
}
function install_gopls() { function install_gopls() {
# Install gopls # Install gopls
GO111MODULE=on go install golang.org/x/tools/gopls@latest GO111MODULE=on go install golang.org/x/tools/gopls@latest
@ -75,7 +69,6 @@ function main() {
command_start install_yaml-language-server command_start install_yaml-language-server
command_start install_ansible-language-server command_start install_ansible-language-server
command_start install_shfmt command_start install_shfmt
command_start install_shellcheck
command_start install_gopls command_start install_gopls
command_start install_black command_start install_black
command_start install_ansible command_start install_ansible

18
.zshrc
View File

@ -22,7 +22,7 @@ gbranch() {
[[ "$(uname)" == "Darwin" ]] && export ZSH="$HOME/.oh-my-zsh" [[ "$(uname)" == "Darwin" ]] && export ZSH="$HOME/.oh-my-zsh"
HISTFILE=$HOME/.history_zsh HISTFILE=$HOME/.history_zsh
HISTSIZE=10000000 HISTSIZE=10000
SAVEHIST=10000000 SAVEHIST=10000000
autoload -U colors && colors autoload -U colors && colors
setopt PROMPT_SUBST setopt PROMPT_SUBST
@ -121,6 +121,9 @@ alias rsync="rsync --progress"
export PATH=$HOME/.local/bin:$PATH export PATH=$HOME/.local/bin:$PATH
export PATH=/sbin:$PATH export PATH=/sbin:$PATH
export GOPATH=$HOME/golang export GOPATH=$HOME/golang
export GOROOT=/usr/lib/go
export PATH=$PATH:$GOPATH/bin
export PATH=$PATH:$GOROOT/bin
export PATH=$PATH:$HOME/.gem/ruby/2.6.0/bin export PATH=$PATH:$HOME/.gem/ruby/2.6.0/bin
[ -d $HOME/repo/fortigate/bin ] && export PATH=$HOME/repo/fortigate/bin:$PATH [ -d $HOME/repo/fortigate/bin ] && export PATH=$HOME/repo/fortigate/bin:$PATH
export HISTTIMEFORMAT="%F %T " export HISTTIMEFORMAT="%F %T "
@ -138,21 +141,14 @@ if [[ "$(uname)" == "Darwin" ]]; then
# Other export # Other export
export PATH="/usr/local/opt/openssl@3/bin:$PATH" export PATH="/usr/local/opt/openssl@3/bin:$PATH"
export PATH="/opt/homebrew/bin:$PATH" export PATH=$PATH:$HOME/Library/Python/3.9/bin
export PATH=$PATH:$HOME/Library/Python/3.10/bin export PATH=$PATH:/usr/local/opt/python@3.9/Frameworks/Python.framework/Versions/3.9/bin
export PATH=$PATH:/usr/local/opt/python@3.10/Frameworks/Python.framework/Versions/3.10/bin
export LDFLAGS="-L/usr/local/opt/openssl@3/lib" export LDFLAGS="-L/usr/local/opt/openssl@3/lib"
export CPPFLAGS="-I/usr/local/opt/openssl@3/include" export CPPFLAGS="-I/usr/local/opt/openssl@3/include"
export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig" export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig"
export GOROOT="$(brew --prefix golang)/libexec"
export PATH=$PATH:$GOPATH/bin
export PATH=$PATH:$GOROOT/bin
alias python3='/opt/homebrew/bin/python3.10'
alias pip3='/opt/homebrew/bin/pip3.10'
alias lsblk="diskutil list" alias lsblk="diskutil list"
alias Update="~/.config/nvim/installer.sh; brew update; brew upgrade" alias Update="brew update; brew upgrade"
alias ls="ls -Gh" alias ls="ls -Gh"
alias mpv="mpv --no-resume-playback" alias mpv="mpv --no-resume-playback"
alias code="open -a 'Visual Studio Code'" alias code="open -a 'Visual Studio Code'"