tv base: import vim

2 files changed, 9 insertions, 12 deletions

diff --git a/tv/2configs/base.nix b/tv/2configs/base.nix
index 0a8dbdcc..41159690 100644
--- a/tv/2configs/base.nix
+++ b/tv/2configs/base.nix
@@ -3,17 +3,13 @@
 with builtins;
 with lib;
 
-let
-  # "7.4.335" -> "74"
-  majmin = x: concatStrings (take 2 (splitString "." x));
-in
-
 {
   krebs.enable = true;
 
   networking.hostName = config.krebs.build.host.name;
 
   imports = [
+    ./vim.nix
     {
       # stockholm dependencies
       environment.systemPackages = with pkgs; [
@@ -107,10 +103,8 @@ in
         lAtr = "ls -lAtr";
         # alias ll='ls -l'
         ls = "ls -h --color=auto --group-directories-first";
-        # alias vim='vim -p'
-        # alias vi='vim'
-        # alias view='vim -R'
         dmesg = "dmesg -L --reltime";
+        view = "vim -R";
       };
 
       programs.bash = {
@@ -153,10 +147,6 @@ in
     }
 
     {
-      nixpkgs.config.packageOverrides = pkgs: {
-        nano = pkgs.vim;
-      };
-
       services.cron.enable = false;
       services.nscd.enable = false;
       services.ntp.enable = false;
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 7eb2eb13..74eee0a3 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -7,6 +7,13 @@ let
       vim'
     ];
 
+    # Nano really is just a stupid name for Vim.
+    # Note: passing just pkgs.vim to cvs to not rebuild it all the time
+    nixpkgs.config.packageOverrides = pkgs: {
+      cvs = pkgs.cvs.override { nano = pkgs.vim; };
+      nano = vim';
+    };
+
     environment.variables.EDITOR = mkForce "vim";
   };