Author: raskin
Date: Mon Aug 22 17:38:54 2011
New Revision: 28755
URL: https://svn.nixos.org/websvn/nix/?rev=28755&sc=1
Log:
updates - moslty to package set
Modified:
configurations/trunk/misc/raskin/filesystems-asus-n53j.nix
configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix
configurations/trunk/misc/raskin/package-groups.nix
configurations/trunk/misc/raskin/raskin-asus-n53j.nix
configurations/trunk/misc/raskin/services-main.nix
Modified: configurations/trunk/misc/raskin/filesystems-asus-n53j.nix
==============================================================================
--- configurations/trunk/misc/raskin/filesystems-asus-n53j.nix Mon Aug 22
17:38:53 2011 (r28754)
+++ configurations/trunk/misc/raskin/filesystems-asus-n53j.nix Mon Aug 22
17:38:54 2011 (r28755)
@@ -64,10 +64,10 @@
device="debugfs";
fsType = "debugfs";
}
- { mountPoint = "/dev/cgroup/cpu";
+ { mountPoint = "/dev/cgroup/";
device = "cgroup";
fsType = "cgroup";
- options = "cpu";
+ options = "cpu,ns,cpuset,freezer,devices";
autocreate = true;
}
]
Modified: configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix
==============================================================================
--- configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Mon Aug
22 17:38:53 2011 (r28754)
+++ configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Mon Aug
22 17:38:54 2011 (r28755)
@@ -25,7 +25,6 @@
{name="xkill"; path=xorg.xkill;}
{name="vim"; path=customVim pkgs;}
{name="uzbl"; path=uzbl.passthru.function { src = ("" +
/var/repos/uzbl + "/"); };}
- {name="kdebindings"; path=kde4.kdebindings;}
{name="ant+jdk-1.5"; path=symlinkJoin "ant+jdk-1.5" [jdk5
(apacheAnt.override {jdk=jdk5;})];}
] ++ (map justUse ["mesa" "freeglut" "cairo" "nss" "gsl"
"libev" "libuuid" "pyxml" "libxml2" "zlib" "rubygems"
@@ -39,6 +38,7 @@
"dejavu_fonts" "e2fsprogs" "dmtx" "qt4"
#"empathy"
"hicolor_icon_theme" "libfixposix" "plan9port"
+ "pygtk" "pygobject" "pycairo"
])
++
[
Modified: configurations/trunk/misc/raskin/package-groups.nix
==============================================================================
--- configurations/trunk/misc/raskin/package-groups.nix Mon Aug 22 17:38:53
2011 (r28754)
+++ configurations/trunk/misc/raskin/package-groups.nix Mon Aug 22 17:38:54
2011 (r28755)
@@ -38,11 +38,11 @@
xsane saneBackends saneFrontends gphoto2 gphoto2fs
- gpm setserial gnokii
+ gpm setserial gnokii v4l_utils
fbterm dd_rescue ddrescue baseKernel.kernelPackages.kernel
- blueman bluez
+ blueman bluez acpi acpitool
hplip foo2zjs foomatic_filters
@@ -81,7 +81,7 @@
sshfsFuse fuse fusesmb ntfs3g
glusterfs smbnetfs
- # (pkgs.linuxPackagesFor baseKernel).aufs2_util
+ #(pkgs.linuxPackagesFor baseKernel).aufs2_1_util
];
networkTools
@@ -89,15 +89,15 @@
iputils ncat wpa_supplicant iproute lftp
iptables samba wget telnet nmap ntp nc6
socat2pre msf dhcp gvpe bridge_utils mtr
- ndisc6 vlan wavemon openvpn iperf
+ ndisc6 vlan wavemon openvpn iperf vde2
];
browsers = [
opera chromeWrapper
- #firefox36Wrapper
- mozplugger firefox40Pkgs.xulrunner
- (wrapFirefox firefox40Pkgs.firefox "firefox" "4")
- (wrapFirefox firefox50Pkgs.firefox "firefox" "")
+ mozplugger
+
+ (wrapFirefox firefox50Pkgs.firefox "firefox" "5")
+ (wrapFirefox firefox70b1Pkgs.firefox "firefox" "")
];
graphicEdit = [
@@ -193,7 +193,7 @@
gst_all.gstPluginsBase
gst_all.gstPluginsGood
gst_all.gstFfmpeg
- xineUI espeak lame
+ xineUI espeak lame flite
];
buildSupport = [
@@ -232,12 +232,12 @@
# gdmap - disk usage and its accumulation through
# directory tree
- gdmap xfig gnuplot /*freemind*/ transfig xxdiff
- gqview pqiv webkit dia midori /*xawtv*/
+ gdmap xfig gnuplot freemind transfig xxdiff
+ gqview pqiv webkit dia midori
gnome.zenity xclip welkin
/*netsurfBrowser*/ geeqie
gosmore tulip merkaartor
- pp.uzbl sonicVisualiser
+ pp.uzbl /*sonic_visualiser*/
];
clientServer = [
@@ -269,7 +269,7 @@
inetutils netkittftp nodejs
/*(ikiwiki.override { extraUtils = [
"/var/run/current-system/sw" ] ;})*/
redstore rdf4store joseki
- ppp nssTools myKDE.kdenetwork
+ ppp nssTools
tcpdump freeswitch wvdial
];
@@ -286,7 +286,7 @@
consoleEditors = [
(import ./custom-vim.nix pkgs)
- emacs mc bvi
+ emacs mc bvi vifm
];
GCPin = [
@@ -301,7 +301,7 @@
url =
http://www.kde-look.org/CONTENT/content-files/58501-green.tar.gz;
sha256 =
"0sdykpziij1f3w4braq8r8nqg4lnsd7i7gi1k5d7c31m2q3b9a7r";
})
- linuxPackages.aufs.src flashplayer.src
+ flashplayer.src
stumpwm jwm
#kernelPackages.iwlwifi
];
Modified: configurations/trunk/misc/raskin/raskin-asus-n53j.nix
==============================================================================
--- configurations/trunk/misc/raskin/raskin-asus-n53j.nix Mon Aug 22
17:38:53 2011 (r28754)
+++ configurations/trunk/misc/raskin/raskin-asus-n53j.nix Mon Aug 22
17:38:54 2011 (r28755)
@@ -39,8 +39,8 @@
};
myKDE = pkgs.kde45;
kernelToUse = rec {
- kernelPackages = pkgs.linuxPackagesFor pkgs.linux_2_6_39 kernelPackages;
- extraModulePackages = [kernelPackages.acpi_call];
+ kernelPackages = pkgs.linuxPackagesFor pkgs.linux_3_0 kernelPackages;
+ extraModulePackages = [kernelPackages.acpi_call
/*kernelPackages.aufs2_1*/];
};
packageGroups = import
/etc/nixos/configurations/misc/raskin/package-groups.nix {
inherit pkgs myTexLive myKDE;
@@ -90,6 +90,7 @@
"cpufreq-ondemand" "configs" "rtc-cmos"
"cdc-acm" "ppp-generic" "ppp-async"
"ppp-deflate" "bsd-comp" "cdc-phonet"
+ "uvcvideo" "cls-cgroup" "blk-cgroup"
];
hardwareScan = false;
resumeDevice = "8:8";
@@ -187,9 +188,11 @@
description = "Create cgroup where user can create subgroups";
startOn = "filesystem";
script = ''
- mkdir -m 0777 /dev/cgroup/cpu/user
- echo -n /etc/sudo-scripts/clean-cgroup >
/dev/cgroup/cpu/release_agent
+ mkdir -m 0777 /dev/cgroup/user
+ echo -n /etc/sudo-scripts/clean-cgroup >
/dev/cgroup/release_agent
'';
+ respawn = false;
+ task = true;
};
networkInterfaces.startOn = "never";
nscd.startOn = "never";
@@ -281,6 +284,7 @@
hardware = {
firmware = ["/var/lib/firmware"];
+ bluetooth.enable = true;
};
powerManagement = {
Modified: configurations/trunk/misc/raskin/services-main.nix
==============================================================================
--- configurations/trunk/misc/raskin/services-main.nix Mon Aug 22 17:38:53
2011 (r28754)
+++ configurations/trunk/misc/raskin/services-main.nix Mon Aug 22 17:38:54
2011 (r28755)
@@ -108,7 +108,9 @@
cron = {
systemCronJobs = [
- "0 0-23/6 * * * rm /var/log/gw6c.*.log"
+ "0 0-23/6 * * * root rm /var/log/gw6c.*.log"
+ "0 5 * * * root cd /root && /home/raskin/script/mtn-pending-changes >
/root/.mtn-pending-changes"
+ "10 5 * * * raskin cd /home/raskin &&
/home/raskin/script/mtn-pending-changes > /home/raskin/.mtn-pending-changes"
];
};
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
