summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-11-01 13:28:16 +0100
committertv <tv@shackspace.de>2015-11-01 13:28:16 +0100
commit9c36073e7b0081eaec37b0de232aeee2dcf5d8ab (patch)
tree85b7f302dba74f73397e99bc80eefad08bd98fcd
parent2977f6d2910528bd7b3c78ae614aebff18dd4874 (diff)
tv base: import vim
-rw-r--r--tv/1systems/xu.nix1
-rw-r--r--tv/2configs/base.nix14
-rw-r--r--tv/2configs/vim.nix7
-rw-r--r--tv/4lib/default.nix3
4 files changed, 9 insertions, 16 deletions
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 82f5abf73..b858444af 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -110,7 +110,6 @@ with lib;
#minicom
#mtools
#ncmpc
- #neovim
#nethogs
#nix-prefetch-scripts #cvs bug
#openssl
diff --git a/tv/2configs/base.nix b/tv/2configs/base.nix
index 0a8dbdcc2..41159690d 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 7eb2eb139..74eee0a3b 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";
};
diff --git a/tv/4lib/default.nix b/tv/4lib/default.nix
index 7e6b2ab17..c099eb733 100644
--- a/tv/4lib/default.nix
+++ b/tv/4lib/default.nix
@@ -6,9 +6,6 @@ lib // rec {
inherit lib pkgs;
};
- # "7.4.335" -> "74"
- majmin = with lib; x : concatStrings (take 2 (splitString "." x));
-
# TODO deprecate shell-escape for lass
shell-escape = lib.shell.escape;
}