From 5edc188740c6990821b816fa1b1a0ea37078eef9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 1 Dec 2015 08:36:59 +0100
Subject: services/i3/conky: Use new config file format.

Since Conky 1.10.x there is a new LUA-based configuration file format.

The old config file format is still supported and converted on-the-fly,
but it might be removed in future versions, so let's move ahead.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/user/aszlig/services/i3/conky.nix | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/modules/user/aszlig/services/i3/conky.nix b/modules/user/aszlig/services/i3/conky.nix
index d9d44409..76c61160 100644
--- a/modules/user/aszlig/services/i3/conky.nix
+++ b/modules/user/aszlig/services/i3/conky.nix
@@ -7,20 +7,23 @@ with lib;
 
 let
   baseConfig = pkgs.writeText "conkyrc" ''
-    cpu_avg_samples 2
-    net_avg_samples 2
-    no_buffers yes
-    out_to_console yes
-    out_to_ncurses no
-    out_to_stderr no
-    out_to_x no
-    extra_newline no
-    update_interval 1.0
-    uppercase no
-    use_spacer none
-    pad_percents 3
-    use_spacer left
-    TEXT
+    conky.config = {
+      cpu_avg_samples = 2,
+      net_avg_samples = 2,
+      no_buffers = true,
+      out_to_console = true,
+      out_to_ncurses = false,
+      out_to_stderr = false,
+      out_to_x = false,
+      extra_newline = false,
+      update_interval = 1.0,
+      uppercase = false,
+      use_spacer = 'none',
+      pad_percents = 3,
+      use_spacer = 'left',
+    };
+
+    conky.text = ''';
   '';
 
   optexpr = name: expr: "\${${name}_disabled:-\\\${${name} ${expr}\\}}";
-- 
cgit 1.4.1