From 919b8aa4355ef27588b213faeb8a4f0a764f9dc6 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Mon, 30 Aug 2021 03:18:23 +0100
Subject: [PATCH] HISTFILE fix, anicca: modules, zsh-fzf-tab fix

---
 config/modules/home/default.nix  |  1 +
 config/modules/nixos/default.nix |  1 +
 config/users/kat/base/shell.nix  | 11 ++++++++---
 nix/sources.json                 |  6 +++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/config/modules/home/default.nix b/config/modules/home/default.nix
index 5c30bb86..f3bcad66 100644
--- a/config/modules/home/default.nix
+++ b/config/modules/home/default.nix
@@ -5,6 +5,7 @@
     (import (sources.arcexprs + "/modules")).home-manager
     (import (sources.katexprs + "/modules")).home
     (import (sources.impermanence + "/home-manager.nix"))
+    (import sources.anicca).modules.home
     ./deploy.nix
     ./theme.nix
     ./secrets.nix
diff --git a/config/modules/nixos/default.nix b/config/modules/nixos/default.nix
index 7664658f..58758fcc 100644
--- a/config/modules/nixos/default.nix
+++ b/config/modules/nixos/default.nix
@@ -6,6 +6,7 @@
       (import (sources.arcexprs + "/modules")).nixos
       (import (sources.katexprs + "/modules")).nixos
       (import (sources.impermanence + "/nixos.nix"))
+      (import sources.anicca).modules.nixos
       ./deploy.nix
       ./monitoring.nix
       ./dyndns.nix
diff --git a/config/users/kat/base/shell.nix b/config/users/kat/base/shell.nix
index 22d412d4..768d2cf7 100644
--- a/config/users/kat/base/shell.nix
+++ b/config/users/kat/base/shell.nix
@@ -55,7 +55,12 @@ in
           "autolist"
           "listrowsfirst"
         ]; in
-      ''
+        ''
+        ${if config.anicca.enabled then ''
+          HISTFILE=/persist/home/.zsh_history
+        '' else ''
+        ''}
+        eval $(dircolors)
         ZSH_TAB_TITLE_ADDITIONAL_TERMS='foot'
         ZSH_TAB_TITLE_ENABLE_FULL_COMMAND=true
         zmodload -i zsh/complist
@@ -113,9 +118,9 @@ in
       })) [
       "zsh-z"
     ]) ++ [
-      (with pkgs.zsh-fzf-tab; {
+      ({
         name = "fzf-tab";
-        inherit src;
+        src = "${pkgs.zsh-fzf-tab}/share/fzf-tab";
       })
     ];
   };
diff --git a/nix/sources.json b/nix/sources.json
index 251630bd..c2cf875c 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "kittywitch",
         "repo": "anicca",
-        "rev": "d4ef7f09558ce9f80e198ebe364d60d05eea97f9",
-        "sha256": "05sciibf2ylmlj34rqb2cyr6djwh6q7caqi0ahrkypmzgcnch2v4",
+        "rev": "c890bd08f4e34a655ef5ff7561aa74cdc8d85a0a",
+        "sha256": "16n6z9m1v6wf0ihddp9lqq5g3jzj3d25cgnkf9n08kqhx5x07ag2",
         "type": "tarball",
-        "url": "https://github.com/kittywitch/anicca/archive/d4ef7f09558ce9f80e198ebe364d60d05eea97f9.tar.gz",
+        "url": "https://github.com/kittywitch/anicca/archive/c890bd08f4e34a655ef5ff7561aa74cdc8d85a0a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "arcexprs": {