all repos — nixfiles @ efc4a4f62392ee31dbd74c008f5de7162d8add20

System and user configuration, managed by nix and home-manager

Enable cross-platform use of unstable channel

Alan Pearce
commit

efc4a4f62392ee31dbd74c008f5de7162d8add20

parent

bcb93216495a987dffd8e1626b0704a3ef5e7e29

2 files changed, 6 insertions(+), 2 deletions(-)

jump to
M user/settings/nixpkgs.nixuser/settings/nixpkgs.nix
@@ -1,5 +1,9 @@
{ config, pkgs, ... }: +let + inherit (pkgs) stdenv; + unstablePkgs = if stdenv.isDarwin then import <nixpkgs-unstable> {} else import <nixos-unstable> {}; +in { imports = [ ./nix.nix
@@ -8,6 +12,7 @@ nixpkgs.overlays = [
(self: super: { firefox-bin-unwrapped = super.firefox-bin-unwrapped.override { systemLocale = "en-GB"; }; firefox-devedition-bin-unwrapped = super.firefox-devedition-bin-unwrapped.override { systemLocale = "en-GB"; }; + unstable = unstablePkgs; }) ]; }
M user/settings/satoshipay.nixuser/settings/satoshipay.nix
@@ -2,7 +2,6 @@ { config, lib, pkgs, ... }:
let inherit (pkgs) stdenv; - unstablePkgs = if !stdenv.isDarwin then import <nixos-unstable> {} else {}; spGitConfig = { user.email = "alan@satoshipay.io"; };
@@ -37,7 +36,7 @@ [
docker_compose redis-desktop-manager - unstablePkgs.ripcord + unstable.ripcord robo3t ]));