From 2e71eace9c283415b554ef40d7fd2bc18b047d2b Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Thu, 24 Oct 2019 22:53:03 +0200
Subject: Pull in GNvim from unstable

---
 custom.nix  |  3 +++
 gui/vim.nix | 10 ++++++++++
 home.nix    |  3 ++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/custom.nix b/custom.nix
index ca0d53c..e489fea 100644
--- a/custom.nix
+++ b/custom.nix
@@ -37,5 +37,8 @@ in {
     pkgs = mkOption {
       type = types.attrs;
     };
+    nixpkgs-unstable = mkOption {
+      type = types.attrs;
+    };
   };
 }
diff --git a/gui/vim.nix b/gui/vim.nix
index 24ae0b2..7c68e1e 100644
--- a/gui/vim.nix
+++ b/gui/vim.nix
@@ -6,8 +6,12 @@
       neovim-qt = pkgs.neovim-qt.override {
         neovim = config.custom.pkgs.custom-neovim;
       };
+      gnvim = config.custom.nixpkgs-unstable.gnvim.override {
+        neovim = config.custom.pkgs.custom-neovim;
+      };
     in [
       neovim-qt
+      gnvim
       pkgs.xclip # required to access clipboard in nvim-gui
       pkgs.fzf   # required for all kinds of narrow-down-completion
     ];
@@ -16,7 +20,12 @@
       set title
       Guifont! Iosevka:h10
       set guifont=Iosevka:h10
+      autocmd FocusGained * :checktime
+    '';
 
+    file.".config/nvim/gnvim.vim".text = ''
+      set title
+      set guifont=Iosevka:h10
       autocmd FocusGained * :checktime
     '';
   };
@@ -25,6 +34,7 @@
     enable = true;
     shellAliases = {
       nvim-qt = "nvim-qt --no-ext-tabline ^ /dev/null > /dev/null";
+      gnvim = "bash -c \"gnvim --disable-ext-cmdline --disable-ext-tabline -- --cmd \\\"source ~/.config/nvim/gnvim.vim\\\" &> /dev/null & \"";
     };
   };
 }
diff --git a/home.nix b/home.nix
index 38d7aaa..980550e 100644
--- a/home.nix
+++ b/home.nix
@@ -1,7 +1,8 @@
 { config, pkgs, ... }:
 
 {
-  custom.pkgs = import <mypkgs> { };
+  custom.pkgs = import ~/projects/dev/pkgs/default.nix { };
+  custom.nixpkgs-unstable = import <nixpkgs-unstable> { };
 
   imports = [
   # define options custom to this config
-- 
cgit v1.2.3