Author: maggesi
Date: Mon Apr 9 17:07:23 2012
New Revision: 33687
URL: https://nixos.org/websvn/nix/?rev=33687&sc=1
Log:
Update virtux configuration
Modified:
configurations/trunk/misc/z77z/virtux.nix
Modified: configurations/trunk/misc/z77z/virtux.nix
==============================================================================
--- configurations/trunk/misc/z77z/virtux.nix Mon Apr 9 13:04:58 2012
(r33686)
+++ configurations/trunk/misc/z77z/virtux.nix Mon Apr 9 17:07:23 2012
(r33687)
@@ -11,7 +11,6 @@
texLiveBeamer lmodern texLiveContext
];
myTexLive = pkgs.texLiveAggregationFun { paths = texLivePaths; };
- linuxPackages = pkgs.linuxPackages_2_6_32; # For BLCR
in
{
boot = {
@@ -24,7 +23,7 @@
loader.grub.device = "/dev/sda";
initrd.kernelModules = [ "ata_piix" "fuse" ];
initrd.enableSplashScreen = false;
- kernelPackages = linuxPackages;
+ #kernelPackages = pkgs.linuxPackages_2_6_32; # For BLCR
};
fileSystems = [ { label = "nixos"; mountPoint = "/"; } ];
@@ -61,7 +60,7 @@
default = "xfce";
#default = "kde4";
xfce.enable = true;
- kde4.enable = true;
+ kde4.enable = false;
};
displayManager.auto = { enable = true; user = "maggesi"; };
@@ -94,12 +93,15 @@
systemPackages = [
pkgs.emacs
- pkgs.firefox
- #pkgs.mc
+ pkgs.firefoxWrapper
+ pkgs.chromeWrapper
+ pkgs.mc
#pkgs.openoffice
- pkgs.screen
+ #pkgs.screen
pkgs.subversion
- pkgs.adobeReader
+ #pkgs.adobeReader
+ #pkgs.fossil
+ #pkgs.coq
# Xmonad/dwm related
# pkgs.dwm pkgs.dmenu
@@ -119,7 +121,7 @@
};
security = {
- extraSetuidPrograms = [ "reboot" "halt" ];
+ setuidPrograms = [ "reboot" "halt" ];
sudo.enable = true;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
