From 9d82e6dcdda0e0ab31c15e5ef5b685017ac2bb02 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 22 Feb 2020 16:11:48 +0100
Subject: [PATCH] Don't use nixpkgs-master anymore

---
 programs/neovim/default.nix | 27 ++++++++++++---------------
 programs/sway/waybar.nix    |  5 +----
 shells/accentor-api.nix     |  3 +--
 shells/dodona.nix           |  3 +--
 shells/ledger.nix           |  3 +--
 5 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/programs/neovim/default.nix b/programs/neovim/default.nix
index 8bac2261..6acf425e 100644
--- a/programs/neovim/default.nix
+++ b/programs/neovim/default.nix
@@ -1,17 +1,14 @@
 with import <nixpkgs> {};
 
-let
-  nixpkgs-master = import <nixpkgs-master> {};
-in
-  {
-    home-manager.users.charlotte = { pkgs, ... }: {
-      nixpkgs.overlays = [
-        (self: super: {
-          neovim = nixpkgs-master.neovim.override {
-            configure = (import ./base.nix { pkgs = self; }) ;
-          };
-        })
-      ];
-      home.packages = [ pkgs.neovim ];
-    };
-  }
+{
+  home-manager.users.charlotte = { pkgs, ... }: {
+    nixpkgs.overlays = [
+      (self: super: {
+        neovim = super.neovim.override {
+          configure = (import ./base.nix { pkgs = self; }) ;
+        };
+      })
+    ];
+    home.packages = [ pkgs.neovim ];
+  };
+}
diff --git a/programs/sway/waybar.nix b/programs/sway/waybar.nix
index a2daf255..8276da4b 100644
--- a/programs/sway/waybar.nix
+++ b/programs/sway/waybar.nix
@@ -1,12 +1,9 @@
 { 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; }; })
+        (self: super: { waybar = super.waybar.override { pulseSupport = true; mpdSupport = false; }; })
       ];
     xdg.configFile = {
       "waybar/config".text = ''
diff --git a/shells/accentor-api.nix b/shells/accentor-api.nix
index 77e84257..2b1c5141 100644
--- a/shells/accentor-api.nix
+++ b/shells/accentor-api.nix
@@ -1,6 +1,5 @@
 let
   pkgs = import <nixpkgs> {};
-  nixpkgs-master = import <nixpkgs-master> {};
   baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
 in
   pkgs.mkShell {
@@ -10,7 +9,7 @@ in
       ruby_2_7
       taglib
       zlib
-      (nixpkgs-master.neovim.override {
+      (neovim.override {
         configure = {
           customRC = baseVimConfig.customRC + ''
             " Required for operations modifying multiple buffers like rename
diff --git a/shells/dodona.nix b/shells/dodona.nix
index 53a30e25..6f2fbdd4 100644
--- a/shells/dodona.nix
+++ b/shells/dodona.nix
@@ -1,6 +1,5 @@
 let
   pkgs = import <nixpkgs> {};
-  nixpkgs-master = import <nixpkgs-master> {};
   baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
   nodePackages = import ../packages/node/default.nix { inherit pkgs; };
 in
@@ -20,7 +19,7 @@ in
         child=$!
         wait $child
       '')
-      (nixpkgs-master.neovim.override {
+      (neovim.override {
         configure = {
           customRC = baseVimConfig.customRC + ''
             " Required for operations modifying multiple buffers like rename
diff --git a/shells/ledger.nix b/shells/ledger.nix
index a9268849..f24fd80a 100644
--- a/shells/ledger.nix
+++ b/shells/ledger.nix
@@ -1,10 +1,9 @@
 let
   pkgs = import <nixpkgs> {};
-  nixpkgs-master = import <nixpkgs-master> {};
   baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
 in
   pkgs.mkShell {
-    buildInputs = with nixpkgs-master; [
+    buildInputs = with pkgs; [
       (neovim.override {
         configure = {
           customRC = baseVimConfig.customRC;