From 79ce1dc6939913657f392a05297a23e31c1e25b0 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@gmail.com>
Date: Sun, 22 Apr 2018 13:17:30 +0200
Subject: refactor(packages): Pin unstable channel in packages.nix

Pins the unstable Nix channel to a specific commit and uses package
overrides to move select packages from that channel into the system
Nix packages.
---
 packages.nix | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/packages.nix b/packages.nix
index 890f10f28c..d5bb576512 100644
--- a/packages.nix
+++ b/packages.nix
@@ -4,13 +4,30 @@
 
 { config, pkgs, ... }:
 
-let unstable = import <nixos-unstable> { config.allowUnfree = true; };
+let
+  # Channels last updated: 2014-04-22
+
+
+  # Certain packages from unstable are required in my daily setup. To
+  # get access to them, they are hand-picked from the unstable channel
+  # and set as overrides on the system package set.
+  unstable = import (pkgs.fetchFromGitHub {
+    owner  = "NixOS";
+    repo   = "nixpkgs-channels";
+    rev    = "6c064e6b1f34a8416f990db0cc617a7195f71588";
+    sha256 = "1rqzh475xn43phagrr30lb0fd292c1s8as53irihsnd5wcksnbyd";
+  }) { config.allowUnfree = true; };
 in {
   # Configure the Nix package manager
   nixpkgs = {
     config.allowUnfree = true;
     config.packageOverrides = oldPkgs: oldPkgs // {
       wallpapers = import ./pkgs/wallpapers.nix;
+      pulseaudio-ctl = import pkgs/pulseaudio-ctl.nix;
+
+      kontemplate = unstable.kontemplate;
+      mq-cli = unstable.mq-cli;
+
     };
   };
 
@@ -40,18 +57,22 @@ in {
     jetbrains.idea-ultimate
     jq
     kubernetes
+    kontemplate
     lispPackages.quicklisp
     lxappearance-gtk3
     manpages
     maven
+    mq-cli
     nixops
     numix-gtk-theme
     numix-icon-theme
+    numix-cursor-theme
     openjdk
     openssl
     openssl.dev
     pass
     pavucontrol
+    pulseaudio-ctl
     pkgconfig
     qjackctl
     ripgrep
@@ -77,13 +98,5 @@ in {
     haskellPackages.intero
     haskellPackages.stylish-haskell
     haskellPackages.yesod-bin
-
-    # Unstable packages:
-    unstable.numix-cursor-theme
-    unstable.kontemplate
-    unstable.mq-cli
-
-    # Custom packages:
-    (import pkgs/pulseaudio-ctl.nix)
   ];
 }
-- 
cgit 1.4.1