Merge branch 'master' of git.friedersdorff.com:max/saltfiles

diff --git a/states/conky/arch.sls b/states/conky/arch.sls
new file mode 100644 (file)
index 0000000..7c2f408
--- /dev/null
+++ b/states/conky/arch.sls
@@ -0,0 +1,3 @@
+install conky:
+  pkg.installed:
+    - name: conky

diff --git a/states/conky/debian.sls b/states/conky/debian.sls
new file mode 100644 (file)
index 0000000..7c2f408
--- /dev/null
+++ b/states/conky/debian.sls
@@ -0,0 +1,3 @@
+install conky:
+  pkg.installed:
+    - name: conky

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index 17fc2ddafe2002acef12213a0b5ab6ec7348dc77..b5791c16afb2b334dc2bec9ee336ca75a86f7a71 100644 (file)
--- a/states/conky/files/conkyrc
+++ b/states/conky/files/conkyrc
@@ -4,6 +4,8 @@
        {% set ifdev = 'br0' %}
 {% elif grains['host'] == 'platinum' %}
        {% set ifdev = 'wlp2s0' %}
+{% elif grains['host'] == 'barium' %}
+       {% set ifdev = 'enp3s0f1' %}
 {% else %}
        {% set ifdev = 'eth0' %}
 {% endif %}

diff --git a/states/conky/ubuntu.sls b/states/conky/ubuntu.sls
new file mode 100644 (file)
index 0000000..7c2f408
--- /dev/null
+++ b/states/conky/ubuntu.sls
@@ -0,0 +1,3 @@
+install conky:
+  pkg.installed:
+    - name: conky

diff --git a/states/dircolors/init.sls b/states/dircolors/init.sls
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..902c0adf3929a294f188ecd74cb02776e5c62b33 100644 (file)
--- a/states/dircolors/init.sls
+++ b/states/dircolors/init.sls
@@ -0,0 +1,8 @@
+ensure dircolor file:
+  file.managed:
+    - name: {{ grains['homedir'] }}/.dir_colors
+    - source: salt://dircolors/files/dir_colors
+    - user: {{ grains['user'] }}
+    - group: {{ grains['user'] }}
+    - mode: 660
+    - template: jinja

diff --git a/states/firefox/arch.sls b/states/firefox/arch.sls
new file mode 100644 (file)
index 0000000..8074266
--- /dev/null
+++ b/states/firefox/arch.sls
@@ -0,0 +1,3 @@
+install firefox:
+  pkg.installed:
+    - name: firefox

diff --git a/states/firefox/debian.sls b/states/firefox/debian.sls
new file mode 100644 (file)
index 0000000..8074266
--- /dev/null
+++ b/states/firefox/debian.sls
@@ -0,0 +1,3 @@
+install firefox:
+  pkg.installed:
+    - name: firefox

diff --git a/states/firefox/ubuntu.sls b/states/firefox/ubuntu.sls
new file mode 100644 (file)
index 0000000..8074266
--- /dev/null
+++ b/states/firefox/ubuntu.sls
@@ -0,0 +1,3 @@
+install firefox:
+  pkg.installed:
+    - name: firefox

diff --git a/states/font/pango-liberation-mono.sls b/states/font/pango-liberation-mono.sls
index dbea64cbb23589404ae6a35ef60c63e6d89526c9..552bed22e8829e39e70383f2982fb4c95ec79a46 100644 (file)
--- a/states/font/pango-liberation-mono.sls
+++ b/states/font/pango-liberation-mono.sls
@@ -3,4 +3,8 @@ install liberation mono:
   pkg.installed:
     - name: media-fonts/liberation-fonts
     - refresh: False
+{% elif grains['os'] | lower == 'arch' %}
+install libration mono:
+  pkg.installed:
+    - name: ttf-liberation
 {% endif %}

diff --git a/states/git/arch.sls b/states/git/arch.sls
new file mode 100644 (file)
index 0000000..1e11106
--- /dev/null
+++ b/states/git/arch.sls
@@ -0,0 +1,3 @@
+install git:
+  pkg.installed:
+    - name: git

