diff options
author | Profpatsch <mail@profpatsch.de> | 2016-02-26 03:18:37 +0100 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2016-02-26 03:18:37 +0100 |
commit | 4b435f20075d73cfcea7c7a9c2ebebb86015c818 (patch) | |
tree | f842bbe57c87ac3f5a93d63af752b7cd2d21418e /machines/labnet/labtop.nix | |
parent | 3cbe26730d6e7b64040979d512afe46f90ed33ab (diff) | |
parent | f3f4e855600a10cc1ae7275f9ecf302160430b6a (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'machines/labnet/labtop.nix')
-rw-r--r-- | machines/labnet/labtop.nix | 44 |
1 files changed, 7 insertions, 37 deletions
diff --git a/machines/labnet/labtop.nix b/machines/labnet/labtop.nix index 65e3723d..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 @@ -62,7 +42,6 @@ in { gimp git gmpc - vuizvui.greybird-xfce-theme inkscape ino (libreoffice.overrideDerivation (lib.const { doCheck = false; })) @@ -85,21 +64,12 @@ in { displayManager.auto.enable = true; displayManager.auto.user = "openlab"; - desktopManager.xfce.enable = true; - # synaptics.enable = true; - # synaptics.minSpeed = "0.5"; - # synaptics.accelFactor = "0.01"; + desktopManager.gnome3.enable = true; + 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; @@ -114,7 +84,7 @@ in { nix.maxJobs = 2; users.mutableUsers = false; - users.extraUsers.openlab = { + users.users.openlab = { uid = 1000; isNormalUser = true; password = "openlab"; |