summaryrefslogtreecommitdiffstats
path: root/tv/1systems/wu.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-10-27 18:12:29 +0100
committermakefu <github@syntax-fehler.de>2015-10-27 18:12:29 +0100
commita85114c59c5102b839584f72454bca2c8abbb887 (patch)
tree18fc24394171f4afae3dee0e68e3781df75723ea /tv/1systems/wu.nix
parentfe4f5b98b91f6bacb036d57b5322fb4e09c22f14 (diff)
parent20ad77468131b7c69c5b3a26ea149ae7fdc0173b (diff)
Merge branch 'master' of pnp:stockholm
Diffstat (limited to 'tv/1systems/wu.nix')
-rw-r--r--tv/1systems/wu.nix12
1 files changed, 2 insertions, 10 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index c691066cb..586ad1725 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -29,25 +29,16 @@ 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/test.nix
+ ../2configs/xserver
{
environment.systemPackages = with pkgs; [
# stockholm
genid
- git
gnumake
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; [
@@ -71,6 +62,7 @@ with lib;
bind # dig
cac
dic
+ ff
file
get
gitAndTools.qgit