Author: eelco
Date: Sun Feb 27 19:06:04 2011
New Revision: 26125
URL: https://svn.nixos.org/websvn/nix/?rev=26125&sc=1
Log:
Added:
configurations/trunk/misc/eelco/e6510.nix
- copied, changed from r26123, configurations/trunk/misc/eelco/dutibo.nix
Copied and modified: configurations/trunk/misc/eelco/e6510.nix (from r26123,
configurations/trunk/misc/eelco/dutibo.nix)
==============================================================================
--- configurations/trunk/misc/eelco/dutibo.nix Sun Feb 27 12:05:19 2011
(r26123, copy source)
+++ configurations/trunk/misc/eelco/e6510.nix Sun Feb 27 19:06:04 2011
(r26125)
@@ -1,50 +1,28 @@
{ pkgs, config, modulesPath, ... }:
{
- #nixpkgs.system = "x86_64-linux";
-
- environment.nix = pkgs.nixSqlite;
+ require =
+ [ "${modulesPath}/hardware/network/intel-6000.nix"
+ ];
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/sda";
boot.loader.grub.copyKernels = true;
- boot.loader.grub.extraEntries =
- ''
- menuentry "Windows" {
- chainloader (hd0,2)+1
- }
- '';
- boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" "vboxdrv" ];
+ boot.blacklistedKernelModules = [ "snd_pcsp" ];
- #boot.initrd.checkJournalingFS = false;
+ boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
- fileSystems = [
- { mountPoint = "/";
- label = "nixos";
- #fsType = "ext4";
- }
- { mountPoint = "/windows";
- device = "/dev/disk/by-uuid/9EA4B22EA4B208B3";
- fsType = "ntfs-3g";
- options = "uid=1000,fmask=077,dmask=077";
- autocreate = true;
- }
- { mountPoint = "/srcs";
- device = "/root/srcs.img";
- fsType = "ext4";
- options = "loop";
- }
- ];
-
- swapDevices = [
- { label = "swap"; }
- ];
+ fileSystems =
+ [ { mountPoint = "/";
+ label = "nixos";
+ #fsType = "ext4";
+ }
+ ];
networking = {
- hostName = "dutibo";
+ hostName = "e6510";
enableWLAN = true;
- enableIntel3945ABGFirmware = true;
interfaceMonitor.enable = true;
interfaceMonitor.beep = true;
defaultMailServer.directDelivery = true;
@@ -54,8 +32,6 @@
firewall.rejectPackets = true;
};
- #environment.checkConfigurationOptions = false;
-
environment.systemPackages =
[ pkgs.fuse
pkgs.sshfsFuse
@@ -67,7 +43,7 @@
pkgs.emacs
pkgs.chatzilla
#pkgs.kde4.kdegames
- #pkgs.kde4.kdegraphics
+ pkgs.kde4.kdegraphics
#pkgs.kde4.kdetoys
#pkgs.kde4.kdeutils
#pkgs.kde4.kdeedu
@@ -81,13 +57,8 @@
services = {
- #nixosManual.enable = false;
- #nixosManual.showManual = true;
-
- locate = {
- enable = true;
- period = "40 3 * * *";
- };
+ locate.enable = true;
+ locate.period = "40 3 * * *";
ttyBackgrounds = {
defaultTheme = pkgs.fetchurl {
@@ -148,20 +119,18 @@
xserver = {
enable = true;
videoDriver = "nvidia";
- resolutions = [{x = 1920; y = 1200;} {x = 1440; y = 900;} {x = 1280; y =
1024;} {x = 1024; y = 768;} {x = 800; y = 600;} {x = 640; y = 480;} {x = 1920;
y = 1200;}];
- driSupport = true;
+ #resolutions = [{x = 1920; y = 1200;} {x = 1440; y = 900;} {x = 1280; y
= 1024;} {x = 1024; y = 768;} {x = 800; y = 600;} {x = 640; y = 480;} {x =
1920; y = 1200;}];
+ #driSupport = true;
+
+ synaptics.enable = true;
+ synaptics.twoFingerScroll = true;
- displayManager.slim.theme = pkgs.fetchurl {
- url = http://download.berlios.de/slim/slim-wave.tar.gz;
- sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
- };
-
displayManager.kdm.enable = true;
desktopManager.kde4.enable = true;
- desktopManager.xfce.enable = true;
+ #desktopManager.xfce.enable = true;
- windowManager.compiz.enable = true;
+ #windowManager.compiz.enable = true;
};
printing.enable = true;
@@ -177,7 +146,7 @@
};
nix = {
- maxJobs = 2;
+ maxJobs = 4;
#useChroot = true;
extraOptions = ''
gc-keep-outputs = true
@@ -215,7 +184,7 @@
};
powerManagement.enable = true;
- powerManagement.powerUpCommands = "${pkgs.hdparm}/sbin/hdparm -B 255
/dev/sda";
+ #powerManagement.powerUpCommands = "${pkgs.hdparm}/sbin/hdparm -B 255
/dev/sda";
hardware.bluetooth.enable = true;
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