diff --git a/states/git/debian.sls b/states/git/debian.sls
new file mode 100644 (file)
index 0000000..1e11106
--- /dev/null
+++ b/states/git/debian.sls
@@ -0,0 +1,3 @@
+install git:
+  pkg.installed:
+    - name: git

diff --git a/states/git/ubuntu.sls b/states/git/ubuntu.sls
new file mode 100644 (file)
index 0000000..1e11106
--- /dev/null
+++ b/states/git/ubuntu.sls
@@ -0,0 +1,3 @@
+install git:
+  pkg.installed:
+    - name: git

diff --git a/states/mail/arch.sls b/states/mail/arch.sls
new file mode 100644 (file)
index 0000000..a6bfc5c
--- /dev/null
+++ b/states/mail/arch.sls
@@ -0,0 +1,3 @@
+install mutt:
+  pkg.installed:
+    - name: mutt

diff --git a/states/mail/debian.sls b/states/mail/debian.sls
new file mode 100644 (file)
index 0000000..a6bfc5c
--- /dev/null
+++ b/states/mail/debian.sls
@@ -0,0 +1,3 @@
+install mutt:
+  pkg.installed:
+    - name: mutt

diff --git a/states/mail/ubuntu.sls b/states/mail/ubuntu.sls
new file mode 100644 (file)
index 0000000..a6bfc5c
--- /dev/null
+++ b/states/mail/ubuntu.sls
@@ -0,0 +1,3 @@
+install mutt:
+  pkg.installed:
+    - name: mutt

diff --git a/states/ntp/arch.sls b/states/ntp/arch.sls
new file mode 100644 (file)
index 0000000..a3c8902
--- /dev/null
+++ b/states/ntp/arch.sls
@@ -0,0 +1,10 @@
+install ntp:
+  pkg.installed:
+    - name: ntp
+
+run ntp service:
+  service.running:
+    - name: ntpd
+    - enable: True
+    - require:
+      - pkg: install ntp

diff --git a/states/ntp/debian.sls b/states/ntp/debian.sls
new file mode 100644 (file)
index 0000000..a3c8902
--- /dev/null
+++ b/states/ntp/debian.sls
@@ -0,0 +1,10 @@
+install ntp:
+  pkg.installed:
+    - name: ntp
+
+run ntp service:
+  service.running:
+    - name: ntpd
+    - enable: True
+    - require:
+      - pkg: install ntp

diff --git a/states/ntp/ubuntu.sls b/states/ntp/ubuntu.sls
new file mode 100644 (file)
index 0000000..a3c8902
--- /dev/null
+++ b/states/ntp/ubuntu.sls
@@ -0,0 +1,10 @@
+install ntp:
+  pkg.installed:
+    - name: ntp
+
+run ntp service:
+  service.running:
+    - name: ntpd
+    - enable: True
+    - require:
+      - pkg: install ntp

diff --git a/states/pass/arch.sls b/states/pass/arch.sls
new file mode 100644 (file)
index 0000000..26dce04
--- /dev/null
+++ b/states/pass/arch.sls
@@ -0,0 +1,5 @@
+install pass:
+  pkg.installed:
+    - pkgs:
+      - pass
+      - pass-otp

diff --git a/states/pass/debian.sls b/states/pass/debian.sls
new file mode 100644 (file)
index 0000000..26dce04
--- /dev/null
+++ b/states/pass/debian.sls
@@ -0,0 +1,5 @@
+install pass:
+  pkg.installed:
+    - pkgs:
+      - pass
+      - pass-otp

diff --git a/states/pass/ubuntu.sls b/states/pass/ubuntu.sls
new file mode 100644 (file)
index 0000000..26dce04
--- /dev/null
+++ b/states/pass/ubuntu.sls
@@ -0,0 +1,5 @@
+install pass:
+  pkg.installed:
+    - pkgs:
+      - pass
+      - pass-otp

