From f092366d0a5b9112b6defe7402bebde879bb3f5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sat, 24 Aug 2019 18:53:12 +0100
Subject: [PATCH] Use relative paths for vim configs

---
 .vimrc.nixos   | 6 +++---
 nixos/home.nix | 3 +++
 nixos/vim.nix  | 8 ++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.vimrc.nixos b/.vimrc.nixos
index 01f35257..47feaefc 100755
--- a/.vimrc.nixos
+++ b/.vimrc.nixos
@@ -1,3 +1,3 @@
-source /home/cyryl/dev/dotfiles/.vimrc.plugins-settings
-source /home/cyryl/dev/dotfiles/.vimrc.settings
-source /home/cyryl/dev/dotfiles/.vimrc.keymap
+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 5bcc03cc..4b13e490 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -27,11 +27,14 @@ in
       mono calcurse calibre fbreader file python37Packages.binwalk-full
       slack discord obs-studio kpcli
     ];
+
     home.sessionVariables = {
       TERMINAL="termite";
       CM_LAUNCHER="rofi";
     };
 
+    home.file.".vimrc".source = ~/dev/dotfiles/.vimrc.nixos;
+
     imports = [
       ./programs/tmux.nix
       ./programs/zsh.nix
diff --git a/nixos/vim.nix b/nixos/vim.nix
index c356f4d9..d606549d 100644
--- a/nixos/vim.nix
+++ b/nixos/vim.nix
@@ -4,9 +4,13 @@
     neovim.override {
       vimAlias = true;
       configure = {
-        customRC = builtins.readFile /home/cyryl/dev/dotfiles/.vimrc.nixos;
+        customRC = ''
+          if filereadable($HOME . "/.vimrc")
+            source ~/.vimrc
+          endif
+        '';
 
-        vam.knownPlugins = vimPlugins;
+        vam.knownPlugins = unstable.vimPlugins;
         vam.pluginDictionaries = [
           { names = [
             "ack-vim"