From ff488465c786b1321e2180379f92aa0baceb501a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Thu, 18 Apr 2019 17:12:47 +0200
Subject: [PATCH] merge

---
 configs/packages.nix            |  6 ++++++
 configs/scripts.nix             |  5 -----
 configs/shells.nix              |  3 ++-
 dot/vimrc                       |  2 +-
 packages/literature-quote.nix   | 12 ++++++++++++
 systems/catullus/containers.nix | 26 ++++++++------------------
 6 files changed, 29 insertions(+), 25 deletions(-)
 create mode 100644 packages/literature-quote.nix

diff --git a/configs/packages.nix b/configs/packages.nix
index bb0b282..ea1c324 100644
--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -16,6 +16,11 @@ in with pkgs;
     spotify-cli-linux = pkgs.python3Packages.callPackage <packages/spotify-cli-linux.nix> {};
     instaloader = pkgs.python3Packages.callPackage <packages/instaloader.nix> {};
     autorenkalender = pkgs.callPackage <packages/autorenkalender.nix> {};
+    dic = pkgs.callPackage <stockholm/krebs/5pkgs/simple/dic/default.nix> {};
+    yt-next = pkgs.callPackage <stockholm/lass/5pkgs/yt-next/default.nix> {};
+    acronym = pkgs.callPackage <stockholm/lass/5pkgs/acronym/default.nix> {};
+    urban = pkgs.callPackage <stockholm/lass/5pkgs/urban/default.nix> {};
+    mpv-poll = pkgs.callPackage <stockholm/lass/5pkgs/mpv-poll/default.nix> {};
   };
 
   fonts.enableDefaultFonts = true;
@@ -201,6 +206,7 @@ in with pkgs;
     aspellDicts.la
     bvg
     autorenkalender
+    literature-quote
     daybook
     gnupg
     jo
diff --git a/configs/scripts.nix b/configs/scripts.nix
index b2ad2b2..4f77fd0 100644
--- a/configs/scripts.nix
+++ b/configs/scripts.nix
@@ -2,11 +2,6 @@
 let
   theme = import <dot/theme.nix>;
   unstable = import <nixos-unstable> {};
-  scripts.dic = pkgs.callPackage <stockholm/krebs/5pkgs/simple/dic/default.nix> {};
-  scripts.yt-next = pkgs.callPackage <stockholm/lass/5pkgs/yt-next/default.nix> {};
-  scripts.acronym = pkgs.callPackage <stockholm/lass/5pkgs/acronym/default.nix> {};
-  scripts.urban = pkgs.callPackage <stockholm/lass/5pkgs/urban/default.nix> {};
-  scripts.mpv-poll = pkgs.callPackage <stockholm/lass/5pkgs/mpv-poll/default.nix> {};
   scripts.instaget = unstable.writers.writeDashBin "instaget" ''
     for url in "$@"; do
       ${pkgs.curl}/bin/curl -s "$url" \