diff --git a/states/qutebrowser/arch.sls b/states/qutebrowser/arch.sls
new file mode 100644 (file)
index 0000000..f7b280d
--- /dev/null
+++ b/states/qutebrowser/arch.sls
@@ -0,0 +1,6 @@
+install qutebrowser:
+  pkg.installed:
+    - pkgs: 
+      - qutebrowser
+      - qt5-wayland
+      - python-tldextract

diff --git a/states/qutebrowser/debian.sls b/states/qutebrowser/debian.sls
new file mode 100644 (file)
index 0000000..f7b280d
--- /dev/null
+++ b/states/qutebrowser/debian.sls
@@ -0,0 +1,6 @@
+install qutebrowser:
+  pkg.installed:
+    - pkgs: 
+      - qutebrowser
+      - qt5-wayland
+      - python-tldextract

diff --git a/states/qutebrowser/files/config.py b/states/qutebrowser/files/config.py
index 515a723cdd684bc51c3fb28fb1b55b493e3dff13..6cf70b1df59d08dd0a1799b511d014cac52f5845 100644 (file)
--- a/states/qutebrowser/files/config.py
+++ b/states/qutebrowser/files/config.py
@@ -2,8 +2,6 @@ config.load_autoconfig()
 
 c.auto_save.session = True
 c.content.cookies.accept = 'no-3rdparty'
-c.content.cookies.store = False
-c.content.javascript.enabled = False
 c.content.images = True
 c.editor.command = ['urxvt', '-e', 'vim', '{file}']
 c.tabs.position = 'left'
@@ -12,16 +10,22 @@ c.url.searchengines = {'DEFAULT': 'https://duckduckgo.com/?q={}'}
 c.messages.timeout = 5000
 c.tabs.background = True
 
+{% if grains['host'] != 'barium' %}
+c.content.javascript.enabled = False
 config.bind(',ej', 'spawn --userscript noscript_enable')
 config.bind(',dj', 'spawn --userscript noscript_disable')
 
+c.content.cookies.store = False
+
+# Allow JS and cookies on own domain
+config.set('content.javascript.enabled', True, '*.friedersdorff.com')
+{% endif %}
+
 config.bind(',zl', 'spawn --userscript qute-pass --dmenu-invocation bemenu')
 config.bind(',zul', 'spawn --userscript qute-pass --dmenu-invocation bemenu --username-only')
 config.bind(',zpl', 'spawn --userscript qute-pass --dmenu-invocation bemenu --password-only')
 config.bind(',zol', 'spawn --userscript qute-pass --dmenu-invocation bemenu --otp-only')
 
-# Allow JS and cookies on own domain
-config.set('content.javascript.enabled', True, '*.friedersdorff.com')
 
 # Fingerprinting protection
 c.content.headers.accept_language = 'en-US,en;q=0.5'

diff --git a/states/qutebrowser/init.sls b/states/qutebrowser/init.sls
index 9f044ec966bb05f4b9c13c88e8329c59a2cebf79..c8a40ae9cc95ddcb6a8c577bcd82ac9d44aa58fc 100644 (file)
--- a/states/qutebrowser/init.sls
+++ b/states/qutebrowser/init.sls
@@ -2,6 +2,13 @@ include:
   - qutebrowser.{{ grains['os'] | lower}}
   - local.bin
 
+qute config dir:
+  file.directory:
+    - name: {{ grains['homedir'] }}/.config/qutebrowser
+    - user: {{ grains['user'] }}
+    - group: {{ grains['user'] }}
+    - mode: 750
+    - makedirs: True
 
 userscripts dir:
   file.directory:
@@ -59,4 +66,7 @@ qutebrowser config:
     - source: salt://qutebrowser/files/config.py
     - user: {{ grains['user'] }}
     - group: {{ grains['user'] }}
+    - template: jinja
     - mode: 640
+    - require:
+      - file: qute config dir

diff --git a/states/qutebrowser/ubuntu.sls b/states/qutebrowser/ubuntu.sls
new file mode 100644 (file)
index 0000000..f7b280d
--- /dev/null
+++ b/states/qutebrowser/ubuntu.sls
@@ -0,0 +1,6 @@
+install qutebrowser:
+  pkg.installed:
+    - pkgs: 
+      - qutebrowser
+      - qt5-wayland
+      - python-tldextract

