From f4cae1278ed67de088b696f831b78a8286c133b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Wed, 11 Sep 2019 07:34:38 +0200
Subject: [PATCH] improvement: use more nix library functions

---
 configs/xresources.nix   | 6 +++++-
 modules/telegram-bot.nix | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/configs/xresources.nix b/configs/xresources.nix
index 129d70a..ea4b155 100644
--- a/configs/xresources.nix
+++ b/configs/xresources.nix
@@ -1,4 +1,8 @@
 { config, lib, ... }:
+let
+  inherit (lib.attrsets) nameValuePair listToAttrs;
+  inherit (lib.lists) imap0;
+in
 {
   home-manager.users.me.xresources.properties = with config.niveum; {
     "*background" = colours.background;
@@ -8,5 +12,5 @@
     "*.font" = "xft:${fonts.terminal.name}:size=${toString fonts.terminal.size}";
     "*.boldFont" = "xft:${fonts.terminal.name}:style=Bold:size=${toString fonts.terminal.size}";
     "*.italicFont" = "xft:${fonts.terminal.name}:style=Italic:size=${toString fonts.terminal.size}";
-  } // lib.lists.foldr (i: cs: cs // { "*color${toString i}" = builtins.elemAt colourPalette i; }) {} (lib.lists.range 0 15);
+  } // listToAttrs (imap0 (i: c: nameValuePair "*color${toString i}" c) colourPalette);
 }
diff --git a/modules/telegram-bot.nix b/modules/telegram-bot.nix
index 28f8e47..6a64ccf 100644
--- a/modules/telegram-bot.nix
+++ b/modules/telegram-bot.nix
@@ -12,8 +12,7 @@ let
       ${pkgs.curl}/bin/curl -s -X POST "https://api.telegram.org/bot${bot.token}/sendMessage" \
         -d chat_id="${chatId}" \
         -d text="$QUOTE" ${
-          if bot.parseMode == null then ""
-          else "-d parse_mode=${bot.parseMode}"
+          lib.strings.optionalString (bot.parseMode != null) "-d parse_mode=${bot.parseMode}"
         }
     '') bot.chatIds);
   };