From 74c7f5f617157f26713df3c9df7dbed21cc072f3 Mon Sep 17 00:00:00 2001
From: Michael Carlberg <c@rlberg.se>
Date: Sun, 20 Nov 2016 03:29:19 +0100
Subject: [PATCH] fix: Patch example config template

The last patch only updated the generated file
and not the CMake template

Remove the generated file and add it to
.gitignore to prevent future mistakes
---
 .gitignore            |   1 +
 examples/config       | 354 ------------------------------------------
 examples/config.cmake |   4 +-
 3 files changed, 3 insertions(+), 356 deletions(-)
 delete mode 100644 examples/config

diff --git a/.gitignore b/.gitignore
index 67154654..0b46550e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ tags
 *.swp
 include/config.hpp
 .tags
+examples/config
diff --git a/examples/config b/examples/config
deleted file mode 100644
index 0a02b1a0..00000000
--- a/examples/config
+++ /dev/null
@@ -1,354 +0,0 @@
-;=====================================================
-;
-;   To learn more about how to configure Polybar
-;   go to https://github.com/jaagr/polybar
-;
-;   The README contains alot of information
-;
-;=====================================================
-
-[global/wm]
-margin-top = 5
-margin-bottom = 5
-margin-left = 5
-margin-right = 5
-
-
-[bar/example]
-;monitor = HDMI-1
-dock = false
-width = 100%
-height = 27
-offset-x = 0
-offset-y = 0
-
-background = #ee222222
-foreground = #dfdfdf
-linecolor = #555
-
-border-bottom = 2
-border-bottom-color = #333
-
-spacing = 1
-lineheight = 1
-padding-left = 0
-padding-right = 2
-module-margin-left = 1
-module-margin-right = 2
-
-font-0 = fixed:pixelsize=10;0
-font-1 = unifont:size=6:heavy:fontformat=truetype;-2
-font-2 = siji:pixelsize=10;0
-
-modules-left = bspwm i3 mpd
-modules-center = xwindow
-modules-right = backlight volume memory cpu wlan eth battery temperature date powermenu
-
-tray-position = right
-tray-padding = 4
-;tray-transparent = true
-;tray-background = #0063ff
-
-;wm-restack = bspwm
-
-
-[module/xwindow]
-type = internal/xwindow
-label = %title%
-label-maxlen = 30
-
-
-[module/filesystem]
-type = internal/fs
-interval = 25
-
-mount-0 = /
-mount-1 = /home
-mount-2 = /invalid/mountpoint
-
-;fixed-values = true
-;spacing = 4
-
-label-mounted = %mountpoint%: %percentage_free%
-
-label-unmounted = %mountpoint%: not mounted
-label-unmounted-foreground = #55
-
-
-
-[module/bspwm]
-type = internal/bspwm
-ws-icon-default = x
-
-label-active = %index%
-label-active-background = #ee333333
-label-active-underline= #cc333333
-label-active-padding = 2
-
-label-occupied = %index%
-label-occupied-padding = 2
-
-label-urgent = %index%
-label-urgent-background = #bd2c40
-label-urgent-padding = 2
-
-label-empty = %index%
-label-empty-foreground = #55
-label-empty-padding = 2
-
-
-[module/i3]
-type = internal/i3
-format = <label-state>
-index-sort = true
-
-label-focused = %index%
-label-focused-background = #ee333333
-label-focused-underline= #cc333333
-label-focused-padding = 2
-
-label-unfocused = %index%
-label-unfocused-padding = 2
-
-label-urgent = %index%!
-label-urgent-background = #bd2c40
-label-urgent-padding = 2
-
-label-visible = %index%
-label-visible-foreground = #55
-label-visible-padding = 2
-
-
-[module/mpd]
-type = internal/mpd
-
-format-online = <label-song>  <icon-prev> <icon-seekb> <icon-stop> <toggle> <icon-seekf> <icon-next>  <icon-repeat> <icon-random>
-
-label-song-maxlen = 25
-label-song-ellipsis = true
-
-icon-prev = 
-icon-seekb = 
-icon-stop = 
-icon-play = 
-icon-pause = 
-icon-next = 
-icon-seekf = 
-
-icon-random = 
-icon-repeat = 
-
-toggle-on-foreground = #e60053
-toggle-off-foreground = #66
-
-
-[module/backlight]
-type = internal/xbacklight
-
-format = <label> <bar>
-label = BL
-
-bar-width = 10
-bar-indicator = │
-bar-indicator-foreground = #ff
-bar-indicator-font = 2
-bar-fill = ─
-bar-fill-font = 2
-bar-fill-foreground = #9f78e1
-bar-empty = ─
-bar-empty-font = 2
-bar-empty-foreground = #55
-
-
-[module/cpu]
-type = internal/cpu
-interval = 2
-
-format = <label> <bar-load>
-label = CPU
-
-bar-load-width = 10
-bar-load-foreground-0 = #55aa55
-bar-load-foreground-1 = #55aa55
-bar-load-foreground-2 = #f5a70a
-bar-load-foreground-3 = #ff5555
-bar-load-gradient = false
-bar-load-indicator = │
-bar-load-indicator-font = 2
-bar-load-indicator-foreground = #ff
-bar-load-fill = ─
-bar-load-fill-font = 2
-bar-load-empty = ─
-bar-load-empty-font = 2
-bar-load-empty-foreground = #55
-
-
-[module/memory]
-type = internal/memory
-interval = 2
-
-format = <label> <bar-used>
-label = RAM
-
-bar-used-width = 10
-bar-used-foreground-0 = #55aa55
-bar-used-foreground-1 = #55aa55
-bar-used-foreground-2 = #f5a70a
-bar-used-foreground-3 = #ff5555
-bar-used-gradient = false
-bar-used-indicator = │
-bar-used-indicator-font = 2
-bar-used-indicator-foreground = #ff
-bar-used-fill = ─
-bar-used-fill-font = 2
-bar-used-empty = ─
-bar-used-empty-font = 2
-bar-used-empty-foreground = #55
-
-
-[module/wlan]
-type = internal/network
-interface = net1
-interval = 3.0
-
-format-connected = <ramp-signal> <label-connected>
-format-connected-underline = #9f78e1
-format-disconnected-underline = ${self.format-connected-underline}
-
-label-connected = %essid%
-label-disconnected = %ifname% disconnected
-label-disconnected-foreground = #55
-
-ramp-signal-0 = 
-ramp-signal-1 = 
-ramp-signal-2 = 
-ramp-signal-3 = 
-ramp-signal-4 = 
-ramp-signal-foreground = #55
-
-
-[module/eth]
-type = internal/network
-interface = net0
-interval = 3.0
-
-format-connected-underline = #55aa55
-format-disconnected-underline = ${self.format-connected-underline}
-
-label-connected = %{F#55}%{F#ff} %local_ip%
-label-disconnected = %ifname% disconnected
-label-disconnected-foreground = #55
-
-
-[module/date]
-type = internal/date
-date = %%{F#55}%{F#ff} %Y-%m-%d  %%{F#55}%%{F#ff} %H:%M
-date-alt = %%{F#55}%{F#ff} %Y-%m-%d  %%{F#55}%%{F#ff} %H:%M:%S
-interval = 5
-format-underline = #0a6cf5
-
-
-[module/volume]
-type = internal/volume
-;speaker-mixer = Speaker
-;headphone-mixer = Headphone
-;headphone-id = 9
-
-format-volume = <label-volume> <bar-volume>
-
-label-volume = VOL
-label-volume-foreground = ${root.foreground}
-
-label-muted =  sound muted
-label-muted-foreground = #55
-
-bar-volume-width = 10
-bar-volume-foreground-0 = #55aa55
-bar-volume-foreground-1 = #55aa55
-bar-volume-foreground-2 = #55aa55
-bar-volume-foreground-3 = #55aa55
-bar-volume-foreground-4 = #55aa55
-bar-volume-foreground-5 = #f5a70a
-bar-volume-foreground-6 = #ff5555
-bar-volume-gradient = false
-bar-volume-indicator = │
-bar-volume-indicator-font = 2
-bar-volume-indicator-foreground = #ff
-bar-volume-fill = ─
-bar-volume-fill-font = 2
-bar-volume-empty = ─
-bar-volume-empty-font = 2
-bar-volume-empty-foreground = #55
-
-
-[module/battery]
-type = internal/battery
-battery = BAT0
-adapter = ADP1
-full-at = 98
-
-format-charging = <animation-charging> <label-charging>
-format-charging-underline = #ffb52a
-format-discharging = <ramp-capacity> <label-discharging>
-format-discharging-underline = ${self.format-charging-underline}
-format-full = %{F#55}%{F#ff}  <label-full>
-format-full-underline = ${self.format-charging-underline}
-
-ramp-capacity-0 = 
-ramp-capacity-1 = 
-ramp-capacity-2 = 
-ramp-capacity-foreground = #55
-
-animation-charging-0 = 
-animation-charging-1 = 
-animation-charging-2 = 
-animation-charging-foreground = #55
-animation-charging-framerate = 750
-
-
-[module/temperature]
-type = internal/temperature
-thermal-zone = 0
-warn-temperature = 60
-
-format = <ramp> <label>
-format-underline = #f50a4d
-format-warn = <ramp> <label-warn>
-format-warn-underline = ${self.format-underline}
-
-label = %temperature%
-label-warn = %temperature%
-label-warn-foreground = #e60053
-
-ramp-0 = 
-ramp-1 = 
-ramp-2 = 
-ramp-foreground = #55
-
-
-[module/powermenu]
-type = custom/menu
-
-label-open =  power
-label-open-foreground = #e60053
-label-close =  cancel
-label-close-foreground = #e60053
-label-separator = |
-label-separator-foreground = #55
-
-menu-0-0 = reboot
-menu-0-0-exec = menu-open-1
-menu-0-1 = power off
-menu-0-1-exec = menu-open-2
-
-menu-1-0 = cancel
-menu-1-0-exec = menu-open-0
-menu-1-1 = reboot
-menu-1-1-exec = sudo reboot
-
-menu-2-0 = power off
-menu-2-0-exec = sudo poweroff
-menu-2-1 = cancel
-menu-2-1-exec = menu-open-0
-
-; vim:ft=dosini
diff --git a/examples/config.cmake b/examples/config.cmake
index 5426c766..f24a7402 100644
--- a/examples/config.cmake
+++ b/examples/config.cmake
@@ -37,7 +37,7 @@ module-margin-left = 1
 module-margin-right = 2
 
 font-0 = fixed:pixelsize=10;0
-font-1 = unifont:size=6:heavy;-2
+font-1 = unifont:size=6:heavy:fontformat=truetype;-2
 font-2 = siji:pixelsize=10;0
 
 modules-left = @MODULES_LEFT@
@@ -257,7 +257,7 @@ type = internal/volume
 format-volume = <label-volume> <bar-volume>
 
 label-volume = VOL
-label-volume-foreground = ${BAR.foreground}
+label-volume-foreground = ${root.foreground}
 
 label-muted =  sound muted
 label-muted-foreground = #55