From 7a474a5bb73ba66eb32da930315e53d5fd74e207 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 3 Sep 2021 22:44:22 +0200
Subject: [PATCH] util/liveiso: Make neovim the default editor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make neovim the default editor and create an alias for vim.

The NixOS module for neovim is currently broken. Thus, add a note to
`description.md` to switch to that later.

Change-Id: I9345a6e32f3035565e55e50579c97121b4987d83
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57393
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 util/liveiso/common.nix     | 15 +++++++++++----
 util/liveiso/description.md |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/util/liveiso/common.nix b/util/liveiso/common.nix
index 320971b57c..6c57dc333d 100644
--- a/util/liveiso/common.nix
+++ b/util/liveiso/common.nix
@@ -16,10 +16,17 @@
 		isoName = "${config.isoImage.isoBaseName}-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.iso";
 	};
 
-	# Tell the Nix evaluator to garbage collect more aggressively.
-	# This is desirable in memory-constrained environments that don't
-	# (yet) have swap set up.
-	environment.variables.GC_INITIAL_HEAP_SIZE = "1M";
+	environment = {
+		variables = {
+			EDITOR = "nvim";
+			VISUAL = "nvim";
+			# Tell the Nix evaluator to garbage collect more aggressively.
+			# This is desirable in memory-constrained environments that don't
+			# (yet) have swap set up.
+			GC_INITIAL_HEAP_SIZE = "1M";
+		};
+		shellAliases.vim = "nvim";
+	};
 
 	boot = {
 		kernelParams = [
diff --git a/util/liveiso/description.md b/util/liveiso/description.md
index 8f282faddb..a9e2eb8b87 100644
--- a/util/liveiso/description.md
+++ b/util/liveiso/description.md
@@ -9,3 +9,4 @@ NixOS configuration files for testing purposes and for working on firmware.
   Will be usable from the next NixOS release.
 - Generate customized bootloader configs; FILO is WIP
 - Add coreboot toolchain
+- Switch to `programs.neovim` when the module is fixed.