zsh: Refactor + add external editing

3 files changed, 46 insertions, 13 deletions

diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index 8884f56..0916809 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -1,18 +1,12 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: {
+{config, ...}: {
   imports = [
     ./plugins.nix
+    ./editing.nix
   ];
 
   programs.zsh = {
     enable = true;
 
-    defaultKeymap = "viins";
-
     # Feeble attempt at cleaning up home directory.
     # TODO: dotDir = (pathRelativeTo config.xdg.configHome config.home) + "/zsh";
     dotDir = ".config/zsh";
@@ -22,9 +16,4 @@
       PROMPT='%F{41}->%f %B%(2L.LVL%L .)%b%F{red}%(?..E%? )%f%n@%U%m%u:%15<...<%~%<<%# '
     '';
   };
-
-  programs.fzf = {
-    enable = true;
-    enableZshIntegration = true;
-  };
 }
diff --git a/home/zsh/editing.nix b/home/zsh/editing.nix
new file mode 100644
index 0000000..241ef3c
--- /dev/null
+++ b/home/zsh/editing.nix
@@ -0,0 +1,43 @@
+# This module contains all ZSH configuration related to the editing experience (e.g. setting VI mode).
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib.strings) concatStringsSep;
+  inherit (lib.attrsets) catAttrs;
+
+  plugins = [
+    {
+      name = "zsh-vi-mode-cursor";
+      src = pkgs.fetchFromGitHub {
+        owner = "Buckmeister";
+        repo = "zsh-vi-mode-cursor";
+        rev = "fa7cc0973ee71636e906e25e782d0aea19545d60";
+        hash = "sha256-j73M4bvAoHWt5Wwg47hM0p5Or74x/3btTOPnI22SqG8=";
+      };
+    }
+  ];
+in {
+  programs.zsh = {
+    # VIM! VIM! VIM!
+    defaultKeymap = "viins";
+
+    plugins = map (p: removeAttrs p ["config"]) plugins;
+
+    initExtra = ''
+      # Set up external editing by pressing '!' in normal mode.
+      autoload -z edit-command-line
+      zle -N edit-command-line
+      bindkey -M vicmd '!' edit-command-line
+
+      # Plugins config.
+      ${concatStringsSep "\n" (catAttrs "config" plugins)}
+    '';
+  };
+
+  programs.fzf = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+}
diff --git a/home/zsh/plugins.nix b/home/zsh/plugins.nix
index 73a35a3..91cee3d 100644
--- a/home/zsh/plugins.nix
+++ b/home/zsh/plugins.nix
@@ -1,3 +1,4 @@
+# This module manages behavioral plugins – plugins that alter how ZSH acts (e.g. autovenv, direnv).
 {
   pkgs,
   lib,