Restructure vim configuration

* Use integrated plugin manager
* Switch to nvim instead of continuing to maintain a config for both vims

9 files changed, 61 insertions, 71 deletions

diff --git a/default.nix b/default.nix
index ff1439b..1552309 100644
--- a/default.nix
+++ b/default.nix
@@ -1,12 +1,9 @@
-{ system ? builtins.currentSystem }:
+{ system ? builtins.currentSystem, pkgs ? import <nixpkgs> { inherit system; }, ... }:
 
 let
-  pkgs = import <nixpkgs> { inherit system; };
-
   callPackage = pkgs.lib.callPackageWith (pkgs // custom);
 
   custom = {
-    custom-vim    = callPackage ./pkgs/custom-vim    { };
     custom-neovim = callPackage ./pkgs/custom-neovim { };
 
     oomox-gtk-theme            = t : callPackage ./pkgs/oomox-gtk-theme { theme = t; };
diff --git a/pkgs/custom-vim/asset/rc.vim b/pkgs/custom-neovim/asset/rc.vim
index eebe6b4..eebe6b4 100644
--- a/pkgs/custom-vim/asset/rc.vim
+++ b/pkgs/custom-neovim/asset/rc.vim
diff --git a/pkgs/custom-vim/asset/vim-color-akr/autoload/airline/themes/akr.vim b/pkgs/custom-neovim/asset/vim-color-akr/autoload/airline/themes/akr.vim
index 1b847c4..1b847c4 100644
--- a/pkgs/custom-vim/asset/vim-color-akr/autoload/airline/themes/akr.vim
+++ b/pkgs/custom-neovim/asset/vim-color-akr/autoload/airline/themes/akr.vim
diff --git a/pkgs/custom-vim/asset/vim-color-akr/colors/akr.vim b/pkgs/custom-neovim/asset/vim-color-akr/colors/akr.vim
index 4ffd2ca..4ffd2ca 100644
--- a/pkgs/custom-vim/asset/vim-color-akr/colors/akr.vim
+++ b/pkgs/custom-neovim/asset/vim-color-akr/colors/akr.vim
diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix
index 34e2fcd..8568c08 100644
--- a/pkgs/custom-neovim/default.nix
+++ b/pkgs/custom-neovim/default.nix
@@ -1,6 +1,51 @@
 { pkgs, ... }:
 
-pkgs.neovim.override {
-  vimAlias  = false;
-  configure = import ../custom-vim/custom.nix { pkgs = pkgs; };
+let
+  plugins = pkgs.callPackage ./plugins.nix {};
+
+in pkgs.neovim.override {
+  vimAlias  = true;
+  configure = {
+    customRC = builtins.readFile ./asset/rc.vim;
+
+    packages.myVimPackage = with pkgs.vimPlugins // plugins; {
+      start = [
+      # UI enhancements
+        airline
+        goyo
+
+      # autocomplete
+        LanguageClient-neovim
+        deoplete-nvim
+
+      # load project specific config
+        vim-localvimrc
+
+      # colors, syntax highlighting
+        vim-color-akr
+        vim-polyglot
+        vim-addon-nix
+
+      # file, buffer management
+        ctrlp
+        vim-counterpoint
+        vim-signature
+
+      # undo history tree
+        vim-mundo
+
+      # editing enhancements
+        vim-unimpaired
+        vim-wordmotion
+        vim-autoformat
+        vim-sandwich
+        far
+
+      # git integration
+        vim-gitgutter
+        gina
+
+      ];
+    };
+  };
 }
diff --git a/pkgs/custom-vim/plugins.nix b/pkgs/custom-neovim/plugins.nix
index fb22acb..9ff92f2 100644
--- a/pkgs/custom-vim/plugins.nix
+++ b/pkgs/custom-neovim/plugins.nix
@@ -4,7 +4,7 @@ let
   buildVimPlugin = pkgs.vimUtils.buildVimPluginFrom2Nix;
 in {
 
-  "vim-unimpaired" = buildVimPlugin {
+  vim-unimpaired = buildVimPlugin {
     name = "vim-unimpaired";
     src  = fetchgit {
       url    = "https://github.com/tpope/vim-unimpaired";
@@ -13,7 +13,7 @@ in {
     };
   };
 
-  "vim-counterpoint" = buildVimPlugin {
+  vim-counterpoint = buildVimPlugin {
     name = "vim-counterpoint";
     src  = fetchgit {
       url    = "https://github.com/jpetrie/vim-counterpoint";
@@ -22,7 +22,7 @@ in {
     };
   };
 
-  "vim-mundo" = buildVimPlugin {
+  vim-mundo = buildVimPlugin {
     name = "vim-mundo";
     src  = fetchgit {
       url    = "https://github.com/simnalamburt/vim-mundo";
@@ -31,7 +31,7 @@ in {
     };
   };
 
-  "vim-toggle-ui-elements" = buildVimPlugin {
+  vim-toggle-ui-elements = buildVimPlugin {
     name = "vim-toggle-ui-elements";
     src  = fetchgit {
       url    = "https://github.com/muellan/vim-toggle-ui-elements";
@@ -40,8 +40,8 @@ in {
     };
   };
 
-  "vim-far" = buildVimPlugin {
-    name = "vim-far";
+  far = buildVimPlugin {
+    name = "far";
     src = fetchgit {
       url    = "https://github.com/brooth/far.vim.git";
       rev    = "0382845a87abd89d169a2fd8eb88c5a2241d496c";
@@ -49,7 +49,7 @@ in {
     };
   };
 
-  "vim-wordmotion" = buildVimPlugin {
+  vim-wordmotion = buildVimPlugin {
     name = "vim-wordmotion";
     src = fetchgit {
       url    = "https://github.com/chaoren/vim-wordmotion.git";
@@ -58,8 +58,8 @@ in {
     };
   };
 
-  "vim-gina" = buildVimPlugin {
-    name = "vim-gina";
+  gina = buildVimPlugin {
+    name = "gina";
     src = fetchgit {
       url    = "https://github.com/lambdalisue/gina.vim.git";
       rev    = "v1.0.0";
@@ -67,7 +67,7 @@ in {
     };
   };
 
-  "vim-sandwich" = buildVimPlugin {
+  vim-sandwich = buildVimPlugin {
     name = "vim-sandwich";
     src = fetchgit {
       url    = "https://github.com/machakann/vim-sandwich.git";
@@ -76,7 +76,7 @@ in {
     };
   };
 
-  "vim-color-akr" = buildVimPlugin {
+  vim-color-akr = buildVimPlugin {
     name = "vim-color-akr";
     src  = ./asset/vim-color-akr;
   };
diff --git a/pkgs/custom-vim/custom.nix b/pkgs/custom-vim/custom.nix
deleted file mode 100644
index 4c0c72c..0000000
--- a/pkgs/custom-vim/custom.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ pkgs }:
-
-let
-  vimrc   = builtins.readFile ./asset/rc.vim;
-  plugins = pkgs.callPackage ./plugins.nix {};
-in
-{
-  vam = {
-    knownPlugins = pkgs.vimPlugins // plugins;
-    pluginDictionaries = [
-      { names = [
-      # UI enhancements
-        "vim-airline"
-        "goyo"
-        "vim-toggle-ui-elements"
-      # load project specific config
-        "vim-localvimrc"
-      # colors, syntax highlighting
-        "vim-color-akr"
-        "vim-polyglot"
-        "vim-addon-nix"
-      # file, buffer management
-        "ctrlp"
-        "vim-counterpoint"
-        "vim-signature"
-      # undo history tree
-        "vim-mundo"
-      # editing enhancements
-        "vim-wordmotion"
-        "vim-autoformat"
-        "vim-sandwich"
-        "vim-unimpaired"
-        "vim-far"
-      # git integration
-        "fugitive"
-        "vim-gitgutter"
-        "vim-gina"
-      ];}
-    ];
-  };
-  customRC = vimrc;
-}
diff --git a/pkgs/custom-vim/default.nix b/pkgs/custom-vim/default.nix
deleted file mode 100644
index 7faa9c1..0000000
--- a/pkgs/custom-vim/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-
-let
-  custom-vim = pkgs.vim_configurable.customize {
-    name        = "vim";
-    vimrcConfig = (import ./custom.nix { pkgs = pkgs; });
-  };
-in pkgs.lib.overrideDerivation custom-vim ( o: {
-    gui = "gtk3";
-} )
diff --git a/web/tree/info.md b/web/tree/info.md
index 9e6df3e..cd1d773 100644
--- a/web/tree/info.md
+++ b/web/tree/info.md
@@ -31,7 +31,7 @@ Projects of my own:
 
 Configurations of my own:
 
-* [custom-vim](https://code.kummerlaender.eu/pkgs/tree/pkgs/custom-vim)
+* [custom-neovim](https://code.kummerlaender.eu/pkgs/tree/pkgs/custom-neovim)
 
 Projects neither of my own nor of my configuration: