Author: viric
Date: Sun Dec 26 17:30:10 2010
New Revision: 25291
URL: https://svn.nixos.org/websvn/nix/?rev=25291&sc=1
Log:
I commit the configuration I've been lately using on 'bergamota'
Modified:
configurations/trunk/misc/viric/bergamota.nix
Modified: configurations/trunk/misc/viric/bergamota.nix
==============================================================================
--- configurations/trunk/misc/viric/bergamota.nix Sun Dec 26 17:18:19
2010 (r25290)
+++ configurations/trunk/misc/viric/bergamota.nix Sun Dec 26 17:30:10
2010 (r25291)
@@ -1,51 +1,91 @@
{pkgs, ... } :
+let
+ useVirtualbox = false;
+in
rec {
require = [ /etc/nixos/nixos/modules/hardware/network/intel-5000.nix ];
boot = rec {
initrd = {
kernelModules = [
"ata_piix" "reiserfs" "sd_mod" # otherwise tuxonice does not see the
discs.
- "lzo" "tuxonice_userui" "tuxonice_compress" "tuxonice_swap" ];
+ "lzo" "tuxonice_userui" "tuxonice_compress" "tuxonice_swap"
+# "agpgart" "intel_agp" "i915" "drm" "drm_kms_helper" "i2c-core"
"video" "button" "i2c-algo-bit"
+ ];
enableSplashScreen = false;
};
kernelParams = [
"selinux=0"
"apm=on"
"acpi=on"
- "vga=0x317"
+ "vga=normal"
"console=tty1"
- "video=vesafb:ywrap"
+# "video=vesafb:ywrap"
# "nomodeset"
];
kernelModules = [ "fuse"
"powersave"
"acpi-cpufreq"
"cpufreq-ondemand"
- "kqemu"
-# "vboxdrv"
"kvm-intel"
"tun" # for openvpn
"atl1c"
- ];
- extraModulePackages = [ kernelPackages.kqemu /*kernelPackages.virtualbox*/
];
+ "i915"
+ ] ++ pkgs.lib.optional useVirtualbox "vboxdrv";
+ extraModulePackages = pkgs.lib.optional useVirtualbox
boot.kernelPackages.virtualbox;
loader = {
grub = {
+ version = 2;
device = "/dev/sda";
copyKernels = true;
};
};
resumeDevice = "8:2";
extraKernelParams = ["resume=/dev/sda2"];
- kernelPackages = pkgs.linuxPackages_2_6_33;
+ kernelPackages = pkgs.linuxPackages_2_6_36;
+/*
+ kernelPackages = pkgs.linuxPackages_2_6_34 // {
+ kernel = pkgs.linuxPackages_2_6_34.kernel.override (attrs: {
+ extraConfig = ''
+ RT2800USB_RT30XX y
+ '';
+ kernelPatches = attrs.kernelPatches ++ [ { name = "intel-g45-2.6.34";
patch = ../intel-g45-2.6.34.patch; } ];
+ });
+ };
+*/
# kernelPackages = pkgs.linuxPackages_2_6_28;
postBootCommands = ''
echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
'';
+
+ vesa = false;
};
security = {
extraSetuidPrograms = [ "fusermount" "xlaunch" "mount" "umount"
"wodim" "cdrecord" "growisofs" "dvd+rw-format" ];
+ setuidOwners = [
+ {
+ program = "write";
+ owner = "root";
+ group = "tty";
+ setuid = false;
+ setgid = true;
+ }
+ {
+ program = "wall";
+ owner = "root";
+ group = "tty";
+ setuid = false;
+ setgid = true;
+ }
+ /* {
+ program = "xterm";
+ owner = "root";
+ group = "utmp";
+ setuid = false;
+ setgid = true;
+ } */
+ ];
sudo = {
enable = true;
configFile = ''
@@ -62,10 +102,13 @@
nix = {
maxJobs = 1;
+ useChroot = true;
};
services = {
- nscd.enable = false;
+ nscd.enable = true;
+
+ nixosManual.enable = false;
ttyBackgrounds = {
enable = false;
@@ -75,6 +118,26 @@
enable = true;
};
+ privoxy = {
+ enable = true;
+ listenAddress = "127.0.0.1:8117";
+ };
+
+ # tor.enableClient = true;
+
+ udev = {
+ extraRules = ''
+ # Scanner Canon
+ SUBSYSTEM=="usb", ATTRS{idVendor}=="04a9", ATTRS{idProduct}=="221c",
MODE:="0666"
+ # PCE-HT71
+ SUBSYSTEM=="usb", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="0003",
MODE:="0666"
+ # Sony Ericsson
+ SUBSYSTEM=="usb", ATTRS{idVendor}=="0fce", ATTRS{idProduct}=="d0d0",
MODE:="0666"
+ # Ben Nanonote
+ KERNEL=="usb[0-9]*", DRIVERS=="cdc_ether", ACTION=="add",
RUN+="/root/bin/nanonet"
+ '';
+ };
+
xserver = {
enable = true;
defaultDepth = 24;
@@ -85,17 +148,19 @@
driSupport = false;
synaptics = {
enable = true;
- dev = "/dev/input/by-path/platform-i8042";
+ # dev = "/dev/input/by-path/platform-i8042-serio-2-mouse";
};
+ modules = [ pkgs.xorg.xf86inputsynaptics ];
layout = "es+eo,ru(winkeys)";
xkbOptions = "grp:caps_toggle, grp_led:scroll";
desktopManager = {
-# default = "kde4";
+ # default = "";
kde4 = {
enable = false;
};
};
windowManager = {
+ awesome.enable = false;
wmii = {
enable = false;
};
@@ -105,13 +170,19 @@
twm = {
enable = true;
};
+ icewm.enable = true;
};
displayManager = {
slim = {
+ enable = true;
+ };
+/*
+ xdm = {
enable = false;
};
+*/
kdm = {
- enable = true;
+ enable = false;
extraConfig = ''
[Xdmcp]
Enable=true
@@ -163,6 +234,7 @@
enable = true;
exports = ''
/home/sheevaplugroot 192.168.1.4(rw,no_root_squash,no_all_squash)
+ /home/fuloongroot 192.168.1.0/24(rw,no_root_squash,no_all_squash)
'';
};
};
@@ -202,16 +274,59 @@
};
postfix = {
- enable = false;
- networks = [ "192.168.1.0/24" ];
- hostname = "vicerveza.homeunix.net";
- domain = "vicerveza.homeunix.net";
- destination = [ "localhost" "vicerveza.homeunix.net"
"cubata.homelinux.net" ];
+ enable = true;
+ networks = [ "127.0.0.1/24" ];
+ hostname = "bergamota";
+ domain = "bergamota";
+ destination = [ "localhost" "vicerveza.homeunix.net" ];
rootAlias = "viric";
};
pcscd.enable = true;
-
+
+ logrotate = {
+ enable = true;
+ config = ''
+ compress
+
+ /var/log/messages /var/log/warn {
+ rotate 3
+ size 500k
+ sharedscripts
+ postrotate
+ source /etc/bashrc
+ kill -HUP `cat /var/run/syslogd.pid`
+ endscript
+ }
+
+ /var/log/httpd/* {
+ rotate 3
+ size 500k
+ sharedscripts
+ postrotate
+ source /etc/bashrc
+ kill -HUP `cat /var/run/httpd/httpd.pid`
+ endscript
+ }
+ '';
+ };
+
+ autofs = {
+ enable = true;
+ autoMaster = let
+ mapConf = pkgs.writeText "auto" ''
+ kernel -ro,soft,intr ftp.kernel.org:/pub/linux
+ dvd -fstype=iso9660,ro :/dev/sr0
+ edonkey -ro,soft,intr,vers=3
vicerveza:/mnt/hd/home/p2p/.mldonkey/incoming
+ aqtmp -ro,soft,intr canigo.aqsense.intern:/srv/nfs/tmp
+ aqshared -ro,soft,intr canigo.aqsense.intern:/srv/nfs/shared
+ # usbb -fstype=auto,rw :/dev/sdb1
+ '';
+ in "/auto file:${mapConf}";
+ };
+
+ cron.enable = false;
+ fcron.enable = true;
};
fileSystems = [
@@ -219,6 +334,10 @@
device = "/dev/sda3";
options = "noatime";
}
+ { mountPoint = "/mnt/usbb";
+ device = "/dev/sdb1";
+ options = "noatime,user,noauto";
+ }
];
swapDevices = [ {
@@ -245,12 +364,15 @@
192.168.1.1 router
192.168.1.4 vicerveza vicerveza.homeunix.net
192.168.1.3 llimona
- 192.168.1.32 bergamota
+ 192.168.1.34 bergamota
192.168.1.33 mandarina
+ 192.168.1.223 fu
+ 192.168.1.222 fu2
+ 192.168.0.204 nanonote
'';
interfaces = [ {
name = "wlan0";
- ipAddress = "192.168.1.32";
+ ipAddress = "192.168.1.34";
subnetMask = "255.255.255.0";
} ];
useDHCP = false;
@@ -263,6 +385,8 @@
localCommands = ''
#source /etc/bashrc
#/root/bin/net fresca
+ PATH=$PATH:${pkgs.iptables}/{bin,sbin}
+ echo 1 > /proc/
'';
};
@@ -276,22 +400,30 @@
systemPackages = [
pkgs.bridge_utils
pkgs.tunctl
- /*boot.kernelPackages.virtualbox*/
+
pkgs.cdrkit
pkgs.xorg.xf86inputsynaptics
+ pkgs.xorg.xinput
pkgs.xlaunch
pkgs.xterm
pkgs.gitFull
pkgs.subversion
- ];
+ pkgs.ts
+ pkgs.tm
+ pkgs.tigervnc
+ pkgs.xscreensaver
+ ] ++ pkgs.lib.optional useVirtualbox boot.kernelPackages.virtualbox;
pathsToLink = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man"
"/info" "/share/X11-fonts" ];
kdePackages = [
/*
+ pkgs.kde4.digikam
pkgs.shared_mime_info
pkgs.kde4.kdelibs
pkgs.kde4.kdebase
pkgs.kde4.kdebase_runtime
pkgs.kde4.kdebase_workspace
+*/
+/*
pkgs.kde4.kdegraphics
pkgs.kde4.kdeutils
pkgs.kde4.kdesvn
@@ -305,18 +437,23 @@
pkgs.kde4.l10n.ca
pkgs.kde4.l10n.ru
pkgs.kde4.kmplayer
+ pkgs.kde4.kdiff3
pkgs.kde4.filelight
+ pkgs.kde4.kdesdk
+ pkgs.kde4.kdeedu
*/
];
+ nix = pkgs.nixSqlite;
};
installer = {
manifests = [
- /* http://hydra.nixos.org/jobset/nixpkgs/trunk/channel/latest/MANIFEST
*/
- http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
+ /* http://hydra.nixos.org/jobset/nixpkgs/trunk/channel/latest/MANIFEST */
+ /*http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST */
+ http://hydra.nixos.org/jobset/nixpkgs/stdenv/channel/latest/MANIFEST
];
};
- nixpkgs.platform = pkgs.platforms.pc;
+ # nixpkgs.platform = pkgs.platforms.pc;
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
