diff --git a/modules/i3/files/i3.conf b/modules/i3/files/i3.conf index 2cb04ea..6ed1bb6 100644 --- a/modules/i3/files/i3.conf +++ b/modules/i3/files/i3.conf @@ -77,13 +77,13 @@ bindsym $mod+Shift+0 move container to workspace 10 # Resize mode "resize" { - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt - bindsym Return mode "default" - bindsym Escape mode "default" + bindsym Return mode "default" +bindsym Escape mode "default" } bindsym $mod+r mode "resize" @@ -91,5 +91,22 @@ bindsym $mod+r mode "resize" exec dex -as ~/.config/autostart bar { - status_command i3blocks + font pango:DejaVu Sans Mono, Icons 8 + status_command i3blocks + position top } + +bar { + font pango:DejaVu Sans Mono, Icons 8 + status_command i3status-rs ~/.config/i3/status.toml + tray_output none + colors { + separator #666666 + statusline #dddddd + focused_workspace #0088CC #0088CC #ffffff + active_workspace #333333 #333333 #ffffff + inactive_workspace #333333 #333333 #888888 + urgent_workspace #2f343a #900000 #ffffff + } +} + diff --git a/modules/i3/files/i3status.toml b/modules/i3/files/i3status.toml new file mode 100644 index 0000000..ff9cc2a --- /dev/null +++ b/modules/i3/files/i3status.toml @@ -0,0 +1,40 @@ +theme = "plain" +icons = "awesome" + +[[block]] +block = "xrandr" +interval = 2 +icons = true + +[[block]] +block = "temperature" +interval = 10 + +[[block]] +block = "music" +player = "spotify" +marquee = true +buttons = ["play", "next"] + +[[block]] +block = "memory" +format_mem = "{Mup}%" +clickable = false + +[[block]] +block = "cpu" +interval = 1 + +[[block]] +block = "sound" +interval = 1 +step_width = 2 + +[[block]] +block = "battery" +interval = 3 + +[[block]] +block = "time" +interval = 1 +format = "%Y-%d-%m %T" diff --git a/modules/i3/manifests/init.pp b/modules/i3/manifests/init.pp index 78575ee..3458b2b 100644 --- a/modules/i3/manifests/init.pp +++ b/modules/i3/manifests/init.pp @@ -14,4 +14,11 @@ class i3 { mode => "0644", source => 'puppet:///modules/i3/i3blocks.conf' } + + file { "i3status config": + path => '/home/jake/.config/i3/status.toml', + ensure => file, + mode => "0644", + source => 'puppet:///modules/i3/i3status.toml' + } } diff --git a/modules/yaourt/manifests/packages.pp b/modules/yaourt/manifests/packages.pp index a851250..61d6d80 100644 --- a/modules/yaourt/manifests/packages.pp +++ b/modules/yaourt/manifests/packages.pp @@ -34,7 +34,7 @@ class yaourt::packages () { 'htop', 'i3blocks-gaps-git', 'i3lock', - 'i3status', + 'i3status-rust', 'i3lock-wrapper', 'i3-gaps', 'ibus',