diff --git a/configs/shells.nix b/configs/shells.nix
index 02821ea..47e8c8a 100644
--- a/configs/shells.nix
+++ b/configs/shells.nix
@@ -81,8 +81,9 @@ in {
 
       niveum-deploy() {
         for system in "$@"; do
-          eval $(nix-build ~niveum/deploy.nix -A "$system")
+          eval $(nix-build ~niveum/deploy.nix -A "$system") &
         done
+        wait
       }
     '';
     promptInit = ''
diff --git a/dot/vimrc b/dot/vimrc
index 0c9e6d0..c675055 100644
--- a/dot/vimrc
+++ b/dot/vimrc
@@ -8,8 +8,8 @@ let g:fzf_layout = { 'down': '~15%' }
 
 " colorscheme delek hipster
 " colorscheme 256_noir
-set background=dark
 colorscheme paramount
+set background=dark
 
 let mapleader = ","
 " let maplocalleader="\\"
diff --git a/packages/literature-quote.nix b/packages/literature-quote.nix
new file mode 100644
index 0000000..ee41a32
--- /dev/null
+++ b/packages/literature-quote.nix
@@ -0,0 +1,12 @@
+{ writeShellScriptBin, curl, xsv, gnused }:
+writeShellScriptBin "literature-quote" ''
+  ROW=$(${curl}/bin/curl -s https://raw.githubusercontent.com/kmein/quotes/master/quotes.csv?token=ACO7O6523EG3TDCYTT2K4224XTW5W | shuf -n1)
+
+  (
+    printf '%s\n(%s: _%s_, %s)\n' \
+      "$(echo "$ROW" | ${xsv}/bin/xsv select 4)" \
+      "$(echo "$ROW" | ${xsv}/bin/xsv select 1)" \
+      "$(echo "$ROW" | ${xsv}/bin/xsv select 2)" \
+      "$(echo "$ROW" | ${xsv}/bin/xsv select 3 | tr : ,)"
+  ) | ${gnused}/bin/sed 's/ | /\n/g;s/ || /\n\n/g;s/"\(.*\)"/\1/'
+''
diff --git a/systems/catullus/containers.nix b/systems/catullus/containers.nix
index eb7498c..5fe2a3d 100644
--- a/systems/catullus/containers.nix
+++ b/systems/catullus/containers.nix
@@ -5,11 +5,11 @@ let
   # telegram-horoscope = pkgs.python3Packages.callPackage <packages/telegram-horoscope.nix> {};
   telegram-proverb = pkgs.python3Packages.callPackage <packages/telegram-proverb.nix> {};
   autorenkalender = pkgs.callPackage <packages/autorenkalender.nix> {};
-
+  literature-quote = pkgs.callPackage <packages/literature-quote.nix> {};
 in {
-  containers.telegram-bots = {
-    autoStart = true;
-    config = {
+  # containers.telegram-bots = {
+  #   autoStart = true;
+  #   config = {
       systemd.services.quotebot = {
         enable = true;
         startAt = "08:00";
@@ -20,22 +20,12 @@ in {
           TELEGRAM_AUTORENKALENDER_TOKEN = lib.strings.removeSuffix "\n" (builtins.readFile <secrets/telegram-kmein.token>);
         };
         script = ''
-          ROW=$(${pkgs.curl}/bin/curl -s https://raw.githubusercontent.com/kmein/quotes/master/quotes.csv?token=ACO7O6523EG3TDCYTT2K4224XTW5W | shuf -n1)
-
-          QUOTE=$((
-            echo "$ROW" | ${pkgs.xsv}/bin/xsv select 4;
-            printf '— %s: *%s*, %s\n' \
-              "$(echo "$ROW" | ${pkgs.xsv}/bin/xsv select 1)" \
-              "$(echo "$ROW" | ${pkgs.xsv}/bin/xsv select 2)" \
-              "$(echo "$ROW" | ${pkgs.xsv}/bin/xsv select 3)"
-          ) | ${pkgs.gnused}/bin/sed 's/ | /\n/g;s/"\(.*\)"/\1/')
-
           TELEGRAM_ENDPOINT="https://api.telegram.org/bot$TELEGRAM_AUTORENKALENDER_TOKEN"
           ${pkgs.curl}/bin/curl -s \
             -X POST "$TELEGRAM_ENDPOINT/sendMessage" \
             -d chat_id="$TELEGRAM_AUTORENKALENDER_CHAT" \
             -d parse_mode=Markdown \
-            -d text="$QUOTE"
+            -d text="$(${literature-quote}/bin/literature-quote)"
         '';
       };
 
@@ -45,7 +35,7 @@ in {
         serviceConfig.Type = "oneshot";
         wantedBy = [ "multi-user.target" ];
         environment = {
-          TELEGRAM_AUTORENKALENDER_CHAT = "18980945";
+          TELEGRAM_AUTORENKALENDER_CHAT = "@autorenkalender";
           TELEGRAM_AUTORENKALENDER_TOKEN = lib.strings.removeSuffix "\n" (builtins.readFile <secrets/telegram-kmein.token>);
         };
         script = ''
@@ -89,6 +79,6 @@ in {
       #   script = ''${telegram-horoscope}/bin/telegram-horoscope'';
       #   serviceConfig.Restart = "always";
       # };
-    };
-  };
+    # };
+  # };
 }