summaryrefslogtreecommitdiffstats
path: root/tv/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-10-25 00:23:59 +0200
committermakefu <github@syntax-fehler.de>2015-10-25 00:23:59 +0200
commitc62885a0bcf4a1a09400aa69d83723857ab558d8 (patch)
tree2df3980c179c8da1ffb584fe9dd73f66da09d347 /tv/1systems
parenta1d05482e5527d32baef9d9343b900dee8d46694 (diff)
parenta4d7f920bf49de6237191558d02b0f58ed307fd4 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/1systems')
-rw-r--r--tv/1systems/wu.nix10
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