From 31bf8658c3d7992d7e7f1b76d7b9b68ce19e8c3b Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sun, 3 Mar 2019 20:56:44 +0100
Subject: Update to use nvim by default

mypkgs builts on nixpkgs-unstable to get a current nvim version.
Luckily this kind of mixture of various versions is yet another
strong suit of Nix.
---
 gui/pkgs/nvim-gui.nix |  5 -----
 gui/vim.nix           | 22 ++++------------------
 home.nix              |  4 +++-
 3 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 gui/pkgs/nvim-gui.nix

diff --git a/gui/pkgs/nvim-gui.nix b/gui/pkgs/nvim-gui.nix
deleted file mode 100644
index 5cca035..0000000
--- a/gui/pkgs/nvim-gui.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, pkgs, ... }:
-
-pkgs.neovim-qt.override {
-  neovim = config.custom.pkgs.custom-neovim;
-}
diff --git a/gui/vim.nix b/gui/vim.nix
index 46ab079..b9189c1 100644
--- a/gui/vim.nix
+++ b/gui/vim.nix
@@ -2,18 +2,12 @@
 
 {
   home = {
-    # vim is configured globally for all users but common is the only GUI user
-    file.".gvimrc".text = ''
-      set guifont=Iosevka\ 10
-      set linespace=2
-      set guioptions=agi
-    '';
-
-    # nvim-qt using vim configuration
     packages = let
-      nvim-gui = import ./pkgs/nvim-gui.nix { inherit pkgs config; };
+      neovim-qt = pkgs.neovim-qt.override {
+        neovim = config.custom.pkgs.custom-neovim;
+      };
     in [
-      nvim-gui
+      neovim-qt
       pkgs.xclip # required to access clipboard in nvim-gui
     ];
 
@@ -25,14 +19,6 @@
     '';
   };
 
-  gtk = {
-    gtk3.extraCss = ''
-      window#vim-main-window {
-          background-color: #161616;
-      }
-    '';
-  };
-
   programs.fish = {
     enable = true;
     shellAliases = {
diff --git a/home.nix b/home.nix
index 15ce0ae..df2b6af 100644
--- a/home.nix
+++ b/home.nix
@@ -1,7 +1,9 @@
 { config, pkgs, ... }:
 
 {
-  custom.pkgs = import <mypkgs> { };
+  custom.pkgs = import <mypkgs> {
+    pkgs = import <nixpkgs-unstable> { };
+  };
 
   imports = [
   # define options custom to this config
-- 
cgit v1.2.3