From f23200c4609b16a5a2a2b0472020593be79ebef0 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Fri, 21 Feb 2020 14:04:02 +0100
Subject: [PATCH] Temporarily use some packages from nixpkgs-master

---
 programs/direnv/shells/ledger.nix |  3 ++-
 programs/direnv/shells/nix.nix    |  9 +--------
 programs/neovim/default.nix       | 27 +++++++++++++++------------
 programs/sway/default.nix         |  3 ---
 programs/sway/waybar.nix          |  6 ++++++
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/programs/direnv/shells/ledger.nix b/programs/direnv/shells/ledger.nix
index 628b5bfe..8ad6474c 100644
--- a/programs/direnv/shells/ledger.nix
+++ b/programs/direnv/shells/ledger.nix
@@ -1,9 +1,10 @@
 let
   pkgs = import <nixpkgs> {};
+  nixpkgs-master = import <nixpkgs-master> {};
   baseVimConfig = import ./vim-base.nix { inherit pkgs; };
 in
   pkgs.mkShell {
-    buildInputs = with pkgs; [
+    buildInputs = with nixpkgs-master; [
       (neovim.override {
         configure = {
           customRC = baseVimConfig.customRC;
diff --git a/programs/direnv/shells/nix.nix b/programs/direnv/shells/nix.nix
index efd2cffa..21211c76 100644
--- a/programs/direnv/shells/nix.nix
+++ b/programs/direnv/shells/nix.nix
@@ -2,12 +2,5 @@ let
   pkgs = import <nixpkgs> {};
 in
   pkgs.mkShell {
-    buildInputs = with pkgs; [
-      (neovim.override {
-        configure = {
-          customRC = baseVimConfig.customRC;
-          vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []);
-        };
-      })
-    ];
+    buildInputs = with pkgs; [];
   }
diff --git a/programs/neovim/default.nix b/programs/neovim/default.nix
index 9739c9e2..12d7dfde 100644
--- a/programs/neovim/default.nix
+++ b/programs/neovim/default.nix
@@ -1,14 +1,17 @@
 with import <nixpkgs> {};
 
-{
-  home-manager.users.charlotte = { pkgs, ... }: {
-    nixpkgs.overlays = [
-      (self: super: {
-        neovim = super.neovim.override {
-          configure = (import ../direnv/shells/vim-base.nix { pkgs = self; }) ;
-        };
-      })
-    ];
-    home.packages = [ pkgs.neovim ];
-  };
-}
+let
+  nixpkgs-master = import <nixpkgs-master> {};
+in
+  {
+    home-manager.users.charlotte = { pkgs, ... }: {
+      nixpkgs.overlays = [
+        (self: super: {
+          neovim = nixpkgs-master.neovim.override {
+            configure = (import ../direnv/shells/vim-base.nix { pkgs = self; }) ;
+          };
+        })
+      ];
+      home.packages = [ pkgs.neovim ];
+    };
+  }
diff --git a/programs/sway/default.nix b/programs/sway/default.nix
index e2c996c0..b8495979 100644
--- a/programs/sway/default.nix
+++ b/programs/sway/default.nix
@@ -207,9 +207,6 @@ in
     };
 
     home-manager.users.charlotte = { pkgs, ... }: {
-      nixpkgs.overlays = [
-        (self: super: { waybar = super.waybar.override { pulseSupport = true; mpdSupport = false; }; })
-      ];
       home.packages = [ color-picker ];
       xdg.configFile."sway/config".text = ''
         # Config for sway
diff --git a/programs/sway/waybar.nix b/programs/sway/waybar.nix
index 2d018c8c..a2daf255 100644
--- a/programs/sway/waybar.nix
+++ b/programs/sway/waybar.nix
@@ -1,7 +1,13 @@
 { pkgs, ... }:
 
+let
+  nixpkgs-master = import <nixpkgs-master> {};
+in
 {
   home-manager.users.charlotte = { pkgs, ... }: {
+      nixpkgs.overlays = [
+        (self: super: { waybar = nixpkgs-master.waybar.override { pulseSupport = true; mpdSupport = false; }; })
+      ];
     xdg.configFile = {
       "waybar/config".text = ''
         {