From 153585c11b3effa2fa6a823ac0fb0c68b308a8cb Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Thu, 22 Apr 2021 08:15:55 +0200
Subject: [PATCH] fixing issues

---
 configs/workhorse/mail-fetcher.nix     | 4 ++--
 system/all/sshd-known-hosts-public.nix | 5 +++++
 system/desktop/packages.nix            | 8 ++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/configs/workhorse/mail-fetcher.nix b/configs/workhorse/mail-fetcher.nix
index c38c553..d89e08a 100644
--- a/configs/workhorse/mail-fetcher.nix
+++ b/configs/workhorse/mail-fetcher.nix
@@ -45,8 +45,8 @@ let
     }
     {
       query =
-        "from:space-left.org OR to:space-left.org OR subject:/[space-left]/";
-      tags = [ "+spaceleft" "+list" "+space-left" ];
+        "from:space-left.org OR to:space-left.org OR subject:/\\[space-left\\]/";
+      tags = [ "+spaceleft" "+space-left" ];
     }
     {
       query = "from:landr.com";
diff --git a/system/all/sshd-known-hosts-public.nix b/system/all/sshd-known-hosts-public.nix
index 7bf0417..97af33f 100644
--- a/system/all/sshd-known-hosts-public.nix
+++ b/system/all/sshd-known-hosts-public.nix
@@ -38,6 +38,11 @@ with lib;
       publicKey =
         "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCG/sjnOlbrmpUliFtM5fmZTcm2wpUoP5OQEzFrrkkwhstCO9fMty9mp5qnKlezYA9+l78RTd218qFjSKYxTQNw=";
     };
+    # space-left
+    gitlabSpaceLeft = {
+      hostNames = [ "git.space-left.org" ];
+      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAapztj8I3xy6Ea8A1q7Mo5C6zdgsK1bguAXcKUDCRBO";
+    };
     # c-base
     "bnd-cbase" = {
       hostNames = [ "bnd.cbrp3.c-base.org" ];
diff --git a/system/desktop/packages.nix b/system/desktop/packages.nix
index 04a0912..db53c7e 100644
--- a/system/desktop/packages.nix
+++ b/system/desktop/packages.nix
@@ -106,12 +106,12 @@ let
 
   borrow = pkgs.writers.writeDashBin "borrow" # sh
     ''
-      TERM=xterm-mono ${pkgs.hledger-ui}/bin/hledger-ui --file ~/finance/hledger-borrow "$@"
+      TERM=xterm-mono ${pkgs.hledger-ui}/bin/hledger-ui --file ~/finance/.hledger-borrow "$@"
     '';
 
   bank = pkgs.writers.writeDashBin "bank" # sh
     ''
-      TERM=xterm-mono ${pkgs.hledger-ui}/bin/hledger-ui --file ~/finance/hledger/`date +%Y`.journal "$@"
+      ${pkgs.hledger-ui}/bin/hledger-ui --file ~/finance/hledger/all.journal
     '';
 
   bank-old = year:
@@ -208,11 +208,11 @@ in {
       isoToUtf8
       hledger
       hledger-ui
+
+      borrow
       bank
       (bank-old "2021")
       (bank-old "2020")
-      (bank-old "2019")
-      borrow
 
       irc