diff options
author | lassulus <lass@aidsballs.de> | 2015-10-25 21:27:14 +0100 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2015-10-25 21:27:14 +0100 |
commit | cc5220a4477e290f1833e609fed1e0f9f56e4a41 (patch) | |
tree | f7032b6126c6daac3e2d2e5ad9c5d628a7a3e34a /tv/1systems/wu.nix | |
parent | ace11d79badafce313b17c968701739513e95982 (diff) | |
parent | cca25c7b66c44e0ec826d466bd48f2463df03fe9 (diff) |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'tv/1systems/wu.nix')
-rw-r--r-- | tv/1systems/wu.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 89ad257f0..a5232c9e1 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -29,8 +29,7 @@ with lib; #../2configs/consul-client.nix ../2configs/git.nix ../2configs/mail-client.nix - ../2configs/xserver.nix - ../2configs/synaptics.nix # TODO w110er if xserver is enabled + ../2configs/xserver ../2configs/test.nix { environment.systemPackages = with pkgs; [ @@ -41,12 +40,6 @@ with lib; hashPassword lentil parallel - (pkgs.writeScriptBin "ff" '' - #! ${pkgs.bash}/bin/bash - exec sudo -u ff -i <<EOF - exec ${pkgs.firefoxWrapper}/bin/firefox $(printf " %q" "$@") - EOF - '') (pkgs.writeScriptBin "im" '' #! ${pkgs.bash}/bin/bash export PATH=${makeSearchPath "bin" (with pkgs; [ @@ -70,6 +63,7 @@ with lib; bind # dig cac dic + ff file get gitAndTools.qgit |