X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fi3%2Ffiles%2Fconfig.jinja;h=f64f3e600296b3bd2b1e010c1db997deee1f244b;hb=HEAD;hp=1b2f5f5a8558bfdf65ac1131080413d2e39d296c;hpb=8d0ca5bceb4ef01d3d221e526474a4218ba38327;p=max%2Fsaltfiles.git

diff --git a/states/i3/files/config.jinja b/states/i3/files/config.jinja
index 1b2f5f5..f64f3e6 100644
--- a/states/i3/files/config.jinja
+++ b/states/i3/files/config.jinja
@@ -26,7 +26,7 @@ set $white #f5deb3
 set $white_super #ffffff
 
 client.focused $black $yellow_super $black $black $black
-client.focused_inactive $black $black_super $white $black $black 
+client.focused_inactive $black $black_super $white $black $black
 
 set $mod Mod4
 
@@ -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 foot
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -138,7 +138,6 @@ set $ws8 "8"
 set $ws9 "9"
 set $ws10 "10"
 
-set $music "Music"
 set $chat "Chat"
 
 # switch to workspace
@@ -152,7 +151,6 @@ bindsym $mod+7 workspace number $ws7
 bindsym $mod+8 workspace number $ws8
 bindsym $mod+9 workspace number $ws9
 bindsym $mod+0 workspace number $ws10
-bindsym $mod+m workspace $music
 bindsym $mod+z workspace $chat
 
 # move focused container to workspace
@@ -166,7 +164,6 @@ bindsym $mod+Shift+7 move container to workspace number $ws7
 bindsym $mod+Shift+8 move container to workspace number $ws8
 bindsym $mod+Shift+9 move container to workspace number $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10
-bindsym $mod+Shift+m move container to workspace $music
 bindsym $mod+Shift+z move container to workspace $chat
 
 # reload the configuration file
@@ -203,14 +200,17 @@ mode "resize" {
 
 bindsym $mod+p mode "resize"
 
+{% if host != 'baryte' %}
 # Slight gaps around windows
 gaps inner 6
+{% endif %}
 
 {% if host == 'barium' %}
 bar {
   id bar_left
+  status_command ~/.local/bin/conky-i3bar
   position top
-  output "HDMI-1"
+  output "DP-1"
   font pango:Liberation Mono 11
   colors {
     background $black_super
@@ -244,7 +244,7 @@ bar {
   id bar_right
   status_command ~/.local/bin/conky-i3bar
   position top
-  output "DVI-I-2-1"
+  output "DP-2"
   font pango:Liberation Mono 13
   colors {
     background $black_super
@@ -265,26 +265,38 @@ workspace 4 output HDMI-A-1
 workspace 1 output DP-1
 workspace 3 output DP-1
 
-workspace $music output DP-1
-workspace $chat output DP-1 
+workspace $chat output DP-1
 
-assign [class="music"] workspace $music
-for_window [class="music"] move workspace number $music
-assign [class="spotify"] workspace $music
-for_window [class="spotify"] move workspace number $music
 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"
-exec "spotify"
 
-{% elif host == 'dubnium' %}
+{% elif host == 'baryte' %}
 bar {
   id bar_left
+  status_command ~/.local/bin/conky-i3bar
   position top
-  output "DP-0"
+  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
@@ -301,6 +313,41 @@ bar {
   id bar_right
   status_command ~/.local/bin/conky-i3bar
   position top
+  output "HDMI-1"
+  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-1
+workspace 4 output HDMI-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
+  position top
   output "DP-2"
   font pango:Liberation Mono 12
   colors {
@@ -314,8 +361,25 @@ bar {
   }
 }
 
-workspace 1 output DP-0
-workspace 2 output DP-2
+bar {
+  id bar_right
+  status_command ~/.local/bin/conky-i3bar
+  position top
+  output "DP-0"
+  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 DP-2
+workspace 2 output DP-0
 
 {% elif host == 'rhenium' %}
 bar {