environments with direnv and vm based config tests #9

Merged
steveej merged 30 commits from staging into master 2018-10-28 10:27:39 +00:00
Showing only changes of commit 3351944d89 - Show all commits

View file

@ -5,7 +5,7 @@ let
gitpkgs = import /home/steveej/src/github/NixOS/nixpkgs {}; gitpkgs = import /home/steveej/src/github/NixOS/nixpkgs {};
unstablepkgs = import <nixos-unstable> {}; unstablepkgs = import <nixos-unstable> {};
in in
rec { rec {
nix.binaryCachePublicKeys = [ nix.binaryCachePublicKeys = [
@ -191,7 +191,7 @@ rec {
services.printing = { services.printing = {
enable = true; enable = true;
drivers = [ drivers = [
pkgs.hplip pkgs.hplip
unstablepkgs.cups-kyodialog3 unstablepkgs.cups-kyodialog3
unstablepkgs.mfcj6510dwlpr unstablepkgs.mfcj6510dwlpr
@ -282,7 +282,7 @@ rec {
}; };
# required for running blueman-applet in user sessions # required for running blueman-applet in user sessions
services.dbus.packages = with pkgs; [ services.dbus.packages = with pkgs; [
blueman blueman
]; ];