Use vim again

simonrw · Nov 6, 2023 · b4274aa · b4274aa
1 parent bdadcb2
commit b4274aa
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/common/nix-settings.nix b/common/nix-settings.nix
@@ -30,7 +30,6 @@ in
       "https://github-inbox.cachix.org"
       "https://nix-community.cachix.org"
       "https://cftail.cachix.org"
-      "https://helix.cachix.org"
     ];
     trusted-public-keys = [
       "mindriot101-home.cachix.org-1:6M7zAD5oYiwfVPobA5LPtwM+5FewBv4fEMvCgrLACR4="
@@ -39,7 +38,6 @@ in
       "github-inbox.cachix.org-1:S9UjpqvGC8oDtEdfwpHQmHALF4eP8EgPzRnWoMr4obc="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "cftail.cachix.org-1:/TvaKTN25wL/+JMBEkOmxM03HWUDY3UcuMa5ld3PPXw="
-      "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
     ];
   };
   extraOptions = ''

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'";
-      vim = "${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
@@ -129,7 +129,7 @@ in
         autocrlf = "input";
         safecrlf = true;
         whitespace = "fix";
-        editor = "${pkgs.helix}/bin/hx";
+        editor = "${neovim}/bin/nvim";
         mergeoptions = "--no-ff";
         preloadindex = true;
         ignorecase = false;