feat: Add nixpkgs-mozilla overlay

Imports the nixpkgs-mozilla overlay and installs stable Rust from
the same channel as rustup.
This commit is contained in:
Vincent Ambo 2017-10-16 21:46:13 +02:00
parent 10d1ad9280
commit 7d09557096
3 changed files with 11 additions and 4 deletions

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "nixpkgs-mozilla"]
path = nixpkgs-mozilla
url = git@github.com:mozilla/nixpkgs-mozilla.git

View file

@ -4,8 +4,8 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let rust-overlay = import "/etc/nixos/nixpkgs-mozilla/rust-overlay.nix";
unstable = import <nixos-unstable> { config.allowUnfree = true; }; unstable = import <nixos-unstable> { config.allowUnfree = true; };
in { in {
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
@ -13,6 +13,10 @@ in {
./local-configuration.nix ./local-configuration.nix
]; ];
# Configure the Nix package manager
nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ rust-overlay ];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
@ -26,7 +30,7 @@ in {
# $ nix-env -qaP | grep wget # $ nix-env -qaP | grep wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
curl gnumake unzip openjdk gcc htop tree direnv tmux fish ripgrep curl gnumake unzip openjdk gcc htop tree direnv tmux fish ripgrep
gnupg pass git manpages stdmanpages gnupg pass git manpages stdmanpages latest.rustChannels.stable.rust
]; ];
# Enable the X11 windowing system. # Enable the X11 windowing system.
@ -52,7 +56,6 @@ in {
# Configure other random applications: # Configure other random applications:
programs.java.enable = true; programs.java.enable = true;
nixpkgs.config.allowUnfree = true;
# Configure fonts # Configure fonts
fonts = { fonts = {

1
nixpkgs-mozilla Submodule

@ -0,0 +1 @@
Subproject commit 6179dd876578ca2931f864627598ede16ba6cdef