From 8dd63bb6f71a7b5a6593db18040ef971c2e470dc Mon Sep 17 00:00:00 2001
From: Schrottkatze <git@schrottkatze.de>
Date: Thu, 23 Nov 2023 15:03:18 +0100
Subject: [PATCH 1/2] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/993fb02d20760067b8ee19c713d94cee07037759' (2023-11-19)
  → 'github:nix-community/home-manager/134deb46abd5d0889d913b8509413f6f38b0811e' (2023-11-22)
• Updated input 'nixpkgs-stable':
    'github:NixOS/nixpkgs/0c5678df521e1407884205fe3ce3cf1d7df297db' (2023-11-19)
  → 'github:NixOS/nixpkgs/f741f8a839912e272d7e87ccf4b9dbc6012cdaf9' (2023-11-20)
---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 43ae981..2585037 100644
--- a/flake.lock
+++ b/flake.lock
@@ -245,11 +245,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700419052,
-        "narHash": "sha256-U6a5f9ynbzcp8PMIHULbHPkbwp7YfPKOYmTcLqlalD4=",
+        "lastModified": 1700695018,
+        "narHash": "sha256-MAiPLgBF4GLzSOlhnPCDWkWW5CDx4i7ApIYaR+TwTVg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "993fb02d20760067b8ee19c713d94cee07037759",
+        "rev": "134deb46abd5d0889d913b8509413f6f38b0811e",
         "type": "github"
       },
       "original": {
@@ -418,11 +418,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1700403855,
-        "narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=",
+        "lastModified": 1700501263,
+        "narHash": "sha256-M0U063Ba2DKL4lMYI7XW13Rsk5tfUXnIYiAVa39AV/0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0c5678df521e1407884205fe3ce3cf1d7df297db",
+        "rev": "f741f8a839912e272d7e87ccf4b9dbc6012cdaf9",
         "type": "github"
       },
       "original": {

From 2dbc34a266df6b3e76c3853c51aaacc8451e3a8e Mon Sep 17 00:00:00 2001
From: Schrottkatze <git@schrottkatze.de>
Date: Thu, 23 Nov 2023 15:27:53 +0100
Subject: [PATCH 2/2] add gitui to git config

---
 modules/git.nix | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/modules/git.nix b/modules/git.nix
index a63f68b..d2e94f6 100644
--- a/modules/git.nix
+++ b/modules/git.nix
@@ -13,5 +13,41 @@
         s = "status";
       };
     };
+    programs.gitui = {
+      enable = true;
+      keyConfig = ''
+        (
+          open_help: Some(( code: F(1), modifiers: ( bits: 0,),)),
+
+          move_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)),
+          move_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
+          move_up: Some(( code: Char('k'), modifiers: ( bits: 0,),)),
+          move_down: Some(( code: Char('j'), modifiers: ( bits: 0,),)),
+    
+          popup_up: Some(( code: Char('p'), modifiers: ( bits: 2,),)),
+          popup_down: Some(( code: Char('n'), modifiers: ( bits: 2,),)),
+          page_up: Some(( code: Char('b'), modifiers: ( bits: 2,),)),
+          page_down: Some(( code: Char('f'), modifiers: ( bits: 2,),)),
+          home: Some(( code: Char('g'), modifiers: ( bits: 0,),)),
+          end: Some(( code: Char('G'), modifiers: ( bits: 1,),)),
+          shift_up: Some(( code: Char('K'), modifiers: ( bits: 1,),)),
+          shift_down: Some(( code: Char('J'), modifiers: ( bits: 1,),)),
+
+          edit_file: Some(( code: Char('I'), modifiers: ( bits: 1,),)),
+
+          status_reset_item: Some(( code: Char('U'), modifiers: ( bits: 1,),)),
+
+          diff_reset_lines: Some(( code: Char('u'), modifiers: ( bits: 0,),)),
+          diff_stage_lines: Some(( code: Char('s'), modifiers: ( bits: 0,),)),
+
+          stashing_save: Some(( code: Char('w'), modifiers: ( bits: 0,),)),
+          stashing_toggle_index: Some(( code: Char('m'), modifiers: ( bits: 0,),)),
+
+          stash_open: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
+
+          abort_merge: Some(( code: Char('M'), modifiers: ( bits: 1,),)),
+      )
+      '';
+    };
   };
 }