Merge remote-tracking branch 'cd/master'

9 files changed, 126 insertions, 24 deletions

diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 69f1300b..1122e6a1 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -10,8 +10,8 @@ with lib;
 
   krebs.build.source = {
     git.nixpkgs = {
-      url = https://github.com/4z3/nixpkgs;
-      rev = "03130ec91356cd250b80f144022ee2f4d665ca36"; # 1357692
+      url = https://github.com/NixOS/nixpkgs;
+      rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
     };
     dir.secrets = {
       host = config.krebs.hosts.wu;
diff --git a/tv/1systems/mkdir.nix b/tv/1systems/mkdir.nix
index 305ea726..e8e35419 100644
--- a/tv/1systems/mkdir.nix
+++ b/tv/1systems/mkdir.nix
@@ -24,7 +24,7 @@ in
   krebs.build.source = {
     git.nixpkgs = {
       url = https://github.com/NixOS/nixpkgs;
-      rev = "e57024f821c94caf5684964474073649b8b6356b";
+      rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
     };
     dir.secrets = {
       host = config.krebs.hosts.wu;
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 61f833d4..df45b817 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -10,8 +10,8 @@ with lib;
 
   krebs.build.source = {
     git.nixpkgs = {
-      url = https://github.com/4z3/nixpkgs;
-      rev = "03130ec91356cd250b80f144022ee2f4d665ca36"; # 1357692
+      url = https://github.com/NixOS/nixpkgs;
+      rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
     };
     dir.secrets = {
       host = config.krebs.hosts.wu;
diff --git a/tv/1systems/rmdir.nix b/tv/1systems/rmdir.nix
index f77268b5..e24ef64f 100644
--- a/tv/1systems/rmdir.nix
+++ b/tv/1systems/rmdir.nix
@@ -24,7 +24,7 @@ in
   krebs.build.source = {
     git.nixpkgs = {
       url = https://github.com/NixOS/nixpkgs;
-      rev = "68bd8e4a9dc247726ae89cc8739574261718e328";
+      rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
     };
     dir.secrets = {
       host = config.krebs.hosts.wu;
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 65389b66..85fba1d8 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -11,7 +11,7 @@ with lib;
   krebs.build.source = {
     git.nixpkgs = {
       url = https://github.com/NixOS/nixpkgs;
-      rev = "e916273209560b302ab231606babf5ce1c481f08";
+      rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
     };
     dir.secrets = {
       host = config.krebs.hosts.wu;
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 82f5abf7..e2cc2c06 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -11,7 +11,7 @@ with lib;
   krebs.build.source = {
     git.nixpkgs = {
       url = https://github.com/NixOS/nixpkgs;
-      rev = "e57024f821c94caf5684964474073649b8b6356b";
+      rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
     };
     dir.secrets = {
       host = config.krebs.hosts.wu;
@@ -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 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
new file mode 100644
index 00000000..8c6c9fb4
--- /dev/null
+++ b/tv/2configs/vim.nix
@@ -0,0 +1,116 @@
+{ lib, pkgs, ... }:
+
+with lib;
+let
+  out = {
+    environment.systemPackages = [
+      pkgs.vim
+    ];
+
+    # Nano really is just a stupid name for Vim.
+    nixpkgs.config.packageOverrides = pkgs: {
+      nano = pkgs.vim;
+    };
+
+    environment.etc.vimrc.source = vimrc;
+
+    environment.variables.EDITOR = mkForce "vim";
+    environment.variables.VIMINIT = ":so /etc/vimrc";
+  };
+
+  extra-runtimepath = concatStringsSep "," [
+    "${pkgs.vimPlugins.undotree}/share/vim-plugins/undotree"
+  ];
+
+  vimrc = pkgs.writeText "vimrc" ''
+    set nocompatible
+
+    set autoindent
+    set backspace=indent,eol,start
+    set backup
+    set backupdir=$HOME/.vim/backup/
+    set directory=$HOME/.vim/cache//
+    set hlsearch
+    set incsearch
+    set mouse=a
+    set noruler
+    set pastetoggle=<INS>
+    set runtimepath=${extra-runtimepath},$VIMRUNTIME
+    set shortmess+=I
+    set showcmd
+    set showmatch
+    set ttimeoutlen=0
+    set undodir=$HOME/.vim/undo
+    set undofile
+    set undolevels=1000000
+    set undoreload=1000000
+    set viminfo='20,<1000,s100,h,n$HOME/.vim/cache/info
+    set visualbell
+    set wildignore+=*.o,*.class,*.hi,*.dyn_hi,*.dyn_o
+    set wildmenu
+    set wildmode=longest,full
+
+    filetype plugin indent on
+
+    set t_Co=256
+    colorscheme industry
+    syntax on
+
+    au Syntax * syn match Tabstop containedin=ALL /\t\+/
+            \ | hi Tabstop ctermbg=16
+            \ | syn match TrailingSpace containedin=ALL /\s\+$/
+            \ | hi TrailingSpace ctermbg=88
+            \ | hi Normal ctermfg=White
+
+    au BufRead,BufNewFile *.nix so ${pkgs.writeText "nix.vim" ''
+      setf nix
+
+      " Ref <nix/src/libexpr/lexer.l>
+      syn match INT   /[0-9]\+/
+      syn match PATH  /[a-zA-Z0-9\.\_\-\+]*\(\/[a-zA-Z0-9\.\_\-\+]\+\)\+/
+      syn match HPATH /\~\(\/[a-zA-Z0-9\.\_\-\+]\+\)\+/
+      syn match SPATH /<[a-zA-Z0-9\.\_\-\+]\+\(\/[a-zA-Z0-9\.\_\-\+]\+\)*>/
+      syn match URI   /[a-zA-Z][a-zA-Z0-9\+\-\.]*:[a-zA-Z0-9\%\/\?\:\@\&\=\+\$\,\-\_\.\!\~\*\']\+/
+      hi link INT Constant
+      hi link PATH Constant
+      hi link HPATH Constant
+      hi link SPATH Constant
+      hi link URI Constant
+
+      syn match String /"\([^"]\|\\\"\)*"/
+      syn match Comment /\s#.*/
+    ''}
+
+    au BufRead,BufNewFile /dev/shm/* set nobackup nowritebackup noswapfile
+
+    nmap <esc>q :buffer
+    nmap <M-q> :buffer
+
+    cnoremap <C-A> <Home>
+
+    noremap  <C-c> :q<cr>
+
+    nnoremap <esc>[5^  :tabp<cr>
+    nnoremap <esc>[6^  :tabn<cr>
+    nnoremap <esc>[5@  :tabm -1<cr>
+    nnoremap <esc>[6@  :tabm +1<cr>
+
+    nnoremap <f1> :tabp<cr>
+    nnoremap <f2> :tabn<cr>
+    inoremap <f1> <esc>:tabp<cr>
+    inoremap <f2> <esc>:tabn<cr>
+
+    " <C-{Up,Down,Right,Left>
+    noremap <esc>Oa <nop> | noremap! <esc>Oa <nop>
+    noremap <esc>Ob <nop> | noremap! <esc>Ob <nop>
+    noremap <esc>Oc <nop> | noremap! <esc>Oc <nop>
+    noremap <esc>Od <nop> | noremap! <esc>Od <nop>
+    " <[C]S-{Up,Down,Right,Left>
+    noremap <esc>[a <nop> | noremap! <esc>[a <nop>
+    noremap <esc>[b <nop> | noremap! <esc>[b <nop>
+    noremap <esc>[c <nop> | noremap! <esc>[c <nop>
+    noremap <esc>[d <nop> | noremap! <esc>[d <nop>
+    vnoremap u <nop>
+  '';
+in
+out
diff --git a/tv/4lib/default.nix b/tv/4lib/default.nix
index 7e6b2ab1..c099eb73 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;
 }