Merge commit '9b1b55ba0264a55add4b7b4e022bdc2832b531f6'

1 files changed, 14 insertions, 2 deletions

diff --git a/home-manager/modules/programs/neovim.nix b/home-manager/modules/programs/neovim.nix
index 4101dc0f4e7..858f5576ad1 100644
--- a/home-manager/modules/programs/neovim.nix
+++ b/home-manager/modules/programs/neovim.nix
@@ -43,7 +43,7 @@ in
         type = types.bool;
         default = false;
         description = ''
-          Symlink `vi` to `nvim` binary.
+          Symlink <command>vi</command> to <command>nvim</command> binary.
         '';
       };
 
@@ -51,7 +51,15 @@ in
         type = types.bool;
         default = false;
         description = ''
-          Symlink `vim` to `nvim` binary.
+          Symlink <command>vim</command> to <command>nvim</command> binary.
+        '';
+      };
+
+      vimdiffAlias = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Alias <command>vimdiff</command> to <command>nvim -d</command>.
         '';
       };
 
@@ -203,5 +211,9 @@ in
 
       configure = cfg.configure // moduleConfigure;
     };
+
+    programs.bash.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
+    programs.fish.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
+    programs.zsh.shellAliases  = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; };
   };
 }