From f148ecc36827737f4b898afc1c124a1c36a5364e Mon Sep 17 00:00:00 2001
From: willemml <willem@leit.so>
Date: Sat, 11 Nov 2023 22:08:39 -0800
Subject: [PATCH] Switches home-manager input fork with hishtory module

---
 flake.lock                | 11 ++++++-----
 flake.nix                 |  2 +-
 home/default.nix          |  1 -
 home/modules/hishtory.nix | 26 --------------------------
 home/programs/default.nix |  2 ++
 5 files changed, 9 insertions(+), 33 deletions(-)
 delete mode 100644 home/modules/hishtory.nix

diff --git a/flake.lock b/flake.lock
index 06997b5..bcd4c21 100644
--- a/flake.lock
+++ b/flake.lock
@@ -175,15 +175,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1699747670,
-        "narHash": "sha256-pLMJ9PP/cpdkHqX1DpxiImTATgXm4Dt8fTNJeGGWSUo=",
-        "owner": "nix-community",
+        "lastModified": 1699767369,
+        "narHash": "sha256-0hXDV5ANHsWxsr6YL7Nr9pVISn2MwxokrainqZTWpWE=",
+        "owner": "willemml",
         "repo": "home-manager",
-        "rev": "fad880ea934808072cd224152854d4257034bd24",
+        "rev": "cd8a2d388d8d80a790de8937b22cfb9a5f5aba42",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "willemml",
+        "ref": "feat/programs.hishtory",
         "repo": "home-manager",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 66812a3..afc74c4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,7 +14,7 @@
 
     flake-parts.url = "github:hercules-ci/flake-parts";
 
-    home-manager.url = "github:nix-community/home-manager";
+    home-manager.url = "github:willemml/home-manager?ref=feat/programs.hishtory";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     hyprland.url = "github:hyprwm/Hyprland";
diff --git a/home/default.nix b/home/default.nix
index 20e22b8..7e4c13d 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -9,7 +9,6 @@
 in rec {
   imports = [
     ./modules/emacs.nix
-    ./modules/hishtory.nix
     ./packages.nix
     ./programs/default.nix
   ];
diff --git a/home/modules/hishtory.nix b/home/modules/hishtory.nix
deleted file mode 100644
index 1152145..0000000
--- a/home/modules/hishtory.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib) mkIf mkEnableOption mkPackageOption;
-  cfg = config.programs.hishtory;
-  shellConfPath = "${cfg.package.outPath}/share/hishtory";
-in {
-  config.home.packages = mkIf cfg.enable [cfg.package];
-
-  config.programs.bash.bashrcExtra = mkIf cfg.enableBashIntegration "source '${shellConfPath}/config.bash'";
-  config.programs.fish.loginShellInit = mkIf cfg.enableFishIntegration "source '${shellConfPath}/config.fish'";
-  config.programs.zsh.initExtra = mkIf cfg.enableZshIntegration "source '${shellConfPath}/config.zsh'";
-
-  options.programs.hishtory = {
-    enable = mkEnableOption "hishtory";
-
-    enableZshIntegration = mkEnableOption "hishtory's Zsh integration";
-    enableFishIntegration = mkEnableOption "hishtory's Fish integration";
-    enableBashIntegration = mkEnableOption "hishtory's Bash integration";
-
-    package = mkPackageOption pkgs "hishtory" {};
-  };
-}
diff --git a/home/programs/default.nix b/home/programs/default.nix
index fe30aab..563c79b 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -62,6 +62,8 @@
     hishtory = {
       enable = true;
       enableZshIntegration = true;
+      enableConfig = true;
+      settings.enable-control-r = true;
     };
 
     java = {