[Nix-commits] SVN commit: nix - r33106 - configurations/trunk/misc/eelco

[Eelco Dolstra]

Author: eelco
Date: Thu Mar 15 13:23:05 2012
New Revision: 33106
URL: https://nixos.org/websvn/nix/?rev=33106&sc=1

Log:
* New laptop.

Added:
   configurations/trunk/misc/eelco/mandark.nix
      - copied, changed from r32967, configurations/trunk/misc/eelco/disabn.nix
Deleted:
   configurations/trunk/misc/eelco/disabn.nix
Modified:
   configurations/trunk/misc/eelco/x11vnc.nix

Copied and modified: configurations/trunk/misc/eelco/mandark.nix (from r32967, 
configurations/trunk/misc/eelco/disabn.nix)
==============================================================================
--- configurations/trunk/misc/eelco/disabn.nix  Fri Mar  9 21:34:21 2012        
(r32967, copy source)
+++ configurations/trunk/misc/eelco/mandark.nix Thu Mar 15 13:23:05 2012        
(r33106)
@@ -1,10 +1,11 @@
-{ pkgs, config, modulesPath, ... }:
+{ pkgs, config, ... }:
 
 {
   require = 
-    [ "${modulesPath}/hardware/network/intel-6000.nix"
-      "${modulesPath}/hardware/network/intel-5000.nix"
-      "${modulesPath}/programs/virtualbox.nix"
+    [ <nixos/modules/hardware/network/intel-6000.nix>
+      <nixos/modules/hardware/network/intel-5000.nix>
+      <nixos/modules/programs/virtualbox.nix>
+      <nixos/modules/installer/scan/not-detected.nix>
       ./logicblox.nix
       ./x11vnc.nix
     ];
@@ -13,6 +14,7 @@
   boot.loader.grub.device = "/dev/sda";
   boot.loader.grub.copyKernels = true;
 
+  boot.kernelPackages = pkgs.linuxPackages_3_2;
   boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
 
   fileSystems = 
@@ -22,17 +24,13 @@
     ];
 
   networking = {
-    hostName = "disabn";
+    hostName = "mandark";
     wireless.enable = true;
-    defaultMailServer.directDelivery = true;
-    defaultMailServer.hostName = "mail.st.ewi.tudelft.nl";
-    #defaultMailServer.hostName = "mail.xs4all.nl";
+    #defaultMailServer.directDelivery = true;
+    #defaultMailServer.hostName = "mail.st.ewi.tudelft.nl";
     firewall.enable = true;
     firewall.allowPing = true;
     firewall.rejectPackets = true;
-    #firewall.logRefusedPackets = true;
-    #firewall.logRefusedUnicastsOnly = false;
-    #bridges.veth0.interfaces = [ "eth0" ];
   };
 
   environment.systemPackages =
@@ -131,8 +129,6 @@
 
       desktopManager.kde4.enable = true;
       #desktopManager.xfce.enable = true;
-      
-      #windowManager.compiz.enable = true;
     };
 
     printing.enable = true;

Modified: configurations/trunk/misc/eelco/x11vnc.nix
==============================================================================
--- configurations/trunk/misc/eelco/x11vnc.nix  Thu Mar 15 11:29:13 2012        
(r33105)
+++ configurations/trunk/misc/eelco/x11vnc.nix  Thu Mar 15 13:23:05 2012        
(r33106)
@@ -3,7 +3,7 @@
 {
   jobs.x11vnc =
     { startOn = "started xserver";
-      exec = "${pkgs.su}/bin/su - eelco -c 'DISPLAY=:0.0 
${pkgs.x11vnc}/bin/x11vnc -unixpw eelco'";
+      exec = "${pkgs.su}/bin/su - eelco -c 'DISPLAY=:0.0 
PATH=${pkgs.openssl}/bin:$PATH ${pkgs.x11vnc}/bin/x11vnc -unixpw eelco'";
     };
 
   networking.firewall.allowedTCPPorts = [ 5900 ];
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits