From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 16 Feb 2021 11:11:49 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/saltfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=b0880cf00031847d725e33bf83a32d2652b96a0e;hp=54f1045c934f9982df8d9992db5185fbcb480667;p=max%2Fsaltfiles.git

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

diff --git a/bootstrap.sh b/bootstrap.sh
index 721f8b3..1f1b001 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -8,9 +8,7 @@ install_salt() {
 	sudo sh "${bootstrap}" -P
 }
 
-if ! which $SALT_CMD > /dev/null; then
-	install_salt
-fi
+which $SALT_CMD > /dev/null || install_salt
 
 if [[ ! $1 ]]; then
 	sudo $SALT_CMD \
diff --git a/states/i3/arch.sls b/states/i3/arch.sls
index 0e3872d..b0cd3e4 100644
--- a/states/i3/arch.sls
+++ b/states/i3/arch.sls
@@ -10,3 +10,7 @@ install i3:
       - picom
       - feh
       - xss-lock
+      - xorg-server
+      - xorg-xinit
+      - xorg-xrandr
+      - rofi
diff --git a/states/i3/files/config.jinja b/states/i3/files/config.jinja
index eace6f8..1cda1ce 100644
--- a/states/i3/files/config.jinja
+++ b/states/i3/files/config.jinja
@@ -202,6 +202,10 @@ mode "resize" {
 
 bindsym $mod+p mode "resize"
 
+# Slight gaps around windows
+gaps inner 6
+
+{% if host == 'barium' %}
 bar {
   id bar_left
   position top
@@ -252,9 +256,6 @@ bar {
   }
 }
 
-# Slight gaps around windows
-gaps inner 6
-
 workspace 2 output HDMI-A-1
 workspace 4 output HDMI-A-1
 workspace 1 output DP-1
@@ -273,5 +274,61 @@ for_window [class="zoom"] move workspace $chat
 exec "termite --name 'music' -e 'tmux'"
 exec "zoom"
 
+{% elif host == 'dubnium' %}
+bar {
+  id bar_left
+  position top
+  output "DVI-D-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-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
+  }
+}
+
+workspace 1 output DVI-D-1
+workspace 2 output DP-1
+
+{% elif host == 'rhenium' %}
+bar {
+  id bar_right
+  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
+  }
+}
+{% endif %}
+
 exec mako
 exec picom -i 0.95 -D 4
diff --git a/states/i3/files/xinitrc.jinja b/states/i3/files/xinitrc.jinja
index 0c30100..e3d1df4 100755
--- a/states/i3/files/xinitrc.jinja
+++ b/states/i3/files/xinitrc.jinja
@@ -15,13 +15,6 @@ fi
 # Source ~/.xprofile
 [ -f /etc/xprofile ] && . /etc/xprofile
 [ -f ~/.xprofile ] && . ~/.xprofile
-case $HOSTNAME in
-  barium)
-    exec i3
-    ;;
-  *)
-    exec startxfce4
-    ;;
-esac
+exec i3
 
 # vim: set expandtab tabstop=2 smarttab:
diff --git a/states/i3/files/xprofile.jinja b/states/i3/files/xprofile.jinja
index ad5fcbd..fcc1f7a 100755
--- a/states/i3/files/xprofile.jinja
+++ b/states/i3/files/xprofile.jinja
@@ -10,6 +10,12 @@ case $HOSTNAME in
   barium)
     layout-colemak_us
     ;;
+  dubnium)
+    setxkbmap -variant colemak us
+    xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L"
+    xmodmap -e "keycode 135 = Control_R Control_R Control_R Control_R"
+    xmodmap -e "add Control = Control_L Control_R"
+    ;;
   *)
     layout-colemak_gb
     ;;
@@ -22,6 +28,10 @@ case $HOSTNAME in
     xrandr --output HDMI-1 --mode 3840x2160 --pos 1920x0
     xrandr --output eDP-1 --mode 1920x1080 --pos 0x540
     ;;
+  dubnium)
+    xrandr --output DVI-D-1 --mode 1920x1080 --pos 0x540
+    xrandr --output DP-1 --mode 3840x2160 --pos 1920x0
+    ;;
   *)
     ;;
 esac
@@ -31,8 +41,6 @@ export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
 
 feh --bg-scale ~/Pictures/background_1080_1.png&
 
-dunst&
-
 xset -b
 
 export QT_QPA_PLATFORM="xcb"
diff --git a/states/i3/init.sls b/states/i3/init.sls
index f97460e..c9f0b46 100644
--- a/states/i3/init.sls
+++ b/states/i3/init.sls
@@ -53,3 +53,21 @@ layout colemak us:
     - user: {{ grains['user'] }}
     - group: {{ grains['user'] }}
     - mode: 750
+
+xprofile config:
+  file.managed:
+    - name: {{ grains['homedir'] }}/.xprofile
+    - source: salt://i3/files/xprofile.jinja
+    - template: jinja
+    - user: {{ grains['user']}}
+    - group: {{ grains['user']}}
+    - mode: 640
+
+xinitrc config:
+  file.managed:
+    - name: {{ grains['homedir'] }}/.xinitrc
+    - source: salt://i3/files/xinitrc.jinja
+    - template: jinja
+    - user: {{ grains['user']}}
+    - group: {{ grains['user']}}
+    - mode: 640
diff --git a/states/termite/files/config b/states/termite/files/config
index c81a2ff..dc8e339 100644
--- a/states/termite/files/config
+++ b/states/termite/files/config
@@ -1,5 +1,5 @@
 {% if grains['host'] in ['rhenium', ] %}
-	{% set font_size = 10 %}
+	{% set font_size = 16 %}
 {% elif grains['host'] in ['dubnium', ] %}
 	{% set font_size = 13 %}
 {% else %}
diff --git a/states/xfce/arch.sls b/states/xfce/arch.sls
index 6e66e01..c5fc1fa 100644
--- a/states/xfce/arch.sls
+++ b/states/xfce/arch.sls
@@ -15,3 +15,4 @@ install xfce:
       - xfwm4-themes
       - dunst
       - feh
+      - xorg-server