Configure for baryte on ubuntu

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

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index 88b5931e4497fd57f3d58d8b0740015e9ba45a25..ede13d7a7643ed63f3e53e19b7f7a90d75b9ea36 100644 (file)
--- a/states/conky/files/conkyrc
+++ b/states/conky/files/conkyrc
@@ -10,6 +10,8 @@
        {% set ifdev = ['enp4s0'] %}
 {% elif grains['host'] == 'rhenium' %}
        {% set ifdev = ['wlp2s0'] %}
+{% elif grains['host'] == 'baryte' %}
+       {% set ifdev = ['enx00f001e00121'] %}
 {% else %}
        {% set ifdev = ['eth0'] %}
 {% endif %}
@@ -68,7 +70,7 @@ conky.text = [[
                "\#ff0000"
          ${endif} 
   },
-{% if grains['host'] in ['platinum', 'rhenium'] %}
+{% if grains['host'] in ['platinum', 'rhenium', 'barium', 'baryte'] %}
        {
          "full_text": "BAT ${battery_short} ${battery_time}", 
          "color": 

diff --git a/states/dotfiles.sls b/states/dotfiles.sls
index 77e6662631bbf4c338d6fd10987b4fcf0508e1a5..b2677f3b274aee8d47fece15c5d1c1b5e0f24932 100644 (file)
--- a/states/dotfiles.sls
+++ b/states/dotfiles.sls
@@ -2,10 +2,8 @@ include:
   - bash
   - zsh
   - git
-  - sway
   - vim
   - mail
-  - termite
   - qutebrowser
   - tmux
-  - aerc
+  - i3

diff --git a/states/i3/files/config.jinja b/states/i3/files/config.jinja
index aa31ec3c18527a41011b9973470d25451b0e6f1c..15a3bf24f2d22ac8bf9da0969d7893dd190af8a9 100644 (file)
--- a/states/i3/files/config.jinja
+++ b/states/i3/files/config.jinja
@@ -63,7 +63,7 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec termite
+bindsym $mod+Return exec i3-sensible-terminal
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -200,8 +200,10 @@ mode "resize" {
 
 bindsym $mod+p mode "resize"
 
+{% if host != 'baryte' %}
 # Slight gaps around windows
 gaps inner 6
+{% endif %}
 
 {% if host == 'barium' %}
 bar {
@@ -272,6 +274,76 @@ for_window [class="zoom"] move workspace $chat
 
 exec "zoom"
 
+{% elif host == 'baryte' %}
+bar {
+  id bar_left
+  status_command ~/.local/bin/conky-i3bar
+  position top
+  output "DP-3"
+  font pango:Liberation Mono 11
+  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
+    separator $white
+  }
+}
+
+bar {
+  id bar_internal
+  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
+    separator $white
+  }
+}
+
+bar {
+  id bar_right
+  status_command ~/.local/bin/conky-i3bar
+  position top
+  output "DP-2"
+  font pango:Liberation Mono 13
+  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
+    separator $white
+  }
+}
+
+focus_on_window_activation urgent
+no_focus [class="(!?.*pinentry.*)"]
+
+workspace 2 output HDMI-A-1
+workspace 4 output HDMI-A-1
+workspace 1 output DP-3
+workspace 3 output DP-3
+
+workspace $chat output DP-3
+
+assign [class="qutebrowser"] workspace number $ws1
+for_window [class="qutebrowser"] move workspace number $ws1
+assign [class="zoom"] workspace $chat
+for_window [class="zoom"] move workspace $chat
+
+exec "zoom"
+
+
 {% elif host == 'dubnium' %}
 bar {
   id bar_left

diff --git a/states/i3/files/xprofile.jinja b/states/i3/files/xprofile.jinja
index e5aa42f06225ba50ecf4ea46e73bb4af71140127..2b0b7c82dc8ec9dfa1c8eda5df90ead7f319dc85 100755 (executable)
--- a/states/i3/files/xprofile.jinja
+++ b/states/i3/files/xprofile.jinja
@@ -22,6 +22,11 @@ case $HOSTNAME in
     xrandr --output DP-1 --mode 2560x1440 --pos 0x360
     #xrandr --output eDP-1 --off
     ;;
+  baryte)
+    #xrandr --output DP-3 --mode 3840x2160 --pos 2560x0 --rate 30
+    xrandr --output DP-3 --mode 2560x1440 --pos 0x0
+    #xrandr --output eDP-1 --off
+    ;;
   dubnium)
     xrandr --output DP-0 --mode 2560x1440 --pos 0x0
     xrandr --output DP-2 --mode 3840x2160 --pos 2560x0

diff --git a/states/i3/ubuntu.sls b/states/i3/ubuntu.sls
new file mode 100644 (file)
index 0000000..795afb4
--- /dev/null
+++ b/states/i3/ubuntu.sls
@@ -0,0 +1,12 @@
+install i3:
+  pkg.installed:
+    - pkgs:
+      - i3
+      - i3blocks
+      - i3lock
+      - i3status
+      - libnotify-bin
+      - picom
+      - rofi
+      - dunst
+      - nitrogen

diff --git a/states/pass/ubuntu.sls b/states/pass/ubuntu.sls
index 26dce049032f0809c6c687e7a7eb54e0c12fd577..642b75f2d83083c6d3c9af18e6660c7a6caf1a0d 100644 (file)
--- a/states/pass/ubuntu.sls
+++ b/states/pass/ubuntu.sls
@@ -2,4 +2,4 @@ install pass:
   pkg.installed:
     - pkgs:
       - pass
-      - pass-otp
+      - pass-extension-otp

diff --git a/states/qutebrowser/files/config.py b/states/qutebrowser/files/config.py
index 74f4d7e3f376f967751b61682789775e8868519e..c799e122c240357669e74281b4c3c1f508234031 100644 (file)
--- a/states/qutebrowser/files/config.py
+++ b/states/qutebrowser/files/config.py
@@ -10,7 +10,7 @@ c.messages.timeout = 5000
 c.tabs.background = True
 c.tabs.width = "15%"
 
-{% if grains['host'] != 'barium' %}
+{% if grains['host'] not in ['barium', 'baryte'] %}
 c.content.javascript.enabled = False
 config.bind(',ej', 'spawn --userscript noscript_enable')
 config.bind(',dj', 'spawn --userscript noscript_disable')

diff --git a/states/qutebrowser/ubuntu.sls b/states/qutebrowser/ubuntu.sls
index f7b280d1ada11a9a8bb323ddaec0da003ebc463d..59f0dbf3ed078eac86625919957e52e36add314a 100644 (file)
--- a/states/qutebrowser/ubuntu.sls
+++ b/states/qutebrowser/ubuntu.sls
@@ -1,6 +1,5 @@
 install qutebrowser:
   pkg.installed:
-    - pkgs: 
+    - pkgs:
       - qutebrowser
-      - qt5-wayland
-      - python-tldextract
+      - python3-tldextract

diff --git a/states/setup-ubuntu.sls b/states/setup-ubuntu.sls
index 9ddcaf49b793e2d5d3fb93098ef8d15164cc547b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/states/setup-ubuntu.sls
+++ b/states/setup-ubuntu.sls
@@ -1,21 +0,0 @@
-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/utils/ubuntu.sls b/states/utils/ubuntu.sls
new file mode 100644 (file)
index 0000000..0a0225a
--- /dev/null
+++ b/states/utils/ubuntu.sls
@@ -0,0 +1,3 @@
+install inotify tools:
+  pkg.installed:
+    - name: inotify-tools

diff --git a/states/vim/ubuntu.sls b/states/vim/ubuntu.sls
index c7806180aee5f613f159de843c7b033ea255451c..9e164e8851cd619eedcb6ae1d5ef6454707fba73 100644 (file)
--- a/states/vim/ubuntu.sls
+++ b/states/vim/ubuntu.sls
@@ -2,4 +2,6 @@ install vim:
   pkg.installed:
     - pkgs:
       - vim
-      - vim-molokai
+      - pylint
+      - flake8
+      - python3-pip