htop: add withVimKeys (#471886)

Author: thiagokokada

pkgs/by-name/ht/htop-vim/package.nix

@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch2,
   stdenv,
   autoreconfHook,
   pkg-config,
@@ -11,21 +12,28 @@
   lm_sensors,
   systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
   systemdLibs,
+  withVimKeys ? false,
 }:
 
 assert systemdSupport -> stdenv.hostPlatform.isLinux;
 
-stdenv.mkDerivation rec {
-  pname = "htop";
+stdenv.mkDerivation (finalAttrs: {
+  pname = "htop" + lib.optionalString withVimKeys "-vim";
   version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "htop-dev";
     repo = "htop";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-fVqQwXbJus2IVE1Bzf3yJJpKK4qcZN/SCTX1XYkiHhU=";
   };
 
+  patches = lib.optional withVimKeys (fetchpatch2 {
+    name = "vim-keybindings.patch";
+    url = "https://aur.archlinux.org/cgit/aur.git/plain/vim-keybindings.patch?h=htop-vim&id=d10f022b3ca1207200187a55f5b116a5bd8224f7";
+    hash = "sha256-fZDTA2dCOmXxUYD6Wm41q7TxL7fgQOj8a/8yJC7Zags=";
+  });
+
   # upstream removed pkg-config support and uses dlopen now
   postPatch =
     let
@@ -72,16 +80,19 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    description = "Interactive process viewer";
-    homepage = "https://htop.dev";
+    description =
+      "Interactive process viewer" + lib.optionalString withVimKeys ", with vim-style keybindings";
+    homepage =
+      if withVimKeys then "https://aur.archlinux.org/packages/htop-vim" else "https://htop.dev";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [
       rob
       relrod
       SuperSandro2000
+      thiagokokada
     ];
-    changelog = "https://github.com/htop-dev/htop/blob/${version}/ChangeLog";
+    changelog = "https://github.com/htop-dev/htop/blob/${finalAttrs.version}/ChangeLog";
     mainProgram = "htop";
   };
-}
+})

pkgs/by-name/ht/htop/package.nix

@@ -1061,6 +1061,8 @@ with pkgs;
     }
   );
 
+  htop-vim = htop.override { withVimKeys = true; };
+
   inherit (callPackages ../tools/networking/iroh/default.nix { })
     iroh-relay
     iroh-dns-server