From 5fa5257b417e5566b81483474ad1076816992b18 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sun, 13 Aug 2017 21:50:07 +0100
Subject: [PATCH] Remove i3blocks

---
 modules/i3/files/i3.conf             |  8 -------
 modules/i3/files/i3blocks.conf       | 33 ----------------------------
 modules/i3/files/i3status.toml       |  8 +++----
 modules/i3/manifests/init.pp         |  7 ------
 modules/yaourt/manifests/packages.pp |  1 -
 5 files changed, 4 insertions(+), 53 deletions(-)
 delete mode 100644 modules/i3/files/i3blocks.conf

diff --git a/modules/i3/files/i3.conf b/modules/i3/files/i3.conf
index 6ed1bb6..dda21b8 100644
--- a/modules/i3/files/i3.conf
+++ b/modules/i3/files/i3.conf
@@ -91,15 +91,7 @@ bindsym $mod+r mode "resize"
 exec dex -as ~/.config/autostart
 
 bar {
-    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
diff --git a/modules/i3/files/i3blocks.conf b/modules/i3/files/i3blocks.conf
deleted file mode 100644
index c932482..0000000
--- a/modules/i3/files/i3blocks.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-command=/usr/lib/i3blocks/$BLOCK_NAME
-separator_block_width=15
-markup=none
-
-[cpu_usage]
-label=CPU
-interval=2
-
-[memory]
-label=MEM
-separator=false
-interval=2
-
-[volume]
-label=VOL
-instance=Master
-interval=1
-
-[iface]
-interval=10
-separator=false
-
-[wifi]
-interval=10
-separator=false
-
-[battery]
-label=BAT
-interval=5
-
-[time]
-command=date '+%Y-%m-%d %H:%M:%S'
-interval=1
diff --git a/modules/i3/files/i3status.toml b/modules/i3/files/i3status.toml
index ff9cc2a..92849ef 100644
--- a/modules/i3/files/i3status.toml
+++ b/modules/i3/files/i3status.toml
@@ -6,16 +6,16 @@ block = "xrandr"
 interval = 2
 icons = true
 
-[[block]]
-block = "temperature"
-interval = 10
-
 [[block]]
 block = "music"
 player = "spotify"
 marquee = true
 buttons = ["play", "next"]
 
+[[block]]
+block = "temperature"
+interval = 10
+
 [[block]]
 block = "memory"
 format_mem = "{Mup}%"
diff --git a/modules/i3/manifests/init.pp b/modules/i3/manifests/init.pp
index 3458b2b..66af57c 100644
--- a/modules/i3/manifests/init.pp
+++ b/modules/i3/manifests/init.pp
@@ -8,13 +8,6 @@ class i3 {
     source => 'puppet:///modules/i3/i3.conf'
   }
 
-  file { "i3blocks config":
-    path => '/home/jake/.i3blocks.conf',
-    ensure => file,
-    mode => "0644",
-    source => 'puppet:///modules/i3/i3blocks.conf'
-  }
-
   file { "i3status config":
     path => '/home/jake/.config/i3/status.toml',
     ensure => file,
diff --git a/modules/yaourt/manifests/packages.pp b/modules/yaourt/manifests/packages.pp
index 61d6d80..563a274 100644
--- a/modules/yaourt/manifests/packages.pp
+++ b/modules/yaourt/manifests/packages.pp
@@ -32,7 +32,6 @@ class yaourt::packages () {
     'hexchat',
     'hipchat',
     'htop',
-    'i3blocks-gaps-git',
     'i3lock',
     'i3status-rust',
     'i3lock-wrapper',