diff --git a/states/setup-arch.sls b/states/setup-arch.sls
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/states/setup-debian.sls b/states/setup-debian.sls
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/states/setup-ubuntu.sls b/states/setup-ubuntu.sls
new file mode 100644 (file)
index 0000000..9ddcaf4
--- /dev/null
+++ b/states/setup-ubuntu.sls
@@ -0,0 +1,21 @@
+salt repo:
+  pkgrepo.managed:
+    - humanname: saltstack
+    - name: deb http://repo.saltstack.com/py3/ubuntu/18.04/amd64/latest bionic main
+    - dist: bionic
+    - file: /etc/apt/sources.list.d/saltstack.list
+    - key_url: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/latest/SALTSTACK-GPG-KEY.pub
+
+install salt:
+  pkg.latest:
+    - name: salt-master
+    - require:
+      - pkgrepo: salt repo
+
+disable salt:
+  service.dead:
+    - name: salt-master
+    - enable: False
+    - require:
+      - pkg: install salt
+

diff --git a/states/sway/arch.sls b/states/sway/arch.sls
new file mode 100644 (file)
index 0000000..e8d2445
--- /dev/null
+++ b/states/sway/arch.sls
@@ -0,0 +1,6 @@
+install sway:
+  pkg.installed:
+    - pkgs: 
+      - sway 
+      - swaylock
+      - swayidle

diff --git a/states/sway/debian.sls b/states/sway/debian.sls
new file mode 100644 (file)
index 0000000..e8d2445
--- /dev/null
+++ b/states/sway/debian.sls
@@ -0,0 +1,6 @@
+install sway:
+  pkg.installed:
+    - pkgs: 
+      - sway 
+      - swaylock
+      - swayidle

diff --git a/states/sway/files/barium b/states/sway/files/barium
new file mode 100644 (file)
index 0000000..e1c8786
--- /dev/null
+++ b/states/sway/files/barium
@@ -0,0 +1,78 @@
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+bar {
+  id bar_left
+  position top
+  output "HDMI-A-1"
+  font pango:Liberation Mono 12
+  colors {
+    background $black_super
+    focused_background $black
+    focused_workspace $black_super $yellow_super $black
+    active_workspace $black_super $blue_super $black
+    inactive_workspace $black_super $black_super $white_super
+    urgent_workspace $black $red_super $white
+  }
+}
+
+bar {
+  id bar_center
+  status_command ~/.local/bin/conky-i3bar
+  position top
+  output "eDP-1"
+  font pango:Liberation Mono 12
+  colors {
+    background $black_super
+    focused_background $black
+    focused_workspace $black_super $yellow_super $black
+    active_workspace $black_super $blue_super $black
+    inactive_workspace $black_super $black_super $white_super
+    urgent_workspace $black $red_super $white
+  }
+}
+
+bar {
+  id bar_right
+  position top
+  output "DP-1"
+  font pango:Liberation Mono 12
+  colors {
+    background $black_super
+    focused_background $black
+    focused_workspace $black_super $yellow_super $black
+    active_workspace $black_super $blue_super $black
+    inactive_workspace $black_super $black_super $white_super
+    urgent_workspace $black $red_super $white
+  }
+}
+
+
+output HDMI-A-1 {
+  position 0 0
+  background ~/Pictures/background_1080_1.png fit
+}
+
+output eDP-1 {
+  position 1920 530
+  background ~/Pictures/background_1080_1.png fit
+  scale 1.15
+}
+output DP-1 {
+  position 3590 0
+  background ~/Pictures/background_1080_1.png fit
+}
+
+workspace 1 output HDMI-A-1
+workspace 2 output eDP-1
+workspace 3 output DP-1
+
+
+font pango:Liberation Mono 10
+
+input type:keyboard {
+  xkb_layout gb 
+  xkb_variant colemak
+  xkb_options ctrl:nocaps
+}
+
+exec dunst&

diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index e474512d580cbfecf26a1cacac89eeea83c7ca18..536627f0a02e01ad5d5e6617c4623f69778de8ab 100644 (file)
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -183,10 +183,10 @@ for_window [class="^rdesktop"] move workspace number 9; floating disable
 for_window [class="Pinentry"] floating enable
 
 exec swayidle \
-  timeout 300 "lock.{{ host }}" \
+  timeout 300 "lock.nosmartcard" \
   timeout 600 'swaymsg "output * dpms off"' \
     resume 'swaymsg "output * dpms on" \
-  before-sleep "lock.{{ host }}"
+  before-sleep "lock.nosmartcard"
 
 # host specific section
 {%- do salt.log.error('sway/files/' + host) -%}

diff --git a/states/sway/files/lock b/states/sway/files/lock
index 050e67a7c308afbd5cbe6e66c210f5641c14b32e..00ed2a83eeb91f304f21363911412a4db6cea6ce 100644 (file)
--- a/states/sway/files/lock
+++ b/states/sway/files/lock
@@ -5,8 +5,17 @@ Remove now to lock."
 NOLOCK_MSG="Smartcard was not removed, did not lock!"
 
 LOCK_CMD="swaylock "
+SLEEP_CMD=":"
+{% if grains['host'] == 'magnesium' %}
 LOCK_CMD+=" -i HDMI-A-2:~/Pictures/lockscreen_1080_1.png"
 LOCK_CMD+=" -i HDMI-A-3:~/Pictures/lockscreen_1080_2.png"
+{% elif grains['host'] == 'barium' %}
+LOCK_CMD+=" -i DP-1:~/Pictures/lockscreen_1080_1.png"
+LOCK_CMD+=" -i eDP-1:~/Pictures/lockscreen_1080_1.png"
+LOCK_CMD+=" -i HDMI-A-1:~/Pictures/lockscreen_1080_1.png"
+SLEEP_CMD="systemctl suspend"
+{% endif %}
+
 
 if [ $(pgrep -c lock.magnesium) -gt 1 ]; then
        exit
@@ -29,5 +38,7 @@ else
                done
                pkill -f "$NAG_MSG"
        fi
-       $LOCK_CMD
+       $LOCK_CMD &
+       sleep 10
+       $SLEEP_CMD
 fi

diff --git a/states/sway/files/platinum b/states/sway/files/platinum
index 73b8eaad577090fd8e7985d789d73f4a76406b3c..c8291cfdc3fe89500d4d5cc0665d33745225bd0d 100644 (file)
--- a/states/sway/files/platinum
+++ b/states/sway/files/platinum
@@ -34,3 +34,6 @@ input * {
   xkb_variant colemak
   xkb_options ctrl:nocaps
 }
+
+# Disable tap-to-click on touchpad to prevent jerkyness
+input type:touch tap disable

diff --git a/states/sway/init.sls b/states/sway/init.sls
index 4b04205df82767ce527b5c0cd62377d1bab0fe8d..a134528fc72572e020dbe39b93e3c97d1686ba9e 100644 (file)
--- a/states/sway/init.sls
+++ b/states/sway/init.sls
@@ -15,7 +15,7 @@ config dir:
 sway config:
   file.managed:
     - name: {{ grains['homedir'] }}/.config/sway/config
-    - source: {{ grains['stateroot'] }}/sway/files/config.jinja
+    - source: salt://sway/files/config.jinja
     - template: jinja
     - user: {{ grains['user']}}
     - group: {{ grains['user']}}
@@ -24,7 +24,7 @@ sway config:
 lock script:
   file.managed:
     - name: {{ grains['homedir'] }}/.local/bin/lock.nosmartcard
-    - source: {{ grains['stateroot'] }}/sway/files/lock
+    - source: salt://sway/files/lock
     - template: jinja
     - user: {{ grains['user'] }}
     - group: {{ grains['user'] }}
@@ -33,7 +33,7 @@ lock script:
 conky launch script:
   file.managed:
     - name: {{ grains['homedir'] }}/.local/bin/conky-i3bar
-    - source: {{ grains['stateroot'] }}/sway/files/conky-i3bar
+    - source: salt://sway/files/conky-i3bar
     - user: {{ grains['user'] }}
     - group: {{ grains['user'] }}
     - mode: 750

