summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--nix/.config/nixpkgs/config.nix6
-rw-r--r--nix/.config/nixpkgs/emacs.nix1
2 files changed, 5 insertions, 2 deletions
diff --git a/nix/.config/nixpkgs/config.nix b/nix/.config/nixpkgs/config.nix
index aa0112ec..ea6ae1aa 100644
--- a/nix/.config/nixpkgs/config.nix
+++ b/nix/.config/nixpkgs/config.nix
@@ -1,11 +1,15 @@
 { pkgs }: {
   packageOverrides = super: let
     self = super.pkgs;
+    pkgsUnstable = if super.pkgs.stdenv.isLinux
+      then import <nixos-unstable> {}
+      else super.pkgs;
+
   in with self; rec {
     myEmacs = super.callPackage ./emacs.nix {
       emacs = if stdenv.isDarwin then emacs25Macport else emacs;
     };
-    nodejs = pkgs.nodejs-8_x;
+    nodejs = pkgsUnstable.nodejs-8_x;
 
     zr = super.callPackage ./zr.nix {};
   };
diff --git a/nix/.config/nixpkgs/emacs.nix b/nix/.config/nixpkgs/emacs.nix
index afa84a46..1ae25348 100644
--- a/nix/.config/nixpkgs/emacs.nix
+++ b/nix/.config/nixpkgs/emacs.nix
@@ -69,7 +69,6 @@ in
     command-log-mode
     company
     company-go
-    company-nixos-options
     company-restclient
     company-tern
     company-web