From f3f4e855600a10cc1ae7275f9ecf302160430b6a Mon Sep 17 00:00:00 2001
From: Openlab Labtop <kontakt@openlab-augsburg.de>
Date: Wed, 24 Feb 2016 02:12:47 +0000
Subject: machines/labtop: switch to gnome3

---
 machines/labnet/labtop.nix | 39 +++++----------------------------------
 1 file changed, 5 insertions(+), 34 deletions(-)

(limited to 'machines/labnet')

diff --git a/machines/labnet/labtop.nix b/machines/labnet/labtop.nix
index b3943204..a206f93c 100644
--- a/machines/labnet/labtop.nix
+++ b/machines/labnet/labtop.nix
@@ -1,28 +1,6 @@
 { pkgs, lib, ... }:
 
 let
-  greybird = pkgs.stdenv.mkDerivation {
-    name = "greybird-xfce-theme";
-
-    src = pkgs.fetchFromGitHub {
-      repo = "Greybird";
-      owner = "shimmerproject";
-      rev = "61ec18d22780aa87998381599c941e0cf4f7bfb5";
-      sha256 = "03h8hba4lfp337a4drylcplrbggry9gz8dq1f3gjy25fhqkgvq05";
-    };
-
-    phases = [ "unpackPhase" "installPhase" ];
-
-    installPhase = ''
-      mkdir -p "$out/share/themes/Greybird" \
-               "$out/share/themes/Greybird-compact/xfwm4"
-      cp -vrt "$out/share/themes/Greybird" \
-        gtk-* metacity-1 unity xfce-notify-4.0 xfwm4
-      cp -vrt "$out/share/themes/Greybird-compact/xfwm4" \
-        xfwm4_compact/*
-    '';
-  };
-
   modulesPath = "${import ../../nixpkgs-path.nix}/nixos/modules";
 
 in {
@@ -48,6 +26,8 @@ in {
 
   vuizvui.hardware.thinkpad.enable = true;
 
+  hardware.trackpoint.enable = false;
+
   environment.systemPackages = with pkgs; [
     #repetierhost <- TODO
     ack
@@ -85,20 +65,11 @@ in {
     displayManager.auto.enable = true;
     displayManager.auto.user = "openlab";
     desktopManager.gnome3.enable = true;
-    # synaptics.enable = true;
-    # synaptics.minSpeed = "0.5";
-    # synaptics.accelFactor = "0.01";
+    synaptics.enable = true;
+    synaptics.minSpeed = "0.5";
+    synaptics.accelFactor = "0.01";
   };
 
-
-  # hardware.trackpoint = {
-  #   enable = true;
-  #   emulateWheel = true;
-  #   sensitivity = 130;
-  #   speed = 350;
-  # };
-
-
   services.openssh.enable = true;
 
   networking.networkmanager.enable = true;
-- 
cgit 1.4.1