Use neovim as default editor

simonrw · Nov 2, 2023 · 83c9e65 · 83c9e65
1 parent e529ef9
commit 83c9e65
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/home/fish.nix b/home/fish.nix
@@ -37,7 +37,7 @@ in
         # centralise where python puts its .pyc files
         set -x PYTHONPYCACHEPREFIX {$HOME}/.python-cache
 
-        set -x EDITOR "${pkgs.helix}/bin/hx"
+        set -x EDITOR "${neovim}/bin/nvim"
         set -x PAGER "${pkgs.bat}/bin/bat"
 
         # host-specific configuration
@@ -155,7 +155,6 @@ in
       trash = "${pkgs.python3Packages.send2trash}/bin/send2trash";
       tree = "${pkgs.eza}/bin/eza -T";
       vup = "${neovim}/bin/nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync'";
-      dev = "${pkgs.helix}/bin/hx";
     } // lib.optionalAttrs isLinux {
       pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard";
       pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -o";

diff --git a/home/git.nix b/home/git.nix
@@ -1,4 +1,8 @@
 { config, pkgs, ... }:
+let
+  # the complete neovim package
+  neovim = config.programs.neovim.finalPackage;
+in
 {
   programs.git = {
     enable = true;
@@ -29,9 +33,9 @@
       # https://blog.jez.io/cli-code-review
       files = "!git diff --name-only $(git base-commit)";
       stat = "!git diff --stat $(git base-commit)";
-      review = "!nvim -c 'set nosplitright' -p $(git files) -c \"tabdo Gvdiff $REVIEW_BASE\" -c 'set splitright'";
+      review = "!${neovim}/bin/nvim -c 'set nosplitright' -p $(git files) -c \"tabdo Gvdiff $REVIEW_BASE\" -c 'set splitright'";
       base-commit = "!git merge-base HEAD $REVIEW_BASE";
-      review-commits = "!nvim -c 'Gclog --reverse $REVIEW_BASE..'";
+      review-commits = "!${neovim}/bin/nvim -c 'Gclog --reverse $REVIEW_BASE..'";
       log-base = "!git l $REVIEW_BASE..";
 
       # ignore modifications to files
@@ -125,7 +129,7 @@
         autocrlf = "input";
         safecrlf = true;
         whitespace = "fix";
-        editor = "${pkgs.helix}/bin/hx";
+        editor = "${neovim}/bin/nvim";
         mergeoptions = "--no-ff";
         preloadindex = true;
         ignorecase = false;
@@ -144,7 +148,7 @@
       };
       mergetool = {
         conflicted = {
-          cmd = "nvim +Conflicted";
+          cmd = "${neovim}/bin/nvim +Conflicted";
         };
         smerge = {
           cmd = "smerge";

diff --git a/home/neovim.nix b/home/neovim.nix
@@ -6,6 +6,7 @@
     viAlias = true;
     vimAlias = true;
     vimdiffAlias = true;
+    defaultEditor = true;
     extraPython3Packages = (ps: with ps; [
       pynvim
       black