From 88c0552048538ff711f11184625755e38cdf47e9 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sat, 14 Mar 2020 13:43:13 +0100
Subject: [PATCH] Drop a bit of python2

---
 pkgs/default.nix      | 3 ++-
 pkgs/nvim/default.nix | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index b9c84edc..c0deb7a2 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -51,6 +51,7 @@ in rec {
   neovim = unstable.neovim.override {
     vimAlias = true;
     withPython3 = true;
+    withPython = false;
   };
 
   home-neovim = (import ./nvim) neovim;
@@ -69,7 +70,7 @@ in rec {
     inherit niv;
     inherit (pkgs.gitAndTools) git-annex;
     inherit (pkgs.rxvt_unicode) terminfo;
-    inherit (pkgs.pythonPackages) qrcode;
+    inherit (pkgs.python3Packages) qrcode;
     inherit (pkgs)
       git-crypt htop tree pwgen borgbackup inotifyTools direnv socat nmap ncdu
       tcpdump tmux tig exa fzf ag fd bat ripgrep ranger pass sshuttle vnstat;
diff --git a/pkgs/nvim/default.nix b/pkgs/nvim/default.nix
index 2f8df5b2..fc9dd33a 100644
--- a/pkgs/nvim/default.nix
+++ b/pkgs/nvim/default.nix
@@ -4,8 +4,6 @@ n.override (let
   inherit (import ../../lib) sources colors;
   tabnine = sources.tabnine-vim;
 in {
-  vimAlias = true;
-  withPython3 = true;
   configure = {
     customRC = ''
       set rtp+=${tabnine}