From d17f73dd064ecc82f1acd08e0be9ac440feb8432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sun, 30 Jun 2019 20:14:55 +0100
Subject: [PATCH] Basic vim config ported

---
 .vimrc.nixos   |  3 +++
 nixos/home.nix | 32 ++++++++++++++++++++++++++++++++
 nixos/up.sh    |  6 ------
 3 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100755 .vimrc.nixos

diff --git a/.vimrc.nixos b/.vimrc.nixos
new file mode 100755
index 00000000..47feaefc
--- /dev/null
+++ b/.vimrc.nixos
@@ -0,0 +1,3 @@
+source ~/dev/dotfiles/.vimrc.plugins-settings
+source ~/dev/dotfiles/.vimrc.settings
+source ~/dev/dotfiles/.vimrc.keymap
diff --git a/nixos/home.nix b/nixos/home.nix
index f2df8301..c5d0cfb8 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -74,6 +74,38 @@
       shellAliases = { tmate = "tmux detach-client -E 'tmate;tmux'"; cat = "bat"; };
     };
 
+
+    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-rust"
+        "deoplete-go"
+        "vim-fugitive"
+        "vim-sensible"
+        "vim-surround"
+        "vim-airline"
+        "vim-airline-themes"
+        "vim-dirdiff"
+        "nerdtree-git-plugin"
+      ];
+    };
+
     alacritty = {
       enable = true;
       settings = {
diff --git a/nixos/up.sh b/nixos/up.sh
index 1e3c500e..9ac6c151 100755
--- a/nixos/up.sh
+++ b/nixos/up.sh
@@ -22,9 +22,6 @@ cd $DIR
 git submodule update --init --recursive
 
 #configs
-ln -vfs "$DIR/.vim" ~/.
-ln -vfs "$DIR/.ideavimrc" ~/.
-ln -vfs "$DIR/.vimrc" ~/.vimrc
 ln -vfs "$DIR/rvmrc" ~/.rvmrc
 ln -vfs "$DIR/.hyper.js" ~/.hyper.js
 ln -vfs "$DIR/.hyper_plugins" ~/.hyper_plugins
@@ -117,9 +114,6 @@ if [[ -z $NO_GO ]]; then
     echo "Installing fzf"
     ~/.fzf/install --64 --all
 fi
-echo "Installing Vim plugins"
-echo "\n" | vim +PlugClean! +qa
-echo "\n" | vim +PlugInstall! +qa
 
 GOPATH="$HOME/go"
 export GOPATH=`realpath "$GOPATH"`