Author: eelco
Date: Fri Oct 21 23:09:22 2011
New Revision: 29968
URL: https://nixos.org/websvn/nix/?rev=29968&sc=1
Log:
* Temporarily switch to a different laptop, old one is broken.
It has a Broadcom BCM4313 wireless card that requires a staging
driver in the Linux kernel.
Modified:
configurations/trunk/misc/eelco/disabn.nix
Modified: configurations/trunk/misc/eelco/disabn.nix
==============================================================================
--- configurations/trunk/misc/eelco/disabn.nix Fri Oct 21 19:30:32 2011
(r29967)
+++ configurations/trunk/misc/eelco/disabn.nix Fri Oct 21 23:09:22 2011
(r29968)
@@ -3,10 +3,21 @@
{
require =
[ "${modulesPath}/hardware/network/intel-6000.nix"
+ "${modulesPath}/hardware/network/intel-5000.nix"
];
nixpkgs.config.packageOverrides = pkgs: {
- firefox40Pkgs = pkgs.firefox40Pkgs.override { enableOfficialBranding =
true; };
+ firefox70Pkgs = pkgs.firefox70Pkgs.override { enableOfficialBranding =
true; };
+ kde4 = pkgs.kde47;
+ linux_2_6_38 = pkgs.linux_2_6_38.override {
+ extraConfig =
+ ''
+ STAGING y
+ STAGING_EXCLUDE_BUILD n
+ BRCM80211 m
+ BRCM80211_PCI y
+ '';
+ };
};
boot.loader.grub.version = 2;
@@ -15,6 +26,7 @@
boot.blacklistedKernelModules = [ "snd_pcsp" ];
+ boot.kernelPackages = pkgs.linuxPackages_2_6_38;
boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
fileSystems =
@@ -26,14 +38,17 @@
networking = {
hostName = "disabn";
enableWLAN = true;
+ WLANInterface = "wlan2";
interfaceMonitor.enable = true;
- interfaceMonitor.beep = true;
defaultMailServer.directDelivery = true;
defaultMailServer.hostName = "mail.st.ewi.tudelft.nl";
#defaultMailServer.hostName = "mail.xs4all.nl";
firewall.enable = true;
+ firewall.allowPing = true;
firewall.rejectPackets = true;
- bridges.veth0.interfaces = [ "eth0" ];
+ #firewall.logRefusedPackets = true;
+ #firewall.logRefusedUnicastsOnly = false;
+ #bridges.veth0.interfaces = [ "eth0" ];
};
environment.systemPackages =
@@ -42,8 +57,8 @@
pkgs.aefs
#pkgs.xlockmore
#config.boot.kernelPackages.virtualbox
- pkgs.firefox40Wrapper
- pkgs.thunderbird3
+ pkgs.firefoxWrapper
+ pkgs.thunderbird
pkgs.emacs
pkgs.chatzilla
#pkgs.kde4.kdegames
@@ -55,7 +70,7 @@
pkgs.kde4.kdesdk.kcachegrind
#pkgs.kde4.kdenetwork
#pkgs.kde4.kdeplasma_addons
- pkgs.kde4.misc.kscreensaver
+ pkgs.kde4.kscreensaver
pkgs.libxml2
pkgs.libxslt
pkgs.gnumake
@@ -68,6 +83,8 @@
services = {
+ flashpolicyd.enable = true;
+
locate.enable = true;
locate.period = "40 3 * * *";
@@ -118,6 +135,7 @@
{ serviceType = "mediawiki";
siteName = "Nix Wiki";
logo = "/logo/nix-wiki.png";
+ defaultSkin = "nixos";
extraConfig =
''
$wgEmailConfirmToEdit = true;
@@ -129,7 +147,7 @@
xserver = {
enable = true;
- videoDriver = "nvidia";
+ videoDriver = "vesa";
synaptics.enable = true;
synaptics.twoFingerScroll = true;
@@ -197,4 +215,9 @@
#powerManagement.powerUpCommands = "${pkgs.hdparm}/sbin/hdparm -B 255
/dev/sda";
hardware.bluetooth.enable = true;
+ #hardware.pulseaudio.enable = true;
+
+ security.pam.loginLimits =
+ [ { domain = "*"; item = "nofile"; type = "-"; value = "16384"; }
+ ];
}
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
