Merge remote-tracking branch 'mb/master'

1 files changed, 6 insertions, 1 deletions

diff --git a/mb/1systems/orange/configuration.nix b/mb/1systems/orange/configuration.nix
index 3e90f89a2..b43bd8a0f 100644
--- a/mb/1systems/orange/configuration.nix
+++ b/mb/1systems/orange/configuration.nix
@@ -5,6 +5,7 @@ in {
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
       <stockholm/mb>
+      <stockholm/mb/2configs/nvim.nix>
     ];
 
   krebs.build.host = config.krebs.hosts.orange;
@@ -124,15 +125,19 @@ in {
     unstable.ponyc
     unstable.sublime3
     unstable.youtube-dl
-    vim
     virt-viewer
     virtmanager
     vulnix
     wcalc
     wget
     xz
+    zbackup
   ];
 
+  environment.variables = {
+    EDITOR = ["nvim"];
+  };
+
   environment.shellAliases = {
     ll = "ls -alh";
     ls = "ls --color=tty";