~vdemeester/public-inbox

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch

[PATCH] Use overlays in h-m and nixpkgs in nix-shell

Details
Message ID
<20200526090742.458250-1-vincent@sbr.pm>
DKIM signature
missing
Download raw message
Patch: +7 -3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 home.nix              | 5 +++++
 overlays/unstable.nix | 3 +--
 shell.nix             | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/home.nix b/home.nix
index 14b11314..5fe50fbe 100644
--- a/home.nix
+++ b/home.nix
@@ -12,6 +12,11 @@ in
      path = "${home-manager}";
    };
  };
  nixpkgs.overlays = [
    (import ./overlays/sbr.nix)
    (import ./overlays/unstable.nix)
    (import ./nix).emacs
  ];
  imports = [
    # Default profile with default configuration
    ./modules/module-list.nix
diff --git a/overlays/unstable.nix b/overlays/unstable.nix
index 872344c0..793bb40d 100644
--- a/overlays/unstable.nix
+++ b/overlays/unstable.nix
@@ -1,7 +1,6 @@
_: _:
let
  unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
  unstable = import unstableTarball { overlays = [ ]; };
  unstable = (import ./nix).pkgs-unstable { };
in
{
  inherit (unstable)
diff --git a/shell.nix b/shell.nix
index 1c9f75f8..7201e0ef 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,6 +1,6 @@
let
  sources = import ./nix;
  pkgs = sources.pkgs { };
  pkgs = sources.nixpkgs { };
in
pkgs.mkShell {
  name = "nix-config";
-- 
2.26.2
Reply to thread Export thread (mbox)