diff --git a/states/sway/ubuntu.sls b/states/sway/ubuntu.sls
new file mode 100644 (file)
index 0000000..e8d2445
--- /dev/null
+++ b/states/sway/ubuntu.sls
@@ -0,0 +1,6 @@
+install sway:
+  pkg.installed:
+    - pkgs: 
+      - sway 
+      - swaylock
+      - swayidle

diff --git a/states/termite/arch.sls b/states/termite/arch.sls
new file mode 100644 (file)
index 0000000..8a3cfd1
--- /dev/null
+++ b/states/termite/arch.sls
@@ -0,0 +1,3 @@
+install termite:
+  pkg.installed:
+    - name: termite

diff --git a/states/termite/debian.sls b/states/termite/debian.sls
new file mode 100644 (file)
index 0000000..8a3cfd1
--- /dev/null
+++ b/states/termite/debian.sls
@@ -0,0 +1,3 @@
+install termite:
+  pkg.installed:
+    - name: termite

diff --git a/states/termite/files/config b/states/termite/files/config
index 7f65f91fe68fb0c4c19e582be6666dcca1331f1a..a4894163bc9c3d675694e367874c73976f3b6e1c 100644 (file)
--- a/states/termite/files/config
+++ b/states/termite/files/config
@@ -1,15 +1,23 @@
 {% if grains['host'] == 'magnesium' %}
        {% set font_size = 12 %}
+{% elif grains['host'] == 'barium' %}
+       {% set font_size = 12 %}
 {% else %}
        {% set font_size = 11 %}
 {% endif %}
 
+{% if grains['host'] == 'barium' %}
+       {% set font_family = 'Source Code Pro' %}
+{% else %}
+       {% set font_family = 'Source Code Pro for Powerline' %}
+{% endif %}
+
 [options]
 #allow_bold = true
 #audible_bell = false
 #clickable_url = true
 #dynamic_title = true
-font = Source Code Pro for Powerline {{ font_size }} 
+font = {{ font_family }} {{ font_size }} 
 #fullscreen = true
 #geometry = 640x480
 #icon_name = terminal

diff --git a/states/termite/ubuntu.sls b/states/termite/ubuntu.sls
new file mode 100644 (file)
index 0000000..8a3cfd1
--- /dev/null
+++ b/states/termite/ubuntu.sls
@@ -0,0 +1,3 @@
+install termite:
+  pkg.installed:
+    - name: termite

diff --git a/states/tmux/arch.sls b/states/tmux/arch.sls
new file mode 100644 (file)
index 0000000..610a9e3
--- /dev/null
+++ b/states/tmux/arch.sls
@@ -0,0 +1,3 @@
+install tmux:
+  pkg.installed:
+    - name: tmux

diff --git a/states/tmux/debian.sls b/states/tmux/debian.sls
new file mode 100644 (file)
index 0000000..610a9e3
--- /dev/null
+++ b/states/tmux/debian.sls
@@ -0,0 +1,3 @@
+install tmux:
+  pkg.installed:
+    - name: tmux

diff --git a/states/tmux/ubuntu.sls b/states/tmux/ubuntu.sls
new file mode 100644 (file)
index 0000000..610a9e3
--- /dev/null
+++ b/states/tmux/ubuntu.sls
@@ -0,0 +1,3 @@
+install tmux:
+  pkg.installed:
+    - name: tmux

diff --git a/states/vim/arch.sls b/states/vim/arch.sls
new file mode 100644 (file)
index 0000000..c780618
--- /dev/null
+++ b/states/vim/arch.sls
@@ -0,0 +1,5 @@
+install vim:
+  pkg.installed:
+    - pkgs:
+      - vim
+      - vim-molokai

diff --git a/states/vim/debian.sls b/states/vim/debian.sls
new file mode 100644 (file)
index 0000000..c780618
--- /dev/null
+++ b/states/vim/debian.sls
@@ -0,0 +1,5 @@
+install vim:
+  pkg.installed:
+    - pkgs:
+      - vim
+      - vim-molokai

