modules/aszlig: Make vim module a plain package

I don't use anything that's machine specific within my Vim
configuration (and even if, we can pass it via the callPackage
arguments) so it's kinda pointless that it's a module instead of a plain
package (override).

This makes it also easier to nix-build the package without the need to
go through the module system.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

3 files changed, 1 insertions, 388 deletions

diff --git a/modules/module-list.nix b/modules/module-list.nix
index a2efefc4..4330f9cb 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -22,7 +22,6 @@
   ./user/aszlig/programs/mpv
   ./user/aszlig/programs/taalo-build
   ./user/aszlig/programs/taskwarrior
-  ./user/aszlig/programs/vim
   ./user/aszlig/programs/xpdf
   ./user/aszlig/programs/zsh
   ./user/aszlig/services/i3
diff --git a/modules/user/aszlig/profiles/base.nix b/modules/user/aszlig/profiles/base.nix
index 5115ea25..e1f3e05a 100644
--- a/modules/user/aszlig/profiles/base.nix
+++ b/modules/user/aszlig/profiles/base.nix
@@ -39,7 +39,6 @@ in {
       ServerAliveInterval 60
     '';
 
-    vuizvui.user.aszlig.programs.vim.enable = true;
     vuizvui.user.aszlig.programs.zsh.enable = true;
     vuizvui.enableGlobalNixpkgsConfig = true;
 
@@ -59,6 +58,7 @@ in {
       unfreePkgs.unrar
       unzip
       vlock
+      vuizvui.aszlig.vim
       wget
       xz
     ];
diff --git a/modules/user/aszlig/programs/vim/default.nix b/modules/user/aszlig/programs/vim/default.nix
deleted file mode 100644
index 27f9e98a..00000000
--- a/modules/user/aszlig/programs/vim/default.nix
+++ /dev/null
@@ -1,386 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-  cfg = config.vuizvui.user.aszlig.programs.vim;
-
-  fetchVimScript = { srcId, sha256, type, name }: let
-    baseUrl = "http://www.vim.org/scripts/download_script.php";
-    src = pkgs.fetchurl {
-      name = "script${toString srcId}.vim";
-      url = "${baseUrl}?src_id=${toString srcId}";
-      inherit sha256;
-    };
-  in pkgs.stdenv.mkDerivation {
-    name = "vim-${type}-${toString srcId}";
-    buildCommand = ''
-      install -vD -m 0644 "${src}" "$out/${type}/${name}.vim"
-    '';
-  };
-
-  extractSubdir = subdir: src: pkgs.stdenv.mkDerivation {
-    name = "${src.name}-subdir";
-    phases = [ "unpackPhase" "installPhase" ];
-    inherit src;
-    installPhase = ''
-      cp -Rd "${subdir}" "$out"
-    '';
-  };
-
-  mkVimPlugins = plugins: pkgs.buildEnv {
-    name = "vim-plugins";
-    paths = with lib; mapAttrsToList (const id) plugins;
-    ignoreCollisions = true;
-    postBuild = ''
-      find -L "$out" -mindepth 1 -maxdepth 1 -type f -delete
-    '';
-  };
-
-  pluginDeps = {
-    vimAddonMwUtils = pkgs.fetchFromGitHub {
-      owner = "MarcWeber";
-      repo = "vim-addon-mw-utils";
-      rev = "0c5612fa31ee434ba055e21c76f456244b3b5109";
-      sha256 = "147s1k4n45d3x281vj35l26sv4waxjlpqdn83z3k9n51556h1d45";
-    };
-
-    vimAddonCompletion = pkgs.fetchFromGitHub {
-      owner = "MarcWeber";
-      repo = "vim-addon-completion";
-      rev = "80f717d68df5b0d7b32228229ddfd29c3e86e435";
-      sha256 = "08acffzy847w8b5j8pdw6qsidm2859ki5q351n4r7fkr969p80mi";
-    };
-
-    vimAddonActions = pkgs.fetchFromGitHub {
-      owner = "MarcWeber";
-      repo = "vim-addon-actions";
-      rev = "a5d20500fb8812958540cf17862bd73e7af64936";
-      sha256 = "1wfkwr89sn2w97i94d0dqylcg9mr6pirjadi0a4l492nfnsh99bc";
-    };
-
-    vimAddonBackgroundCmd = pkgs.fetchFromGitHub {
-      owner = "MarcWeber";
-      repo = "vim-addon-background-cmd";
-      rev = "14df72660a95804a57c02b9ff0ae3198608e2491";
-      sha256 = "09lh6hqbx05gm7njhpqvhqdwig3pianq9rddxmjsr6b1vylgdgg4";
-    };
-
-    vimAddonErrorFormats = pkgs.fetchFromGitHub {
-      owner = "MarcWeber";
-      repo = "vim-addon-errorformats";
-      rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28";
-      sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1";
-    };
-
-    vimAddonToggleBuffer = pkgs.fetchFromGitHub {
-      owner = "MarcWeber";
-      repo = "vim-addon-toggle-buffer";
-      rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b";
-      sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03";
-    };
-
-    vimAddonGotoThingAtCursor = pkgs.fetchFromGitHub {
-      owner = "MarcWeber";
-      repo = "vim-addon-goto-thing-at-cursor";
-      rev = "f052e094bdb351829bf72ae3435af9042e09a6e4";
-      sha256 = "1ksm2b0j80zn8sz2y227bpcx4jsv76lwgr2gpgy2drlyqhn2vlv0";
-    };
-
-    vimAddonViews = pkgs.fetchFromGitHub {
-      owner = "MarcWeber";
-      repo = "vim-addon-views";
-      rev = "d1383ad56d0a07d7350880adbadf9de501729fa8";
-      sha256 = "09gqh7w5rk4lmra706schqaj8dnisf396lpsipm7xv6gy1qbslnv";
-    };
-
-    vimAddonSwfMill = pkgs.fetchFromGitHub {
-      owner = "MarcWeber";
-      repo = "vim-addon-swfmill";
-      rev = "726777e02cbe3ad8f82e37421fb37674f446a148";
-      sha256 = "0ablzl5clgfzhzwvzzbaj0cda0b4cyrj3pbv02f26hx7rfnssaqm";
-    };
-
-    vimHaxeSyntax = pkgs.fetchFromGitHub {
-      owner = "MarcWeber";
-      repo = "vim-haxe-syntax";
-      rev = "500acc2f2ab92d77ff6cd04fdc7868800c033dfa";
-      sha256 = "1ipm0igplplfmscm3bk95qpf9rw71h133l9shmw54mxr4h0ymnmj";
-    };
-
-    tlib = pkgs.fetchFromGitHub {
-      owner = "tomtom";
-      repo = "tlib_vim";
-      rev = "bc4097bd38c4bc040fe1e74df68dec6c9adfcb6a";
-      sha256 = "19v7bgmkk4k2g1z62bd0kky29xxfq96l7wfrl27wb2zijlhbrnpz";
-    };
-
-    vamStub = pkgs.writeTextFile {
-      name = "vam-stub";
-      destination = "/autoload/vam.vim";
-      text = ''
-        fun! vam#DefineAndBind(local, global, default)
-          return ' if !exists('.string(a:global).') |
-                 \ let '.a:global.' = '.a:default.' |
-                 \ endif | let '.a:local.' = '.a:global
-        endfun
-      '';
-    };
-  };
-
-  plugins = mkVimPlugins (pluginDeps // {
-    vimErl = pkgs.fetchFromGitHub {
-      owner = "jimenezrick";
-      repo = "vimerl";
-      rev = "823bf8cb515bb10396c705cdc017aa9121cc4d12";
-      sha256 = "0sybkx8iy8qhr6nlwn52j7zd5v99rn0b8wbg43d112z2px4yq5x3";
-    };
-
-    vimHaxe = pkgs.fetchFromGitHub {
-      owner = "MarcWeber";
-      repo = "vim-haxe";
-      rev = "8efc705db41a01713d67d437f29866a1ff831e8a";
-      sha256 = "15kv13gvpgf23p0566qrlw7gmpir2z7g5dnkfs1knmcwzw45am5d";
-    };
-
-    factor = extractSubdir "misc/vim" (pkgs.fetchFromGitHub {
-      owner = "slavapestov";
-      repo = "factor";
-      rev = "0d6f70cc7cf35cc627ee78886e2932091a651fe6";
-      sha256 = "0lmqzvrmwgmxpcpwgn59y033sf4jybmw3lffbjwww5d7ch90333q";
-    });
-
-    opaLang = extractSubdir "tools/editors/vim" (pkgs.fetchFromGitHub {
-      owner = "MLstate";
-      repo = "opalang";
-      rev = "94e4e6d9d8da9a72214f4f28dd1ffa1a987997eb";
-      sha256 = "0d6b67868cfqakkz63y5ynpz549lbpfzc3c3x7kx3ffsv10xy3bb";
-    });
-
-    lslvim = pkgs.fetchFromGitHub {
-      owner = "sukima";
-      repo = "LSLvim";
-      rev = "f269de39a1c713a43470e90d0ec78208c0f05e0b";
-      sha256 = "1plwx5id3jsj4y6yhshlf3rishxhf1b9k47g2cpzaczvqb5bl40w";
-    };
-
-    vimSyntaxShakespeare = pkgs.fetchFromGitHub {
-      owner = "pbrisbin";
-      repo = "vim-syntax-shakespeare";
-      rev = "29085ae94ee3dbd7f39f2a7705d86692ef5bc365";
-      sha256 = "0kvys81jiwqzwmpbk1lvbciw28yha4shd1xby5saiy4b68l6d8rk";
-    };
-
-    glsl = fetchVimScript {
-      name = "glsl";
-      srcId = 3194;
-      sha256 = "1vqfcpjmfyjc95wns3i84kgd1k5r2lwjjvjcprygi9g9vng7i5xc";
-      type = "syntax";
-    };
-
-    actionScript = fetchVimScript {
-      name = "actionscript";
-      srcId = 1205;
-      sha256 = "0pdzqg678lhn7lmqf3z9icpj6ff2nnghsxy983kxkn8sblnzlhfs";
-      type = "syntax";
-    };
-
-    indentPython = fetchVimScript {
-      name = "python";
-      srcId = 4316;
-      sha256 = "1pgdiaqd1hm0qpspy1asj7i103pq0846lnjrxvl6pk17ymww9pmk";
-      type = "indent";
-    };
-
-    nixAddon = pkgs.stdenv.mkDerivation {
-      name = "vim-nix-support";
-
-      lnl7 = pkgs.fetchFromGitHub {
-        owner = "LnL7";
-        repo = "vim-nix";
-        rev = "9ac8876e5beb824018b9a09d4640f7efc2fbc8ae";
-        sha256 = "0whdf56c63vp4c3b2jfl1x5c0dxxrzwvxkfm5951qzpfy6xwg27x";
-      };
-
-      src = pkgs.fetchFromGitHub {
-        owner = "MarcWeber";
-        repo = "vim-addon-nix";
-        rev = "2aed79ba5d8c5e6abd102de77e55e242f61b17f1";
-        sha256 = "0zx1q9994py6jmm0qbbx6fc1dy5la8zfskkbvqqxssxrl5dx7vvi";
-      };
-
-      phases = [ "unpackPhase" "patchPhase" "installPhase" ];
-      patchPhase = ''
-        for what in indent syntax; do
-          install -vD -m 0644 "$lnl7/$what/nix.vim" "$what/nix.vim"
-        done
-        sed -i -re '/^ *au(group)? /,/^ *au(group)? +end/ {
-          s/^ *au(tocmd)? +((BufRead|BufNewFile),?)+ +[^ ]+ +setl(ocal)?/${
-            "& sw=2 sts=2 et iskeyword+=-"
-          }/
-        }' plugin/vim-addon-nix.vim
-        grep '^setlocal' "$lnl7/ftplugin/nix.vim" >> ftplugin/nix.vim
-      '';
-
-      installPhase = ''
-        cp -Rd . "$out"
-      '';
-    };
-
-    urwebAddon = pkgs.fetchFromGitHub {
-      owner = "MarcWeber";
-      repo = "vim-addon-urweb";
-      rev = "49ea3960a9924a5dd7ff70956d1a7c0479a55773";
-      sha256 = "090ww8nxqsabrwf4r8g7a93kawnp6zwpsx65yxpacwwwlbc73m7s";
-    };
-
-    indentHaskell = fetchVimScript {
-      name = "haskell";
-      srcId = 7407;
-      sha256 = "1lj44jkyihmcnj2kcfckhqzr9gfipda9frbzicix2wrc5728kjsv";
-      type = "indent";
-    };
-
-    fishSyntax = fetchVimScript {
-      name = "fish";
-      srcId = 20242;
-      sha256 = "12gfmyxxf84f19bp8xfmkb9phbfkifn89sjgi8hnv6dn0a5y1zpj";
-      type = "syntax";
-    };
-
-    elmVim = pkgs.fetchFromGitHub {
-      owner = "lambdatoast";
-      repo = "elm.vim";
-      rev = "ad556c97e26072b065825852ceead0fe6a1f7d7c";
-      sha256 = "19k6b6m5ngm5qn2f3p13hzjyvha53fpdgq691z8n0lwfn8831b21";
-    };
-
-    flake8 = pkgs.fetchFromGitHub {
-      owner = "nvie";
-      repo = "vim-flake8";
-      rev = "293613dbe731a2875ce93739e7b64ee504d8bbab";
-      sha256 = "0xmqmbh66g44vhx9769mzs820k6ksbpfnsfvivmbhzlps2hjqpqg";
-    };
-
-    vader = pkgs.fetchFromGitHub {
-      owner = "junegunn";
-      repo = "vader.vim";
-      rev = "ad2c752435baba9e7544d0046f0277c3573439bd";
-      sha256 = "0yvnah4lxk5w5qidc3y5nvl6lpi8rcv26907b3w7vjskqc935b8f";
-    };
-  });
-
-  generic = ''
-    syntax on
-    colorscheme elflord
-
-    " boolean
-    set nocompatible
-    set showcmd
-    set showmatch
-    set ignorecase
-    set smartcase
-    set incsearch
-    set modeline
-    set smarttab
-    set expandtab
-    set smartindent
-    set ruler
-
-    " non-boolean
-    set tabstop=4
-    set softtabstop=4
-    set shiftwidth=4
-    set textwidth=80
-    set termencoding=ascii
-    set backspace=indent,eol,start
-    set background=dark
-    set mouse=
-  '';
-
-  plugin = ''
-    " erlang
-    let erlang_folding = 0
-    let erlang_highlight_bif = 1
-    let erlang_force_use_vimerl_indent = 1
-
-    " python
-    let python_highlight_numbers = 1
-    let python_highlight_builtins = 1
-    let python_highlight_exceptions = 1
-    let g:flake8_cmd = '${pkgs.pythonPackages.flake8}/bin/flake8'
-
-    " all plugins
-    set runtimepath^=${plugins}
-    set runtimepath+=${plugins}/after
-    runtime! ftdetect/*.vim
-  '';
-
-  autocmd = ''
-    " jump to last position
-    au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") |
-                   \ exe "normal! g'\"zz" | endif
-
-    " filetype defaults
-    filetype plugin indent on
-    au BufNewFile,BufRead *.as set ft=actionscript
-    au BufNewFile,BufRead *.tt set ft=tt2html ts=2 sw=2 sts=2 et
-    au BufNewFile,BufRead *.html set ts=2 sw=2 sts=2 et
-    au FileType python set textwidth=79
-    au FileType gitcommit set textwidth=72
-    au FileType docbk set tabstop=2 shiftwidth=2 expandtab
-
-    " highlight unnecessary whitespace
-    highlight ExtraWhitespace ctermbg=red guibg=red
-    match ExtraWhitespace /\s\+$/
-    au BufWinEnter,InsertLeave * match ExtraWhitespace /\s\+$/
-    au InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
-    " prevent colorscheme from overriding these highlights
-    au ColorScheme * highlight ExtraWhitespace ctermbg=red guibg=red
-
-    " highlight everything exceeding 80 characters
-    au BufWinEnter * let w:m2=matchadd('ErrorMsg', '\%>80v.\+', -1)
-  '';
-
-  misc = ''
-    " ASCII art mode
-    fun! AAMode()
-      highlight clear ExtraWhitespace
-      for m in getmatches()
-        if m.group == 'ErrorMsg' && m.pattern == '\%>80v.\+'
-          call matchdelete(m.id)
-        endif
-      endfor
-    endfun
-
-    command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis
-      \ | wincmd p | diffthis
-
-    " flake everything that has been *detected* as python (not just by suffix).
-    autocmd BufWritePost * if &ft ==# 'python' | call Flake8() | endif
-  '';
-
-  vimrc = pkgs.writeText "vimrc" ''
-    ${generic}
-    ${plugin}
-
-    if has("autocmd")
-      ${autocmd}
-    endif
-
-    ${misc}
-  '';
-
-  patchedVim = lib.overrideDerivation pkgs.vim_configurable (o: {
-    postInstall = (o.postInstall or "") + ''
-      ln -sf "${vimrc}" "$out/share/vim/vimrc"
-    '';
-  });
-
-in {
-  options.vuizvui.user.aszlig.programs.vim = {
-    enable = lib.mkEnableOption "aszlig's Vim";
-  };
-
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = lib.singleton patchedVim;
-  };
-}