From b66c81ab3ba2b0cdd4eac8e975b40b75dcaeedd7 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 28 Mar 2022 15:32:00 +0200
Subject: machines/sternenseemann: use emacs as default EDITOR

Install vim as TTY fallback editor.
---
 machines/sternenseemann/base.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'machines/sternenseemann/base.nix')

diff --git a/machines/sternenseemann/base.nix b/machines/sternenseemann/base.nix
index 8d8d7c94..b9f27beb 100644
--- a/machines/sternenseemann/base.nix
+++ b/machines/sternenseemann/base.nix
@@ -6,11 +6,13 @@ let
     getBins
     ;
 
-  bins = (getBins pkgs.neovim [ "nvim" ])
-      // (getBins pkgs.less [ "less" ])
-      ;
+  bins = getBins pkgs.less [ "less" ];
 
 in {
+  imports = [
+    ./vim-basic.nix
+  ];
+
   config = {
     boot.cleanTmpDir = true;
 
@@ -103,12 +105,9 @@ in {
       man-pages-posix
       gitFull
       file htop psmisc tmux
-      neovim
     ];
 
     environment.variables = {
-      EDITOR = bins.nvim;
-      VISUAL = bins.nvim;
       PAGER = "${bins.less} -R";
       # git-diff without the extra options passed to less
       GIT_PAGER = bins.less;
-- 
cgit 1.4.1