updated zsh state

This commit is contained in:
Paul 2023-01-04 23:36:02 +01:00
parent cc6ca5056d
commit bc9f791639
2 changed files with 10 additions and 8 deletions

View File

@ -15,6 +15,10 @@ zsh-autosuggestions-repo:
- require: - require:
- pkg: zsh-pkg - pkg: zsh-pkg
zsh-omz-env-old:
file.absent:
- name: /etc/zsh/zprofile
zsh-omz-env: zsh-omz-env:
file.managed: file.managed:
- name: /etc/zsh/zshenv - name: /etc/zsh/zshenv

View File

@ -1,7 +1,10 @@
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }} ## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
{%- from "zsh/map.jinja" import zsh with context %} {%- from "zsh/map.jinja" import zsh with context %}
export PATH=$PATH:/usr/local/bin:/usr/local/sbin if [[ $PATH != *"/usr/local/bin:/usr/local/sbin"* ]]
then
export PATH=$PATH:/usr/local/bin:/usr/local/sbin
fi
# Main environments variables # Main environments variables
export EDITOR=nvim export EDITOR=nvim
@ -9,7 +12,7 @@ export JAVA_OPTS='-XX:+IgnoreUnrecognizedVMOptions --add-modules java.se.ee'
{% if zsh.config.golang -%} {% if zsh.config.golang -%}
# Golang settings # Golang settings
if [[ -d /usr/local/apps/golang ]] if [[ -d /usr/local/apps/golang && $PATH != *"golang"* ]]
then then
export GOPATH=~/go export GOPATH=~/go
export GOROOT=/usr/local/apps/golang export GOROOT=/usr/local/apps/golang
@ -20,7 +23,7 @@ fi
{% if zsh.config.rust -%} {% if zsh.config.rust -%}
# Rust settings # Rust settings
if [[ -d ~/.cargo/bin ]] if [[ -d ~/.cargo/bin && $PATH != *"cargo"* ]]
then then
export PATH=$PATH:$HOME/.cargo/bin export PATH=$PATH:$HOME/.cargo/bin
fi fi
@ -44,11 +47,6 @@ plugins=(common-aliases git)
plugins=(common-aliases sudo docker salt git ansible command-not-found systemd python nmap zsh-autosuggestions golang rust kubectl) plugins=(common-aliases sudo docker salt git ansible command-not-found systemd python nmap zsh-autosuggestions golang rust kubectl)
{%- endif %} {%- endif %}
{#
#for example
#plugins=(common-aliases sudo docker salt git ansible command-not-found virtualenvwrapper tmux systemd python golang nmap)
#}
if [[ -f $ZSH/oh-my-zsh.sh ]] if [[ -f $ZSH/oh-my-zsh.sh ]]
then then
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh