Author: eelco Date: Sun Apr 1 16:47:16 2012 New Revision: 33521 URL: https://nixos.org/websvn/nix/?rev=33521&sc=1
Log: Modified: configurations/trunk/misc/eelco/mandark.nix Modified: configurations/trunk/misc/eelco/mandark.nix ============================================================================== --- configurations/trunk/misc/eelco/mandark.nix Sun Apr 1 15:32:48 2012 (r33520) +++ configurations/trunk/misc/eelco/mandark.nix Sun Apr 1 16:47:16 2012 (r33521) @@ -10,9 +10,17 @@ ./x11vnc.nix ]; + nixpkgs.config.firefox.enableGoogleTalkPlugin = true; + boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/sda"; boot.loader.grub.copyKernels = true; + boot.loader.grub.extraEntries = + '' + menuentry "Windows" { + chainloader (hd0,3)+1 + } + ''; boot.kernelPackages = pkgs.linuxPackages_3_2; boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; @@ -21,6 +29,12 @@ [ { mountPoint = "/"; label = "nixos"; } + { mountPoint = "/windows/c"; + device = "/dev/disk/by-label/OS"; + fsType = "ntfs"; + options = "uid=1000,fmask=177,dmask=077"; + noCheck = true; + } ]; networking = { @@ -134,7 +148,7 @@ printing.enable = true; printing.drivers = [ pkgs.foomatic_filters ]; - #postgresql.enable = true; + postgresql.enable = true; }; fonts = { @@ -217,4 +231,6 @@ * * / ''; */ + + hardware.cpu.intel.updateMicrocode = true; } _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits