diff options
| author | Alan Pearce | 2019-10-08 19:39:10 +0200 |
|---|---|---|
| committer | Alan Pearce | 2019-10-08 19:45:27 +0200 |
| commit | 6766d3f7c84ee26bfc7eeab4b1446a2fcadf4f5a (patch) | |
| tree | 78e5cd6405fa5c731b855391d3f5a51428f6e79e /user/modules | |
| parent | 1627a49a51202c8c060144925ef9d8db570fcf93 (diff) | |
| download | nixfiles-6766d3f7c84ee26bfc7eeab4b1446a2fcadf4f5a.tar.lz nixfiles-6766d3f7c84ee26bfc7eeab4b1446a2fcadf4f5a.tar.zst nixfiles-6766d3f7c84ee26bfc7eeab4b1446a2fcadf4f5a.zip | |
Use nixpkgs as unstable on darwin
Re-installing seems to have changed how nix is installed.
Diffstat (limited to 'user/modules')
| -rw-r--r-- | user/modules/emacs.nix | 2 | ||||
| -rw-r--r-- | user/modules/nixpkgs.nix | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/user/modules/emacs.nix b/user/modules/emacs.nix index 17c0bf92..091c588c 100644 --- a/user/modules/emacs.nix +++ b/user/modules/emacs.nix @@ -3,7 +3,7 @@ let inherit (pkgs) stdenv; - pkgsUnstable = if stdenv.isDarwin then import <nixpkgs-unstable> {} else import <nixos-unstable> {}; + pkgsUnstable = if stdenv.isDarwin then import <nixpkgs> {} else import <nixos-unstable> {}; editorScript = pkgs.writeScriptBin "edit" '' #!${pkgs.runtimeShell} diff --git a/user/modules/nixpkgs.nix b/user/modules/nixpkgs.nix index e0952c9c..b89579e1 100644 --- a/user/modules/nixpkgs.nix +++ b/user/modules/nixpkgs.nix @@ -6,9 +6,7 @@ ]; nixpkgs.overlays = [ (self: super: { - unstable = import <nixpkgs-unstable> { - config = config.nixpkgs.config; - }; + unstable = self; }) ]; } |