From 2098ae5b0f44949118f64030e6cfb7fc3664c075 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sat, 19 May 2018 21:07:09 +0200
Subject: Add Neovim-Qt as vim frontend

Default CLI editor is currently still Vim, mainly because cs-exact
doesn't work correctly in Neovim. Neovim-Qt is preferable to GVim as the
latter has ugly pixel glitches on my system (maybe related to
proprietary NVidia drivers? This was not a problem on the x220)

The neovim-qt derivation is built using a custom nvim derivation which
in turn uses the global vim configuration managed in /etc/nixos/pkgs/vim.
---
 gui/pkgs/nvim-gui.nix | 10 ++++++++++
 gui/vim.nix           | 11 +++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 gui/pkgs/nvim-gui.nix

(limited to 'gui')

diff --git a/gui/pkgs/nvim-gui.nix b/gui/pkgs/nvim-gui.nix
new file mode 100644
index 0000000..7f0ba7e
--- /dev/null
+++ b/gui/pkgs/nvim-gui.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+let
+  custom_nvim = pkgs.neovim.override {
+    vimAlias  = false;
+    configure = (import /etc/nixos/pkgs/vim/custom.nix { pkgs = pkgs; });
+  };
+in pkgs.neovim-qt.override {
+  neovim = custom_nvim;
+}
diff --git a/gui/vim.nix b/gui/vim.nix
index 95873ce..cc2d906 100644
--- a/gui/vim.nix
+++ b/gui/vim.nix
@@ -8,6 +8,17 @@
       set linespace=2
       set guioptions=agi
     '';
+
+    # nvim-qt using vim configuration
+    packages = let
+      nvim-gui = import ./pkgs/nvim-gui.nix pkgs;
+    in [
+      nvim-gui
+    ];
+
+    file.".config/nvim/ginit.vim".text = ''
+      Guifont! Iosevka:h10
+    '';
   };
 
   gtk = {
-- 
cgit v1.2.3