From 295ef2315d2c59bcbfe37b72b96bfd7cacebe6f1 Mon Sep 17 00:00:00 2001
From: Felix Wittwer <dev@felixwittwer.de>
Date: Sat, 8 May 2021 21:32:13 +0200
Subject: [PATCH] Fix fzf config in vim

---
 entropy/.vimrc                   | 10 ++++++----
 entropy/nixos/modules/python.nix |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/entropy/.vimrc b/entropy/.vimrc
index 6f5dcfd..3dc4890 100644
--- a/entropy/.vimrc
+++ b/entropy/.vimrc
@@ -18,22 +18,24 @@ Plug 'morhetz/gruvbox'
 " Any valid git URL is allowed
 Plug 'https://github.com/scrooloose/nerdcommenter.git'
 
-" On-demand loading
+" On-demand loading for languages
 Plug 'rust-lang/rust.vim', { 'for': 'rust' }
+Plug 'cespare/vim-toml', { 'for': 'toml' }
+Plug 'keith/swift.vim', { 'for': 'swift' }
 
 Plug 'vim-syntastic/syntastic'
-Plug 'cespare/vim-toml', { 'for': 'toml' }
 Plug 'vim-airline/vim-airline'
 Plug 'tpope/vim-fugitive'
 Plug 'airblade/vim-gitgutter'
-Plug 'keith/swift.vim', { 'for': 'swift' }
 Plug 'justinmk/vim-sneak'
 Plug 'lervag/vimtex'
 Plug 'editorconfig/editorconfig-vim'
 Plug 'LnL7/vim-nix'
+Plug 'preservim/nerdtree'
 
 " Plugin outside ~/.vim/plugged with post-update hook
-Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+Plug 'junegunn/fzf.vim'
 
 " ale language server client
 Plug 'dense-analysis/ale'
diff --git a/entropy/nixos/modules/python.nix b/entropy/nixos/modules/python.nix
index 4886b2e..1592545 100644
--- a/entropy/nixos/modules/python.nix
+++ b/entropy/nixos/modules/python.nix
@@ -10,6 +10,7 @@
       numpy
       pylint
       # rpy2
+      jupyter
     ]; 
     python-with-my-packages = python3.withPackages my-python-packages;
   in