Compare commits

...

5 Commits

Author SHA1 Message Date
Marcin Woźniak
01976cdecd Added the default cert to REQUESTS_CA_BUNDLE
Signed-off-by: Marcin Woźniak <marcin.wozniak@wundermanthompson.com>
2023-01-05 10:13:01 +01:00
Marcin Woźniak
94b5875592 Added the new PATHs
Signed-off-by: Marcin Woźniak <marcin.wozniak@wundermanthompson.com>
2023-01-05 10:12:36 +01:00
Marcin Woźniak
ccd73c800d Change the directors into specific folders
Signed-off-by: Marcin Woźniak <marcin.wozniak@wundermanthompson.com>
2023-01-05 10:12:23 +01:00
Marcin Woźniak
92739204bc Added the azure-cli to autocomplition
Signed-off-by: Marcin Woźniak <marcin.wozniak@wundermanthompson.com>
2023-01-05 10:11:54 +01:00
Marcin Woźniak
65d3bbbfca Change oneline if into a multiple
Signed-off-by: Marcin Woźniak <marcin.wozniak@wundermanthompson.com>
2023-01-05 10:11:33 +01:00
2 changed files with 26 additions and 5 deletions

View File

@ -93,6 +93,10 @@ function install_meraki_ansible() {
pip3 install meraki --user --force pip3 install meraki --user --force
} }
function install_azure_cli() {
pip3 install azure-cli --user --pre --force
}
function main() { function main() {
command_start update_pip command_start update_pip
command_start install_pyright command_start install_pyright
@ -103,6 +107,7 @@ function main() {
command_start install_shellcheck command_start install_shellcheck
command_start install_gopls command_start install_gopls
command_start install_terraform command_start install_terraform
command_start install_azure_cli
command_start install_black command_start install_black
command_start install_ansible command_start install_ansible
command_start install_meraki_ansible command_start install_meraki_ansible

26
.zshrc
View File

@ -25,6 +25,7 @@ HISTFILE=$HOME/.history_zsh
HISTSIZE=10000000 HISTSIZE=10000000
SAVEHIST=10000000 SAVEHIST=10000000
autoload -U colors && colors autoload -U colors && colors
autoload bashcompinit && bashcompinit
setopt PROMPT_SUBST setopt PROMPT_SUBST
PS1='%(!.%{$fg_bold[red]%}.%{$fg_bold[green]%}%n@)%m %{$fg_bold[blue]%}%(!.%1~.%~) $(parse_git_branch)%{$reset_color%}' PS1='%(!.%{$fg_bold[red]%}.%{$fg_bold[green]%}%n@)%m %{$fg_bold[blue]%}%(!.%1~.%~) $(parse_git_branch)%{$reset_color%}'
plugins=(rake ruby vagrant knife knife_ssh kitchen ) plugins=(rake ruby vagrant knife knife_ssh kitchen )
@ -32,11 +33,21 @@ plugins=(rake ruby vagrant knife knife_ssh kitchen )
ZSH_DISABLE_COMPFIX=true ZSH_DISABLE_COMPFIX=true
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh
[ ! -d $CONFIG/zsh/aws ] && { mkdir -p $CONFIG/zsh/aws ; cd $CONFIG/zsh ; git clone https://github.com/popstas/zsh-command-time.git ; git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ; git clone https://github.com/zsh-users/zsh-autosuggestions.git ; curl https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/plugins/aws/aws.plugin.zsh -o $CONFIG/zsh/aws/aws.plugin.zsh } if [ ! -d $CONFIG/zsh/aws ]; then
[ -d $CONFIG/zsh ] && source $CONFIG/zsh/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh &>> /dev/null mkdir -p $CONFIG/zsh/aws
[ -d $CONFIG/zsh ] && source $CONFIG/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh &>> /dev/null mkdir -p $CONFIG/zsh/azure-cli
[ -d $CONFIG/zsh ] && source $CONFIG/zsh/zsh-command-time/command-time.plugin.zsh &>> /dev/null cd $CONFIG/zsh
[ -d $CONFIG/zsh ] && source $CONFIG/zsh/aws/aws.plugin.zsh &>> /dev/null git clone https://github.com/popstas/zsh-command-time.git
git clone https://github.com/zsh-users/zsh-syntax-highlighting.git
git clone https://github.com/zsh-users/zsh-autosuggestions.git
curl https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/plugins/aws/aws.plugin.zsh -o $CONFIG/zsh/aws/aws.plugin.zsh
curl https://raw.githubusercontent.com/Azure/azure-cli/dev/az.completion -o $CONFIG/zsh/azure-cli/az.completion
fi
[ -d $CONFIG/zsh/zsh-autosuggestions ] && source $CONFIG/zsh/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh &>> /dev/null
[ -d $CONFIG/zsh/zsh-syntax-highlighting ] && source $CONFIG/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh &>> /dev/null
[ -d $CONFIG/zsh/zsh-command-time ] && source $CONFIG/zsh/zsh-command-time/command-time.plugin.zsh &>> /dev/null
[ -d $CONFIG/zsh/aws ] && source $CONFIG/zsh/aws/aws.plugin.zsh &>> /dev/null
[ -d $CONFIG/zsh/azure-cli ] && source $CONFIG/zsh/azure-cli/az.completion &>> /dev/null
[ -f $HOME/.password ] && source $HOME/.password [ -f $HOME/.password ] && source $HOME/.password
[ ! -d $CONFIG/fzf ] && git clone https://github.com/junegunn/fzf.git $HOME/.config/fzf [ ! -d $CONFIG/fzf ] && git clone https://github.com/junegunn/fzf.git $HOME/.config/fzf
[ -f $CONFIG/fzf/shell/key-bindings.zsh ] && source $HOME/.config/fzf/shell/key-bindings.zsh [ -f $CONFIG/fzf/shell/key-bindings.zsh ] && source $HOME/.config/fzf/shell/key-bindings.zsh
@ -123,9 +134,11 @@ export PATH=/bin:$PATH
export PATH=/usr/bin:$PATH export PATH=/usr/bin:$PATH
export PATH=/usr/sbin:$PATH export PATH=/usr/sbin:$PATH
export PATH=/sbin:$PATH export PATH=/sbin:$PATH
export PATH=/usr/local/bin:$PATH
export PATH=$HOME/go/bin:$PATH export PATH=$HOME/go/bin:$PATH
export PATH=$HOME/golang/bin:$PATH export PATH=$HOME/golang/bin:$PATH
export PATH=$HOME/.local/bin:$PATH export PATH=$HOME/.local/bin:$PATH
export PATH=$HOME/node_modules/.bin:$PATH
export GOPATH=$HOME/golang export GOPATH=$HOME/golang
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
@ -185,5 +198,8 @@ setopt +o nomatch
# Error with icu # Error with icu
export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
# Error with Delinea
[ -f "/etc/ssl/certs/ca-certificates.crt" ] && export REQUESTS_CA_BUNDLE='/etc/ssl/certs/ca-certificates.crt'
# Generated for envman. Do not edit. # Generated for envman. Do not edit.
[ -s "$HOME/.config/envman/load.sh" ] && source "$HOME/.config/envman/load.sh" [ -s "$HOME/.config/envman/load.sh" ] && source "$HOME/.config/envman/load.sh"