From c9d98bc9ead5f29c76a67538af291d1a0303fa16 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Tue, 31 Jan 2017 18:35:39 +0100
Subject: [PATCH] add userspace to release.nix

---
 nix/.nixpkgs/config.nix | 4 ++--
 release.nix             | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nix/.nixpkgs/config.nix b/nix/.nixpkgs/config.nix
index 43abe28..f5e44ed 100644
--- a/nix/.nixpkgs/config.nix
+++ b/nix/.nixpkgs/config.nix
@@ -129,7 +129,7 @@
         neomutt
         torbrowser
         chromium
-        firefox-bin
+        #firefox-bin
         gimp
         tdesktop
         #hexchat
@@ -204,7 +204,7 @@
       jarvis = with envs; [apps code de games envs.js pdf nix media gcc misc scripts];
       woodhouse = with envs; [de media misc kodi chromium spotify];
       pennyworth = [];
-      frumar = with envs; [bup git-annex rtorrent pyroscope];
+      frumar = with envs; [bup gitAndTools.git-annex rtorrent pyroscope];
     };
     pandocdeps = (pkgs.texlive.combine {
       inherit (pkgs.texlive)
diff --git a/release.nix b/release.nix
index 3ce0ecf..feca04f 100644
--- a/release.nix
+++ b/release.nix
@@ -1,4 +1,7 @@
-with (import <nixpkgs> {});
+let pkgs = import <nixpkgs> {config = import ./nix/.nixpkgs/config.nix;};
+in
+with pkgs;
 {
-	dotfiles = import ./default.nix;
+	dotfiles = import ./default.nix pkgs;
+	userspace = pkgs.lib.mapAttrs (name: paths: pkgs.buildEnv {inherit name paths;}) pkgs.hosts;
 }