Author: raskin
Date: Thu Nov 11 19:58:42 2010
New Revision: 24666
URL: https://svn.nixos.org/websvn/nix/?rev=24666&sc=1
Log:
building everything on a new notebook
Added:
configurations/trunk/misc/raskin/filesystems-asus-n53j.nix
configurations/trunk/misc/raskin/raskin-asus-n53j.nix
configurations/trunk/misc/raskin/xserver-intel.nix
Modified:
configurations/trunk/misc/raskin/custom-vim.nix
configurations/trunk/misc/raskin/package-groups.nix
Modified: configurations/trunk/misc/raskin/custom-vim.nix
==============================================================================
--- configurations/trunk/misc/raskin/custom-vim.nix Thu Nov 11 19:57:46
2010 (r24665)
+++ configurations/trunk/misc/raskin/custom-vim.nix Thu Nov 11 19:58:42
2010 (r24666)
@@ -9,7 +9,7 @@
};
flags = composableDerivation.edf ({name = "ecl"; feat = "eclinterp"; enable
= {buildNativeInputs = [ecl gmp mpfr];};});
lua = lua5;
- src = "" + /var/repos/vim_extended;
+ #src = "" + /var/repos/vim_extended;
#src = "" + /home/raskin/build/limp/vim-ecl/vim;
cfg = {
pythonSupport = true;
Added: configurations/trunk/misc/raskin/filesystems-asus-n53j.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ configurations/trunk/misc/raskin/filesystems-asus-n53j.nix Thu Nov 11
19:58:42 2010 (r24666)
@@ -0,0 +1,64 @@
+
+{...}:
+[
+ {
+ mountPoint="/";
+ label="root";
+ fsType="btrfs";
+ neededForBoot=true;
+ options="noatime";
+ }
+ {
+ mountPoint="/boot";
+ label="boot";
+ fsType="ext3";
+ neededForBoot=true;
+ options="acl,user_xattr,noatime,data=ordered";
+ }
+ {
+ mountPoint="/var";
+ label="var";
+ fsType="btrfs";
+ neededForBoot=true;
+ options="noatime";
+ }
+ {
+ mountPoint="/var/log";
+ label="var-log";
+ fsType="btrfs";
+ neededForBoot=true;
+ options="noatime";
+ }
+ {
+ mountPoint="/nix";
+ label="nix";
+ fsType="btrfs";
+ neededForBoot=true;
+ options="noatime";
+ }
+ {
+ mountPoint="/tmp";
+ label="tmp";
+ fsType="btrfs";
+ neededForBoot=true;
+ options="noatime";
+ }
+ {
+ mountPoint="/home";
+ label="home";
+ fsType="btrfs";
+ neededForBoot=true;
+ options="noatime";
+ }
+ { mountPoint = "/dev/shm";
+ device = "memory";
+ fsType = "tmpfs";
+
+ # If /dev/shm is absent, create it
+ autocreate = true;
+ }
+ { mountPoint = "/sys/fs/fuse/connections";
+ device="fuse";
+ fsType = "fusectl";
+ }
+ ]
Modified: configurations/trunk/misc/raskin/package-groups.nix
==============================================================================
--- configurations/trunk/misc/raskin/package-groups.nix Thu Nov 11 19:57:46
2010 (r24665)
+++ configurations/trunk/misc/raskin/package-groups.nix Thu Nov 11 19:58:42
2010 (r24666)
@@ -15,11 +15,11 @@
= [
clisp guile fpc gcc ocaml php bc maxima
zsh sbcl ecl tcl tk erlang m4 tcsh eql
- flex2534 bison23 /*llvm*/ /*llvmGCC*/ gfortran
+ flex2534 bison23 llvm gfortran
haskellPackages.ghc octave lazarus guile_lib gwrap ruby
- rubygems ikarus python26Full ccl
+ rubygems python26Full ccl
eprover
- stalin bigloo /*coq*/ pltScheme racket
+ bigloo /*coq*/ pltScheme racket
io falcon acl2 mono mitscheme
gambit gcl jre jdk spidermonkey
];
@@ -30,7 +30,7 @@
= [
sdparm hdparm hddtemp cdrkit dvdplusrwtools
wirelesstools xorg.xf86inputsynaptics smartmontools
- usbutils dmidecode uucp mesa vbetool
+ usbutils dmidecode uucp mesa
xsane saneBackends saneFrontends gphoto2 gphoto2fs
@@ -111,22 +111,7 @@
# with all the benefits of Common Lisp for
# extensibility
windowManagers = [ xorg.twm icewm
- (stumpwm.passthru.function (x: rec {
- revision = (import /root/nix-sysconfig/vcs.nix).stumpwm.revision;
- branch = (import /root/nix-sysconfig/vcs.nix).stumpwm.branch;
- src = (runCommand "stumpwm-mtn-checkout" {}
- ''
- ${monotone}/bin/mtn co --db /home/raskin/.mtn.db -b
${branch} -r ${revision} $out
- '') + "/";
- prepareBuild = builderDefs.fullDepEntry (''
- cp -r ${clppcre}/share/cl-ppcre cl-ppcre
- chmod -R u+rwX cl-ppcre
- ./autogen.sh
- '') ["minInit" "addInputs" "doUnpack"];
- buildInputs = x.buildInputs ++
- [monotone autoconf libtool automake];
- phaseNames = ["prepareBuild"] ++ x.phaseNames;
- }))
+ stumpwm
stalonetray fileschanged
]
;
@@ -134,10 +119,10 @@
versionControl = [
cvs mercurial /*svk*/ subversion
unison monotone bazaar git
- (tailor.passthru.function {
+ /*(tailor.passthru.function {
src = "" + /var/repos/tailor + "/";
version = "darcs-head";
- })
+ })*/ tailor
tla darcs bazaarTools
monotoneViz viewMtn guitone
fossil veracity
@@ -157,7 +142,7 @@
gawk patchelf
screen (lowPrio nixUnstable) ccache patch
rlwrap gdb testdisk expect
- units ttmkfdir aspell
+ units aspell
zip texinfo pinentry
powertop pv fdupes
replace mpage ctags saxon ant groff
@@ -173,7 +158,7 @@
fsTools
= [
- (btrfsProgs.override {src = "" +
/home/raskin/build/btrfs-progs-unstable +"/";})
+ /*(btrfsProgs.override {src = "" +
/home/raskin/build/btrfs-progs-unstable +"/";}) */ btrfsProgs
jfsutils jfsrec xfsprogs dosfstools nilfs_utils
];
@@ -291,7 +276,7 @@
url =
http://www.kde-look.org/CONTENT/content-files/58501-green.tar.gz;
sha256 =
"0sdykpziij1f3w4braq8r8nqg4lnsd7i7gi1k5d7c31m2q3b9a7r";
})
- linuxPackages.aufs.src flashplayer.src flashplayer9.src
+ linuxPackages.aufs.src flashplayer.src
stumpwm jwm
qt4 libev
gnome28.gtkglext
@@ -308,27 +293,8 @@
sshfsFuse fuse smbfsFuse ntfs3g relfs
iputils ncat wpa_supplicant iproute lftp wget nc6
(socat.passthru.function {version = "2.0.0-b3";}) dhcp
thunderbird openoffice gajim
- (stumpwm.passthru.function (x: rec {
- revision = (import /root/nix-sysconfig/vcs.nix).stumpwm.revision;
- branch = (import /root/nix-sysconfig/vcs.nix).stumpwm.branch;
- src = (runCommand "stumpwm-mtn-checkout" {}
- ''
- ${monotone}/bin/mtn co --db /home/raskin/.mtn.db -b
${branch} -r ${revision} $out
- '') + "/";
- prepareBuild = builderDefs.fullDepEntry (''
- cp -r ${clppcre}/share/cl-ppcre cl-ppcre
- chmod -R u+rwX cl-ppcre
- ./autogen.sh
- '') ["minInit" "addInputs" "doUnpack"];
- buildInputs = x.buildInputs ++
- [monotone autoconf libtool automake];
- phaseNames = ["prepareBuild"] ++ x.phaseNames;
- })) ratpoison
+ stumpwm ratpoison
subversion mercurial monotone git
- (tailor.passthru.function {
- src = "" + /var/repos/tailor + "/";
- version = "darcs-head";
- })
which binutils utillinuxngCurses file sqlite indent lsof psmisc
diffutils screen (lowPrio nixUnstable)
patch rlwrap gnupg pinentry
btrfsProgs
Added: configurations/trunk/misc/raskin/raskin-asus-n53j.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ configurations/trunk/misc/raskin/raskin-asus-n53j.nix Thu Nov 11
19:58:42 2010 (r24666)
@@ -0,0 +1,254 @@
+# ASUS N53J
+
+#00:00.0 Host bridge: Intel Corporation Core Processor DRAM Controller (rev 18)
+#00:01.0 PCI bridge: Intel Corporation Core Processor PCI Express x16 Root
Port (rev 18)
+#00:02.0 VGA compatible controller: Intel Corporation Core Processor
Integrated Graphics Controller (rev 18)
+#00:16.0 Communication controller: Intel Corporation 5 Series/3400 Series
Chipset HECI Controller (rev 06)
+#00:1a.0 USB Controller: Intel Corporation 5 Series/3400 Series Chipset USB2
Enhanced Host Controller (rev 06)
+#00:1b.0 Audio device: Intel Corporation 5 Series/3400 Series Chipset High
Definition Audio (rev 06)
+#00:1c.0 PCI bridge: Intel Corporation 5 Series/3400 Series Chipset PCI
Express Root Port 1 (rev 06)
+#00:1c.1 PCI bridge: Intel Corporation 5 Series/3400 Series Chipset PCI
Express Root Port 2 (rev 06)
+#00:1c.3 PCI bridge: Intel Corporation 5 Series/3400 Series Chipset PCI
Express Root Port 4 (rev 06)
+#00:1c.4 PCI bridge: Intel Corporation 5 Series/3400 Series Chipset PCI
Express Root Port 5 (rev 06)
+#00:1c.5 PCI bridge: Intel Corporation 5 Series/3400 Series Chipset PCI
Express Root Port 6 (rev 06)
+#00:1d.0 USB Controller: Intel Corporation 5 Series/3400 Series Chipset USB2
Enhanced Host Controller (rev 06)
+#00:1e.0 PCI bridge: Intel Corporation 82801 Mobile PCI Bridge (rev a6)
+#00:1f.0 ISA bridge: Intel Corporation Mobile 5 Series Chipset LPC Interface
Controller (rev 06)
+#00:1f.2 SATA controller: Intel Corporation 5 Series/3400 Series Chipset 4
port SATA AHCI Controller (rev 06)
+#00:1f.6 Signal processing controller: Intel Corporation 5 Series/3400 Series
Chipset Thermal Subsystem (rev 06)
+#01:00.0 VGA compatible controller: nVidia Corporation GT215 [GeForce GT 335M]
(rev a2)
+#03:00.0 Network controller: Atheros Communications Inc. AR9285 Wireless
Network Adapter (PCI-Express) (rev 01)
+#04:00.0 USB Controller: Device 1b73:1400 (rev 01)
+#05:00.0 Class ff00: Realtek Semiconductor Co., Ltd. Device 5209 (rev 01)
+#05:00.1 SD Host controller: Realtek Semiconductor Co., Ltd. Device 5209 (rev
01)
+#06:00.0 Ethernet controller: Atheros Communications AR8131 Gigabit Ethernet
(rev c0)
+#ff:00.0 Host bridge: Intel Corporation Core Processor QuickPath Architecture
Generic Non-core Registers (rev 05)
+#ff:00.1 Host bridge: Intel Corporation Core Processor QuickPath Architecture
System Address Decoder (rev 05)
+#ff:02.0 Host bridge: Intel Corporation Core Processor QPI Link 0 (rev 05)
+#ff:02.1 Host bridge: Intel Corporation Core Processor QPI Physical 0 (rev 05)
+#ff:02.2 Host bridge: Intel Corporation Core Processor Reserved (rev 05)
+#ff:02.3 Host bridge: Intel Corporation Core Processor Reserved (rev 05)
+
+{config, pkgs, ...}:
+
+let
+ texLivePaths = with pkgs; [texLive texLiveExtra texLiveCMSuper
+ texLiveBeamer lmodern texLiveContext];
+ myTexLive = pkgs.texLiveAggregationFun {
+ paths = texLivePaths;
+ };
+ kernelToUse = rec {
+ kernelPackages = pkgs.linuxPackagesFor pkgs.linux_2_6_36 kernelPackages;
+ };
+ packageGroups = import
/etc/nixos/configurations/misc/raskin/package-groups.nix {
+ inherit pkgs myTexLive;
+ baseKernel = kernelToUse;
+ };
+in
+{
+ require = [
+ /etc/nixos/nixos/modules/services/hardware/bluetooth.nix
+ /etc/nixos/configurations/tud/couchdb.nix
+ ];
+
+ boot = rec {
+ loader.grub = {
+ device = "/dev/sda";
+ bootDevice = "(hd0,5)";
+ copyKernels = true;
+ configurationLimit = 100;
+ version = 2;
+ };
+ vesa = false;
+ kernelPackages = pkgs.linuxPackagesFor pkgs.linux_2_6_36 kernelPackages;
+ initrd = {
+ kernelModules = [
+ "libata" "sd_mod"
+ "i8042" "pcips2" "serio"
+ "mousedev" "evdev" "psmouse" "sermouse" "synaptics_i2c"
+ "ext3" "lzf" "crc32c" "btrfs" "libcrc32c"
+ "zlib_deflate" "unix" "usbhid" "ehci_hcd" "uhci_hcd"
+ "ohci_hcd" "atkbd" "xtkbd" "bfq_iosched"
+ "tuxonice_core" "tuxonice_swap" "tuxonice_userui"
+ ];
+ };
+ kernelModules = [
+ "fbcon" "i915"
+ "usb-storage" "tun"
+ "battery" "ac" "thermal" "fuse" "kqemu"
+ "8139too" "p4_clockmod" "cp2101" "ath9k"
+ "ati_agp"
+ "ahci" "loop" "ftdi_sio" "snd_pcm" "snd_hda_intel" "radeon"
+ "ipip" "ipv6" "video"
+ "fbdev"
+ "pata_atiixp" "sr_mod" "ahci" "pktcdvd" "ide-cd-mod"
+ "atl1c"
+ ];
+ hardwareScan = false;
+ resumeDevice = "8:8";
+ };
+
+ swapDevices = [
+ {label = "swap";}
+ ];
+ fileSystems = import ./filesystems-asus-n53j.nix {};
+
+ services = (import ./services-main.nix {inherit pkgs config;}) //
+ {
+ xserver = import ./xserver-intel.nix {inherit pkgs;};
+ };
+
+ i18n = {
+ defaultLocale = "en_US.UTF-8";
+
+ consoleFont = "iso01-12x22";
+ consoleKeyMap = "ruwin_cplk-UTF-8";
+ };
+
+ environment = {
+ systemPackages = with packageGroups;
+ [(pkgs.runCommand "empty" {} "mkdir $out")] ++
+ (if false then minimal else
+ (
+ pkgs.lib.concatLists
+ [
+ extractors consoleBrowsers programmingLanguages
+ nonNative hwControl toys filesystems networkTools
+ fatXApps windowManagers consoleTools buildSupport
+ utilsX widgets sound graphicView clientServer im
+ misc GCPin versionControl fsTools consoleEditors
+ browsers graphicEdit encryption
+ ]
+ ));
+
+ nix = pkgs.nixCustomFun ("" + /etc/nixos/nix + "/")
+ ""
+ ["nix-reduce-build" "nix-http-export.cgi"]
+ ["--with-docbook-xsl=${pkgs.docbook5_xsl}/xml/xsl/docbook/"
+ "--with-docbook-rng=${pkgs.docbook5}/xml/rng/docbook"
+ ];
+
+ pathsToLink = ["/"];
+
+ };
+
+ fonts = import ./fonts.nix {inherit pkgs;};
+
+ time = {
+ timeZone = "Europe/Moscow";
+ };
+
+ nix = {
+ useChroot = true;
+ maxJobs = 4;
+
+ extraOptions = "
+gc-keep-outputs = true # Nice for developers
+gc-keep-derivations = true # Idem
+env-keep-derivations = false
+ ";
+ proxy = "http://127.0.0.1:3128";;
+ };
+
+ jobs = {
+ cleanXserverLock = {
+ name = "clean-xserver-lock";
+ description = "Clean X lock files";
+ startOn = "filesystems/started";
+ script = ''
+ if ! pgrep X; then
+ rm /tmp/.X*-lock;
+ fi
+ '';
+ respawn = false;
+ };
+ networkInterfaces.startOn = "never";
+ nscd.startOn = "never";
+ dhclient.startOn = "never";
+ };
+
+ networking = {
+ extraHosts = (import /root/nix-sysconfig/hosts.nix);
+ hostName = (import /root/nix-sysconfig/hostname.nix);
+
+ # I manage proxy settings manually anyway
+ interfaceMonitor = {
+ enable = false;
+ };
+
+ nameservers = [
+ ] ++ (import /root/nix-sysconfig/nameservers.nix);
+
+ };
+
+ nixpkgs.config = import (builtins.getEnv "NIXPKGS_CONFIG");
+
+ security = {
+ extraSetuidPrograms = ["fusermount"
+ "mount" "umount" "sudo" "xlaunch"
+ "lsof" "suid-chroot" "fbterm" "pmount"
+ "pumount"
+ ];
+ setuidOwners = [
+ {
+ program = "sendmail";
+ group = "postdrop";
+ setgid = true;
+ }
+ {
+ program = "postdrop";
+ group = "postdrop";
+ setgid = true;
+ }
+ ];
+ sudo = {
+ configFile = "
+#generated
+raskin ALL= NOPASSWD: /etc/sudo-scripts/setfreq,\\
+ /etc/sudo-scripts/standby,\\
+ /etc/sudo-scripts/xfs,\\
+ /var/run/current-system/sw/bin/wodim,\\
+ /var/run/current-system/sw/sbin/halt,\\
+ /etc/sudo-scripts/dateupdate,\\
+ /etc/sudo-scripts/eth,\\
+ /etc/sudo-scripts/wifi,\\
+ /etc/sudo-scripts/nonet,\\
+ /etc/sudo-scripts/up-ifs,\\
+ /etc/sudo-scripts/brightness,\\
+ /etc/sudo-scripts/renice0,\\
+ /etc/sudo-scripts/glusterfs-start,\\
+ /etc/sudo-scripts/gvpe-start,\\
+ /etc/sudo-scripts/chmod
+raskin ALL= NOPASSWD: SETENV: /etc/sudo-scripts/checkGw6
+sshguest ALL= /var/run/current-system/sw/bin/ls /home/sshguest
+wwwrun ALL= NOPASSWD: /var/run/current-system/sw/bin/mplayer,\\
+ /var/run/current-system/sw/bin/amixer
+xserver ALL= NOPASSWD: /var/run/current-system/sw/sbin/start xserver,\\
+ /var/run/current-system/sw/sbin/stop xserver
+halt ALL= NOPASSWD: /var/run/current-system/sw/sbin/halt
+";
+ };
+
+ };
+
+ installer = {
+ # Life is easier to control like that
+ manifests = if false then [] else [
+
http://hydra.nixos.org/jobset/nixpkgs/trunk/channel/latest/MANIFEST
+
http://hydra.nixos.org/jobset/nixpkgs/stdenv/channel/latest/MANIFEST
+
http://hydra.nixos.org/job/nix/trunk/build/channel/latest/MANIFEST
+ http://hydra.nixos.org/project/nixos/channel/latest/MANIFEST
+
http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
+ ];
+
+ repoTypes = {
+ svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils
pkgs.subversion ]; };
+ git = { valid = "[ -d .git ]"; env = [ pkgs.coreutils pkgs.git
pkgs.gnused /* FIXME: use full path to sed in nix-pull */ ]; };
+ };
+ };
+
+ hardware = {
+ firmware = ["/var/lib/firmware"];
+ };
+
+}
Added: configurations/trunk/misc/raskin/xserver-intel.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ configurations/trunk/misc/raskin/xserver-intel.nix Thu Nov 11 19:58:42
2010 (r24666)
@@ -0,0 +1,47 @@
+{pkgs,...}:
+ {
+ enable = true;
+
+ # Do not run on startup
+ autorun = false;
+
+ # Create /etc/X11/xorg.conf for convenience
+ exportConfiguration = true;
+
+ # Needed by, say, xmove
+ enableTCP = true;
+
+ # 15.6". I thought WXGA was widescreen
+ resolutions = [{x = 1920; y=1080;}];
+ virtualScreen = {x=3520; y=2200;};
+
+ videoDrivers = [ "intel" ];
+
+ synaptics = {
+ enable = true;
+ dev = null;
+ };
+
+ # I get Caps-toggle between Latin/Cyrillic/Greek
+ # Right Flag key allows entering, say, euro sign
+ # or accents (using deadkeys in level 3)
+ # Look xkeyboard_config package source.
+ layout = "us(altgr-intl-rich),ru(common),gr(basic)";
+ xkbOptions = "grp:caps_toggle, grp_led:caps, lv3:lwin_switch,
terminate:ctrl_alt_bksp";
+
+ useXFS = "unix/:7100";
+ driSupport = false;
+
+ defaultDepth = 24;
+ # Will watch free ATi drivers progress...
+ # Force DRI on - or do not..
+ deviceSection = ''
+ Option "RenderAccel" "true"
+ '';
+
+ serverLayoutSection = ''
+ Option "AIGLX" "true"
+ #InputDevice "Mouse[0]"
+ '';
+
+ }
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
