From 62c06dae9e9c140db64793693bc02567e5145af5 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 17 Sep 2023 08:57:08 +0100
Subject: [PATCH] Add gitui as non-flake input to bring vim binds back

---
 flake.lock   | 17 +++++++++++++++++
 flake.nix    |  6 +++++-
 home/git.nix |  3 ++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/flake.lock b/flake.lock
index df3105c6..ddd6216b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -144,6 +144,22 @@
         "type": "github"
       }
     },
+    "gitui": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1694608735,
+        "narHash": "sha256-ik9mifQFg/GcYRW4m124COdgfpKRO5hbSDxO9yu77gU=",
+        "owner": "extrawurst",
+        "repo": "gitui",
+        "rev": "8775fec9fa106280cdf2f4bca62284154596e0b0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "extrawurst",
+        "repo": "gitui",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -240,6 +256,7 @@
         "catppuccin-zathura": "catppuccin-zathura",
         "catppuccin-zsh": "catppuccin-zsh",
         "doom-emacs": "doom-emacs",
+        "gitui": "gitui",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "nixpkgs": "nixpkgs",
diff --git a/flake.nix b/flake.nix
index 5c20ecd4..9f1881cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,6 +21,10 @@
       url = "git+https://git.xenia.me.uk/xenia/wallpapers.git";
       flake = false;
     };
+    gitui = {
+      url = "github:extrawurst/gitui";
+      flake = false;
+    };
     catppuccin-alacritty = {
       url = "github:catppuccin/alacritty";
       flake = false;
@@ -106,7 +110,7 @@
           };
           extraSpecialArgs = specialArgs // {
             inherit wallpapers catppuccin-themes;
-            inherit (inputs) doom-emacs;
+            inherit (inputs) doom-emacs gitui;
           };
           commonModule = {
             nix = {
diff --git a/home/git.nix b/home/git.nix
index ef040c00..e0bfb721 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, catppuccin-themes, ... }: {
+{ lib, pkgs, catppuccin-themes, gitui, ... }: {
   programs = {
     git = {
       enable = true;
@@ -23,6 +23,7 @@
     };
     gitui = {
       enable = true;
+      keyConfig = builtins.readFile "${gitui}/vim_style_key_config.ron";
       theme = builtins.readFile catppuccin-themes.gitui;
     };
     bat = {