From 203540cdcf5160ced08344cd1121aec4195d07fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sat, 24 Aug 2019 18:29:29 +0100
Subject: [PATCH] Do not use home manager to manage vim

---
 .vimrc.nixos           |  6 +++---
 nixos/common.nix       |  4 +++-
 nixos/home.nix         |  1 -
 nixos/programs/vim.nix | 33 ---------------------------------
 nixos/vim.nix          | 41 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 47 insertions(+), 38 deletions(-)
 delete mode 100644 nixos/programs/vim.nix
 create mode 100644 nixos/vim.nix

diff --git a/.vimrc.nixos b/.vimrc.nixos
index 47feaefc..01f35257 100755
--- a/.vimrc.nixos
+++ b/.vimrc.nixos
@@ -1,3 +1,3 @@
-source ~/dev/dotfiles/.vimrc.plugins-settings
-source ~/dev/dotfiles/.vimrc.settings
-source ~/dev/dotfiles/.vimrc.keymap
+source /home/cyryl/dev/dotfiles/.vimrc.plugins-settings
+source /home/cyryl/dev/dotfiles/.vimrc.settings
+source /home/cyryl/dev/dotfiles/.vimrc.keymap
diff --git a/nixos/common.nix b/nixos/common.nix
index 0e1ee78b..2c8ad0af 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -12,6 +12,7 @@ in
         ./gsconnect.nix
         ./common-hardware.nix
         ./common-services.nix
+        ./vim.nix
       ];
 
       nixpkgs.config = {
@@ -27,7 +28,8 @@ in
       };
 
       environment.systemPackages = with pkgs; [
-        wget git gnupg curl tmux python36Packages.glances vim htop atop firefox home-manager alacritty pciutils powertop
+        wget git gnupg curl tmux python36Packages.glances htop atop firefox home-manager alacritty pciutils powertop
+
       ];
 
       i18n.defaultLocale = "en_GB.UTF-8";
diff --git a/nixos/home.nix b/nixos/home.nix
index f2012f5d..5bcc03cc 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -35,7 +35,6 @@ in
     imports = [
       ./programs/tmux.nix
       ./programs/zsh.nix
-      ./programs/vim.nix
       ./programs/termite.nix
       ./programs/git.nix
       ./user-xsession.nix
diff --git a/nixos/programs/vim.nix b/nixos/programs/vim.nix
deleted file mode 100644
index f152f549..00000000
--- a/nixos/programs/vim.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ config, pkgs, ... }:
-{
-  programs.vim = {
-    enable = true;
-    extraConfig = builtins.readFile ~/dev/dotfiles/.vimrc.nixos;
-    plugins = [
-      "vim-gitgutter"
-      "vim-toml"
-      "vim-autoformat"
-      "editorconfig-vim"
-      "tabular"
-      "vim-colors-solarized"
-      "fzf-vim"
-      "ctrlp-vim"
-      "vim-nix"
-      "vim-startify"
-      "ack-vim"
-      "vim-markdown"
-      "rust-vim"
-      "nerdtree"
-      "vim-dispatch"
-      "deoplete-nvim"
-      "deoplete-go"
-      "vim-fugitive"
-      "vim-sensible"
-      "vim-surround"
-      "vim-airline"
-      "vim-airline-themes"
-      "vim-dirdiff"
-      "nerdtree-git-plugin"
-    ];
-  };
-}
diff --git a/nixos/vim.nix b/nixos/vim.nix
new file mode 100644
index 00000000..c356f4d9
--- /dev/null
+++ b/nixos/vim.nix
@@ -0,0 +1,41 @@
+{ config, pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [(
+    neovim.override {
+      vimAlias = true;
+      configure = {
+        customRC = builtins.readFile /home/cyryl/dev/dotfiles/.vimrc.nixos;
+
+        vam.knownPlugins = vimPlugins;
+        vam.pluginDictionaries = [
+          { names = [
+            "ack-vim"
+            "ctrlp-vim"
+            "editorconfig-vim"
+            "fzf-vim"
+            "nerdtree"
+            "nerdtree-git-plugin"
+            "rust-vim"
+            "tabular"
+            "vim-airline"
+            "vim-airline-themes"
+            "vim-autoformat"
+            "vim-colors-solarized"
+            "vim-dirdiff"
+            "vim-dispatch"
+            "vim-fugitive"
+            "vim-gitgutter"
+            "vim-markdown"
+            "vim-nix"
+            "vim-sensible"
+            "vim-startify"
+            "vim-surround"
+            "vim-toml"
+          ];
+        }
+      ];
+
+    };})
+  ];
+
+}