From 26a166c8c1a577cefe7884eaeea1541eb910aa87 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 25 May 2015 13:46:02 +0200
Subject: better terminal&vim colors

---
 modules/lass/vim.nix | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'modules/lass/vim.nix')

diff --git a/modules/lass/vim.nix b/modules/lass/vim.nix
index e277bd725..56a20c383 100644
--- a/modules/lass/vim.nix
+++ b/modules/lass/vim.nix
@@ -1,6 +1,17 @@
 { config, pkgs, ... }:
 
-{
+let
+  customPlugins.mustang2 = pkgs.vimUtils.buildVimPlugin {
+    name = "Mustang2";
+    src = pkgs.fetchFromGitHub {
+      owner = "croaker";
+      repo = "mustang-vim";
+      rev = "6533d7d21bf27cae94d9c2caa575f627f003dfd5";
+      sha256 = "0zlmcrr04j3dkiivrhqi90f618lmnnnpvbz1b9msfs78cmgw9w67";
+    };
+  };
+
+in {
 
   environment.systemPackages = with pkgs; [
     (vim_configurable.customize {
@@ -12,7 +23,7 @@
       syntax on
       " TODO autoload colorscheme file
       set background=dark
-      colorscheme solarized
+      colorscheme mustang
       filetype off
       filetype plugin indent on
 
@@ -81,13 +92,12 @@
       set undofile
     '';
 
-      vimrcConfig.vam.knownPlugins = vimPlugins;
+      vimrcConfig.vam.knownPlugins = vimPlugins // customPlugins;
       vimrcConfig.vam.pluginDictionaries = [
-        { name = "Gundo"; }
-        { name = "commentary"; }
-        { name = "vim-addon-nix"; }
-        { name = "colors-solarized"; }
+        { names = [ "Gundo" "commentary" "vim-addon-nix" ]; }
+        { name = "mustang2"; }
       ];
+
     })
   ];
 }
-- 
cgit v1.2.3


From 224c8965eef21b3f003d1ffd28cd0643765545d8 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 29 May 2015 02:43:46 +0200
Subject: update vim.nix

---
 modules/lass/vim.nix | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'modules/lass/vim.nix')

diff --git a/modules/lass/vim.nix b/modules/lass/vim.nix
index 56a20c383..1000b8da6 100644
--- a/modules/lass/vim.nix
+++ b/modules/lass/vim.nix
@@ -13,8 +13,8 @@ let
 
 in {
 
-  environment.systemPackages = with pkgs; [
-    (vim_configurable.customize {
+  environment.systemPackages = [
+    (pkgs.vim_configurable.customize {
       name = "vim";
 
     vimrcConfig.customRC = ''
@@ -58,8 +58,6 @@ in {
 
       "Tabwidth
       set ts=2 sts=2 sw=2 et
-      autocmd BufRead *.js,*.json set ts=2 sts=2 sw=2 et
-      autocmd BufRead *.hs set ts=4 sts=4 sw=4 et
 
       " create Backup/tmp/undo dirs
       function! InitBackupDir()
@@ -90,12 +88,24 @@ in {
       set viminfo='20,<1000,s100,h,n~/.vim/tmp/info
       set undodir=$HOME/.vim/undo
       set undofile
+
+      " highlight whitespaces
+      highlight ExtraWhitespace ctermbg=red guibg=red
+      match ExtraWhitespace /\s\+$/
+      autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
+      autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
+      autocmd InsertLeave * match ExtraWhitespace /\s\+$/
+      autocmd BufWinLeave * call clearmatches()
+
+      "ft specific stuff
+      autocmd BufRead *.js,*.json set ts=2 sts=2 sw=2 et
+      autocmd BufRead *.hs set ts=4 sts=4 sw=4 et
     '';
 
-      vimrcConfig.vam.knownPlugins = vimPlugins // customPlugins;
+      vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins;
       vimrcConfig.vam.pluginDictionaries = [
-        { names = [ "Gundo" "commentary" "vim-addon-nix" ]; }
-        { name = "mustang2"; }
+        { names = [ "Gundo" "commentary" "mustang2" ]; }
+        { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
       ];
 
     })
-- 
cgit v1.2.3


From ac6cb36531c47b711839517ad024488c30474017 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 5 Jun 2015 12:55:51 +0200
Subject: vim: change escape timeout

---
 modules/lass/vim.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'modules/lass/vim.nix')

diff --git a/modules/lass/vim.nix b/modules/lass/vim.nix
index 1000b8da6..e1cff0d24 100644
--- a/modules/lass/vim.nix
+++ b/modules/lass/vim.nix
@@ -100,6 +100,9 @@ in {
       "ft specific stuff
       autocmd BufRead *.js,*.json set ts=2 sts=2 sw=2 et
       autocmd BufRead *.hs set ts=4 sts=4 sw=4 et
+
+      "esc timeout
+      set timeoutlen=1000 ttimeoutlen=0
     '';
 
       vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins;
-- 
cgit v1.2.3