From e7a66e8af1c2af519ce5acd19ac5a8ee691c3a35 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Mon, 9 Mar 2020 02:47:12 +0800
Subject: [PATCH] mozilla-overlay: add rust and clion

---
 configs/sterni/packages.nix | 7 +++++++
 shell.nix                   | 5 +++++
 system/all/default.nix      | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/configs/sterni/packages.nix b/configs/sterni/packages.nix
index c859679..e5b9d7d 100644
--- a/configs/sterni/packages.nix
+++ b/configs/sterni/packages.nix
@@ -2,12 +2,19 @@
 let unstable = import <nixpkgs-unstable> { };
 in {
 
+  # overlay included
+  nixpkgs.overlays = [ (import <mozilla-overlay/rust-overlay.nix>) ];
+
   environment.systemPackages = with pkgs; [
     bitwig-studio
     #unstable.sonic-visualiser
     sononym-crawler
     darktable
     haskellPackages.mahlzeit
+
+    # rust development environment
+    rustup
+    jetbrains.clion
   ];
 
   environment.variables.RECIPE_HOME = "$HOME/mahlzeit";
diff --git a/shell.nix b/shell.nix
index 7aa2910..1def696 100644
--- a/shell.nix
+++ b/shell.nix
@@ -109,6 +109,11 @@ let
         ref = "1.0.0";
       };
 
+      mozilla-overlay.git = {
+        url = "https://github.com/mozilla/nixpkgs-mozilla.git";
+        ref = "e912ed483e980dfb4666ae0ed17845c4220e5e7c";
+      };
+
       cleverca22.git = {
         url = "https://github.com/mrVanDalo/nixos-configs.git";
         ref = "76260ad60cd99d40ab25df1400b0663d48e736db";
diff --git a/system/all/default.nix b/system/all/default.nix
index 3cdddc0..75b2abe 100644
--- a/system/all/default.nix
+++ b/system/all/default.nix
@@ -30,7 +30,7 @@
 
   # provide overlays
   # -----------------
-  nixpkgs.overlays = [ (import "${<pkgs>}") (import "${<nix-writers>}/pkgs") ];
+  nixpkgs.overlays = [ (import <pkgs>) (import <nix-writers/pkgs>) ];
 
   # allow un-free
   # -------------