Author: eelco
Date: Wed Jun 15 12:41:42 2011
New Revision: 27472
URL: https://svn.nixos.org/websvn/nix/?rev=27472&sc=1
Log:
Modified:
configurations/trunk/misc/eelco/disabn.nix
Modified: configurations/trunk/misc/eelco/disabn.nix
==============================================================================
--- configurations/trunk/misc/eelco/disabn.nix Wed Jun 15 12:41:15 2011
(r27471)
+++ configurations/trunk/misc/eelco/disabn.nix Wed Jun 15 12:41:42 2011
(r27472)
@@ -5,6 +5,10 @@
[ "${modulesPath}/hardware/network/intel-6000.nix"
];
+ nixpkgs.config.packageOverrides = pkgs: {
+ firefox40Pkgs = pkgs.firefox40Pkgs.override { enableOfficialBranding =
true; };
+ };
+
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/sda";
boot.loader.grub.copyKernels = true;
@@ -29,7 +33,7 @@
#defaultMailServer.hostName = "mail.xs4all.nl";
firewall.enable = true;
firewall.rejectPackets = true;
- #bridges.veth0.interfaces = [ "eth0" ];
+ bridges.veth0.interfaces = [ "eth0" ];
};
environment.systemPackages =
@@ -38,7 +42,7 @@
pkgs.aefs
#pkgs.xlockmore
#config.boot.kernelPackages.virtualbox
- pkgs.firefoxWrapper
+ pkgs.firefox40Wrapper
pkgs.thunderbird3
pkgs.emacs
pkgs.chatzilla
@@ -57,6 +61,7 @@
pkgs.gnumake
pkgs.gcc
pkgs.glxinfo
+ pkgs.blueman
];
security.extraSetuidPrograms = [ "fusermount" "xlock" ];
@@ -138,6 +143,7 @@
};
printing.enable = true;
+ printing.drivers = [ pkgs.foomatic_filters ];
#postgresql.enable = true;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
