moved salt from alias to functin, added username pillar

This commit is contained in:
Jonas Forsberg
2020-08-01 14:53:37 +02:00
parent f290d39b96
commit 7e580ef997
5 changed files with 18 additions and 27 deletions

View File

@@ -1,3 +1,5 @@
```
alias salt='sudo salt-call --local --file-root "$HOME/salt/states" --pillar-root "$HOME/salt/pillars" "$@"'
function salt(){
sudo salt-call --local --file-root "$HOME/salt/states" --pillar-root "$HOME/salt/pillars" "$@" pillar="{username: $USER}"
}
```

View File

@@ -3,15 +3,14 @@ packages:
vim:
plugins:
jonas:
calendar-vim:
name: https://github.com/mattn/calendar-vim.git
vim-commentary:
name: https://github.com/tpope/vim-commentary.git
vim-instant-markdown:
name: https://github.com/suan/vim-instant-markdown.git
vim-surround:
name: https://github.com/tpope/vim-surround.git
vimwiki:
name: https://github.com/vimwiki/vimwiki.git
calendar-vim:
name: https://github.com/mattn/calendar-vim.git
vim-commentary:
name: https://github.com/tpope/vim-commentary.git
vim-instant-markdown:
name: https://github.com/suan/vim-instant-markdown.git
vim-surround:
name: https://github.com/tpope/vim-surround.git
vimwiki:
name: https://github.com/vimwiki/vimwiki.git

View File

@@ -1,9 +1,7 @@
{% for user, plugins in pillar['vim']['plugins'].items() %}
{% for plugin, args in plugins.items() %}
{% for plugin, args in pillar['vim']['plugins'].items() %}
{{ plugin }}:
git.latest:
- name: {{ args['name'] }}
- target: {{ salt['user.info']( user ).home }}/.vim/bundle/{{ plugin }}
- user: {{ user }}
{% endfor %}
- target: {{ salt['user.info']( pillar['username'] ).home }}/.vim/bundle/{{ plugin }}
- user: {{ pillar['username'] }}
{% endfor %}