From 19795a99d764cfb5fa9e3e6820a2ec23557f6c39 Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Tue, 14 Apr 2026 17:07:20 +0200
Subject: modules/atin: Use upstream package

`atuin` now supports configuring the keymap.
---
 modules/by-name/at/atuin/module.nix                |  9 +++++-
 pkgs/by-name/at/atuin-dvorak/package.nix           | 32 -------------------
 .../at/atuin-dvorak/set-dvorak-keybindings.patch   | 37 ----------------------
 .../set-dvorak-keybindings.patch.license           |  9 ------
 4 files changed, 8 insertions(+), 79 deletions(-)
 delete mode 100644 pkgs/by-name/at/atuin-dvorak/package.nix
 delete mode 100644 pkgs/by-name/at/atuin-dvorak/set-dvorak-keybindings.patch
 delete mode 100644 pkgs/by-name/at/atuin-dvorak/set-dvorak-keybindings.patch.license

diff --git a/modules/by-name/at/atuin/module.nix b/modules/by-name/at/atuin/module.nix
index 700f50fb..0e87b4ab 100644
--- a/modules/by-name/at/atuin/module.nix
+++ b/modules/by-name/at/atuin/module.nix
@@ -34,10 +34,10 @@ in {
     home-manager.users.soispha = {
       programs.atuin = {
         enable = true;
-        package = pkgs.atuin-dvorak;
 
         # We can do this on our own.
         enableZshIntegration = false;
+
         settings = {
           key_path = lib.mkMerge [
             (lib.mkIf cfg.enableAge "${config.age.secrets.atuin_encryption_key.path}")
@@ -80,6 +80,13 @@ in {
             ignored_commands = [];
           };
 
+          keymap.vim-normal = {
+            "h" = "cursor-left";
+            "t" = "select-next";
+            "n" = "select-previous";
+            "s" = "cursor-right";
+          };
+
           # I currently don't want a sync deamon or a dotfiles manager running.
           deamon.enable = false;
           dotfiles.enable = false;
diff --git a/pkgs/by-name/at/atuin-dvorak/package.nix b/pkgs/by-name/at/atuin-dvorak/package.nix
deleted file mode 100644
index d3f92961..00000000
--- a/pkgs/by-name/at/atuin-dvorak/package.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# nixos-config - My current NixOS configuration
-#
-# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# This file is part of my nixos-config.
-#
-# You should have received a copy of the License along with this program.
-# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
-{atuin}:
-atuin.overrideAttrs (finalAttrs: previousAttrs: {
-  pname = previousAttrs.pname + "-dvorak";
-  patches =
-    previousAttrs.patches
-    ++ [
-      ./set-dvorak-keybindings.patch
-    ];
-
-  # atuin's default features include 'check-updates', which do not make sense
-  # for distribution builds. List all other default features.
-  buildNoDefaultFeatures = true;
-  buildFeatures = [
-    "client"
-    # "sync"
-    # "server"
-    "clipboard"
-    # "daemon"
-  ];
-
-  # The checks don't compile without the `server` feature
-  doCheck = false;
-})
diff --git a/pkgs/by-name/at/atuin-dvorak/set-dvorak-keybindings.patch b/pkgs/by-name/at/atuin-dvorak/set-dvorak-keybindings.patch
deleted file mode 100644
index 9ab3700a..00000000
--- a/pkgs/by-name/at/atuin-dvorak/set-dvorak-keybindings.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f763aef8094c12293570119d9ff0922356dd8c79 Mon Sep 17 00:00:00 2001
-From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
-Date: Fri, 18 Oct 2024 23:03:01 +0200
-Subject: [PATCH] fix(client): Change the keymaps to support dvorka vim keys
-
----
- crates/atuin/src/command/client/search/interactive.rs | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/crates/atuin/src/command/client/search/interactive.rs b/crates/atuin/src/command/client/search/interactive.rs
-index c87fff1c..19e965fe 100644
---- a/crates/atuin/src/command/client/search/interactive.rs
-+++ b/crates/atuin/src/command/client/search/interactive.rs
-@@ -322,17 +322,17 @@ impl State {
-                     self.keymap_mode = KeymapMode::VimInsert;
-                     return InputAction::Continue;
-                 }
--                KeyCode::Char('j') if !ctrl => {
-+                KeyCode::Char('t') if !ctrl => {
-                     return self.handle_search_down(settings, true);
-                 }
--                KeyCode::Char('k') if !ctrl => {
-+                KeyCode::Char('n') if !ctrl => {
-                     return self.handle_search_up(settings, true);
-                 }
-                 KeyCode::Char('h') if !ctrl => {
-                     self.search.input.left();
-                     return InputAction::Continue;
-                 }
--                KeyCode::Char('l') if !ctrl => {
-+                KeyCode::Char('s') if !ctrl => {
-                     self.search.input.right();
-                     return InputAction::Continue;
-                 }
--- 
-2.46.0
-
diff --git a/pkgs/by-name/at/atuin-dvorak/set-dvorak-keybindings.patch.license b/pkgs/by-name/at/atuin-dvorak/set-dvorak-keybindings.patch.license
deleted file mode 100644
index eae6a84c..00000000
--- a/pkgs/by-name/at/atuin-dvorak/set-dvorak-keybindings.patch.license
+++ /dev/null
@@ -1,9 +0,0 @@
-nixos-config - My current NixOS configuration
-
-Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
-SPDX-License-Identifier: GPL-3.0-or-later
-
-This file is part of my nixos-config.
-
-You should have received a copy of the License along with this program.
-If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
-- 
cgit 1.4.1