From 5f800d02e8345a41ef1e74dd0dbbb291916311f7 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 6 Mar 2016 01:50:44 +0100
Subject: l 2 vim: add fugitive & unimpared to vim plugins

---
 lass/2configs/vim.nix | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

(limited to 'lass/2configs/vim.nix')

diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 3fe45e1d1..fe5405bca 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -1,13 +1,24 @@
 { config, pkgs, ... }:
 
 let
-  customPlugins.mustang2 = pkgs.vimUtils.buildVimPlugin {
-    name = "Mustang2";
-    src = pkgs.fetchFromGitHub {
-      owner = "croaker";
-      repo = "mustang-vim";
-      rev = "6533d7d21bf27cae94d9c2caa575f627f003dfd5";
-      sha256 = "0zlmcrr04j3dkiivrhqi90f618lmnnnpvbz1b9msfs78cmgw9w67";
+  customPlugins = {
+    mustang2 = pkgs.vimUtils.buildVimPlugin {
+      name = "Mustang2";
+      src = pkgs.fetchFromGitHub {
+        owner = "croaker";
+        repo = "mustang-vim";
+        rev = "6533d7d21bf27cae94d9c2caa575f627f003dfd5";
+        sha256 = "0zlmcrr04j3dkiivrhqi90f618lmnnnpvbz1b9msfs78cmgw9w67";
+      };
+    };
+    unimpaired = pkgs.vimUtils.buildVimPlugin {
+      name = "unimpaired-vim";
+      src = pkgs.fetchFromGitHub {
+        owner = "tpope";
+        repo = "vim-unimpaired";
+        rev = "11dc568dbfd7a56866a4354c737515769f08e9fe";
+        sha256 = "1an941j5ckas8l3vkfhchdzjwcray16229rhv3a1d4pbxifwshi8";
+      };
     };
   };
 
@@ -105,11 +116,24 @@ in {
 
       "esc timeout
       set timeoutlen=1000 ttimeoutlen=0
+
+      "foldfunctions
+      inoremap <F9> <C-O>za
+      nnoremap <F9> za
+      onoremap <F9> <C-C>za
+      vnoremap <F9> zf
     '';
 
       vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins;
       vimrcConfig.vam.pluginDictionaries = [
-        { names = [ "Gundo" "commentary" "mustang2" ]; }
+        { names = [
+          "Gundo"
+          "commentary"
+          "mustang2"
+          "extradite"
+          "fugitive"
+          "unimpaired"
+        ]; }
         { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
       ];
 
-- 
cgit v1.2.3


From fde8731ad112d0ec8c64cf77c339c7c25664f96c Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 6 Mar 2016 01:52:23 +0100
Subject: l 2 vim: remove trailing whitespace

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

(limited to 'lass/2configs/vim.nix')

diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index fe5405bca..961238b08 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -67,7 +67,8 @@ in {
       vnoremap < <gv
       vnoremap > >gv
 
-      nmap <esc>q :buffer 
+      nmap <esc>q :buffer
+
 
       "Tabwidth
       set ts=2 sts=2 sw=2 et
-- 
cgit v1.2.3


From 2bc6d70feb5b5f2421d086009d64f3c9f840f6d4 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 7 Mar 2016 13:16:57 +0100
Subject: l 2 vim: use brogrammer theme

---
 lass/2configs/vim.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'lass/2configs/vim.nix')

diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 961238b08..7e7296c95 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -20,6 +20,15 @@ let
         sha256 = "1an941j5ckas8l3vkfhchdzjwcray16229rhv3a1d4pbxifwshi8";
       };
     };
+    brogrammer = pkgs.vimUtils.buildVimPlugin {
+      name = "brogrammer";
+      src = pkgs.fetchFromGitHub {
+        owner = "marciomazza";
+        repo = "vim-brogrammer-theme";
+        rev = "3e412d8e8909d8d89eb5a4cbe955b5bc0833a3c3";
+        sha256 = "0am1qk8ls74z5ipgf9viacayq08y9i9vd7sxxiivwgsjh2ancbv6";
+      };
+    };
   };
 
 in {
@@ -34,7 +43,7 @@ in {
       syntax on
       " TODO autoload colorscheme file
       set background=dark
-      colorscheme mustang
+      colorscheme brogrammer
       filetype off
       filetype plugin indent on
 
@@ -134,6 +143,7 @@ in {
           "extradite"
           "fugitive"
           "unimpaired"
+          "brogrammer"
         ]; }
         { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
       ];
-- 
cgit v1.2.3


From 6eedc423e3df2c1357fa23cb3fb5e67dc895a4fa Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 15 Mar 2016 15:43:24 +0100
Subject: l 2 vim: add file-line plugin

---
 lass/2configs/vim.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'lass/2configs/vim.nix')

diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 7e7296c95..b40227c61 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -29,6 +29,15 @@ let
         sha256 = "0am1qk8ls74z5ipgf9viacayq08y9i9vd7sxxiivwgsjh2ancbv6";
       };
     };
+    file-line = pkgs.vimUtils.buildVimPlugin {
+      name = "file-line";
+      src = pkgs.fetchFromGitHub {
+        owner = "bogado";
+        repo = "file-line";
+        rev = "f9ffa1879ad84ce4a386110446f395bc1795b72a";
+        sha256 = "173n47w9zd01rcyrrmm194v79xq7d1ggzr19n1lsxrqfgr2c1rvk";
+      };
+    };
   };
 
 in {
@@ -137,13 +146,14 @@ in {
       vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins;
       vimrcConfig.vam.pluginDictionaries = [
         { names = [
-          "Gundo"
+          "brogrammer"
           "commentary"
-          "mustang2"
           "extradite"
+          "file-line"
           "fugitive"
+          "Gundo"
+          "mustang2"
           "unimpaired"
-          "brogrammer"
         ]; }
         { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
       ];
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/1d000000.lock: No such file or directory (2)