X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fi3%2Ffiles%2Fconfig.jinja;h=b1a054ae782300f2417f8db7d9e8cac453c0b6f9;hb=6580ed7f1f88fb45acca92432b4e500c090cfcc4;hp=0f4c9b2b0464adbac017195deb399ed24232f146;hpb=12fb93d23e9f602697a370c365364f80ea7dcb3b;p=max%2Fsaltfiles.git

diff --git a/states/i3/files/config.jinja b/states/i3/files/config.jinja
index 0f4c9b2..b1a054a 100644
--- a/states/i3/files/config.jinja
+++ b/states/i3/files/config.jinja
@@ -41,6 +41,7 @@ font pango:monospace 10
 # The combination of xss-lock, nm-applet and pactl is a popular choice, so
 # they are included here as an example. Modify as you see fit.
 
+exec xset dpms 600 900 0
 # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
 # screen before suspend. Use loginctl lock-session to lock your screen.
 exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock -i ~/Pictures/lockscreen_full_blurred_1.png --nofork
@@ -49,7 +50,7 @@ exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock -i ~/Pictures/lock
 # and nm-applet is a desktop environment-independent system tray GUI for it.
 exec --no-startup-id nm-applet
 
-bindsym $mod+l exec systemctl suspend
+bindsym $mod+Shift+l exec systemctl suspend
 
 # Use pactl to adjust volume in PulseAudio.
 set $refresh_i3status killall -SIGUSR1 i3status
@@ -202,11 +203,15 @@ mode "resize" {
 
 bindsym $mod+p mode "resize"
 
+# Slight gaps around windows
+gaps inner 6
+
+{% if host == 'barium' %}
 bar {
   id bar_left
   position top
   output "HDMI-1"
-  font pango:Liberation Mono 12
+  font pango:Liberation Mono 11
   colors {
     background $black_super
     focused_background $black
@@ -239,8 +244,8 @@ bar {
   id bar_right
   status_command ~/.local/bin/conky-i3bar
   position top
-  output "DP-1"
-  font pango:Liberation Mono 12
+  output "DVI-I-2-1"
+  font pango:Liberation Mono 13
   colors {
     background $black_super
     focused_background $black
@@ -252,8 +257,8 @@ bar {
   }
 }
 
-# Slight gaps around windows
-gaps inner 6
+focus_on_window_activation urgent
+no_focus [class="(!?.*pinentry.*)"]
 
 workspace 2 output HDMI-A-1
 workspace 4 output HDMI-A-1
@@ -265,13 +270,71 @@ 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 "termite --name 'music' -e 'tmux'"
 exec "zoom"
+exec "spotify"
+
+{% elif host == 'dubnium' %}
+bar {
+  id bar_left
+  position top
+  output "DVI-D-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
+  }
+}
+
+bar {
+  id bar_right
+  status_command ~/.local/bin/conky-i3bar
+  position top
+  output "DP-2"
+  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 dunst
 exec picom -i 0.95 -D 4