commit 59fcc51f74233be2a92f78dd2d272e8f2eaf95de parent 3a4ef5ea17b365f7fd83ae739b127589c0d068ce Author: Vincent Demeester <vincent@sbr.pm> Date: Tue, 26 May 2020 11:07:42 +0200 Use overlays in h-m and nixpkgs in nix-shell Signed-off-by: Vincent Demeester <vincent@sbr.pm> Diffstat:
| M | home.nix | | | 5 | +++++ |
| M | overlays/unstable.nix | | | 3 | +-- |
| M | shell.nix | | | 2 | +- |
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git 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 @@ -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 @@ -1,6 +1,6 @@ let sources = import ./nix; - pkgs = sources.pkgs { }; + pkgs = sources.nixpkgs { }; in pkgs.mkShell { name = "nix-config";