From 67dad13a0b1fde0ff64c00f1e16f1cff4d4a0406 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Wed, 1 Feb 2017 19:25:05 +0100 Subject: [PATCH] split release.nix --- install.sh | 4 ++-- release-stable.nix | 7 +++++++ release-unstable.nix | 7 +++++++ release.nix | 7 ------- 4 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 release-stable.nix create mode 100644 release-unstable.nix delete mode 100644 release.nix diff --git a/install.sh b/install.sh index 205d45f..bceff6a 100755 --- a/install.sh +++ b/install.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env nix-shell +#!/usr/bin/env bash #!nix-shell -i bash -p stow -stow -d `dirname $0` -t ~ nix git x pentadactyl i3 gtk gpg mutt misc bash +$(nix-build '' -A stow --no-out-link)/bin/stow -d `dirname $0` -t ~ nix git x pentadactyl i3 gtk gpg mutt misc bash nix-build -A $(hostname -s) diff --git a/release-stable.nix b/release-stable.nix new file mode 100644 index 0000000..d661e11 --- /dev/null +++ b/release-stable.nix @@ -0,0 +1,7 @@ +let pkgs = import {config = import ./nix/.nixpkgs/config.nix;}; +in +with pkgs; +{ + dotfiles = with (import ./default.nix pkgs); [woodhouse pennyworth frumar]; + userspace = with (pkgs.lib.mapAttrs (name: paths: pkgs.buildEnv {inherit name paths;}) pkgs.hosts); [woodhouse pennyworth frumar]; +} diff --git a/release-unstable.nix b/release-unstable.nix new file mode 100644 index 0000000..380954c --- /dev/null +++ b/release-unstable.nix @@ -0,0 +1,7 @@ +let pkgs = import {config = import ./nix/.nixpkgs/config.nix;}; +in +with pkgs; +{ + dotfiles = with (import ./default.nix pkgs); [ascanius jarvis]; + userspace = with (pkgs.lib.mapAttrs (name: paths: pkgs.buildEnv {inherit name paths;}) pkgs.hosts); [ascanius jarvis]; +} diff --git a/release.nix b/release.nix deleted file mode 100644 index feca04f..0000000 --- a/release.nix +++ /dev/null @@ -1,7 +0,0 @@ -let pkgs = import {config = import ./nix/.nixpkgs/config.nix;}; -in -with pkgs; -{ - dotfiles = import ./default.nix pkgs; - userspace = pkgs.lib.mapAttrs (name: paths: pkgs.buildEnv {inherit name paths;}) pkgs.hosts; -}