diff --git a/states/vim/init.sls b/states/vim/init.sls
index 7f1ffa595f5e838e13f5b6dc13055ca6e5b9a705..c2a888f8e9e17463844405831082fac5d24f1088 100644 (file)
--- a/states/vim/init.sls
+++ b/states/vim/init.sls
@@ -1,7 +1,7 @@
 vimrc:
   file.managed:
     - name: {{ grains['homedir'] }}/.vimrc
-    - source: {{ grains['stateroot'] }}/vim/files/vimrc
+    - source: salt:///vim/files/vimrc
     - user: {{ grains['user'] }}
     - group: {{ grains['user'] }}
     - mode: 640
@@ -29,3 +29,11 @@ plugins install:
 plugins update:
   cmd.run:
     - name: vim +PluginUpdate +qall
+
+packup dir:
+  file.directory:
+    - name: {{ grains['homedir'] }}/.vim/backup
+    - user: {{ grains['user'] }}
+    - group: {{ grains['user'] }}
+    - mode: 750
+    - makedirs: True

diff --git a/states/vim/ubuntu.sls b/states/vim/ubuntu.sls
new file mode 100644 (file)
index 0000000..c780618
--- /dev/null
+++ b/states/vim/ubuntu.sls
@@ -0,0 +1,5 @@
+install vim:
+  pkg.installed:
+    - pkgs:
+      - vim
+      - vim-molokai

diff --git a/states/zsh/arch.sls b/states/zsh/arch.sls
new file mode 100644 (file)
index 0000000..5aa4147
--- /dev/null
+++ b/states/zsh/arch.sls
@@ -0,0 +1,5 @@
+install zsh:
+  pkg.installed:
+    - pkgs:
+      - zsh
+      - zsh-completions

diff --git a/states/zsh/debian.sls b/states/zsh/debian.sls
new file mode 100644 (file)
index 0000000..5aa4147
--- /dev/null
+++ b/states/zsh/debian.sls
@@ -0,0 +1,5 @@
+install zsh:
+  pkg.installed:
+    - pkgs:
+      - zsh
+      - zsh-completions

diff --git a/states/zsh/files/zshrc b/states/zsh/files/zshrc
index 86ecdf41006c67a2ea2df8f60e8f82528e6aab4f..04852cedeccc0cc0da2949ba6d1c4fe9f903bbd8 100644 (file)
--- a/states/zsh/files/zshrc
+++ b/states/zsh/files/zshrc
@@ -8,7 +8,7 @@ zstyle ':completion:*' ignore-parents parent pwd
 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
 zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
 zstyle ':completion:*' list-suffixes true
-zstyle ':completion:*' max-errors 2
+zstyle ':completion:*' max-errors 1
 zstyle ':completion:*' menu select=1
 zstyle ':completion:*' preserve-prefix '//[^/]##/'
 zstyle ':completion:*' prompt 'Corrections with %e differences:'

diff --git a/states/zsh/init.sls b/states/zsh/init.sls
index 956d13db7f19551563738938068699db4d018b9b..ec3907ed808b4af8020eaaff54b221107ef97802 100644 (file)
--- a/states/zsh/init.sls
+++ b/states/zsh/init.sls
@@ -1,4 +1,5 @@
 include:
+  - user.{{ grains['user'] }}
   - aliases
   - dircolors
   - zsh.{{ grains['os'] | lower }}

diff --git a/states/zsh/ubuntu.sls b/states/zsh/ubuntu.sls
new file mode 100644 (file)
index 0000000..37ac5fc
--- /dev/null
+++ b/states/zsh/ubuntu.sls
@@ -0,0 +1,12 @@
+install zsh:
+  pkg.installed:
+    - pkgs:
+      - zsh
+
+ensure git-prompt exists:
+  file.symlink:
+    - name: {{ grains['homedir'] }}/.git-prompt.sh
+    - target: /usr/lib/git-core/git-sh-prompt
+    - user: {{ grains['user'] }}
+    - group: {{ grains['user'] }}
+    - mode: 444