diff options
author | tv <tv@krebsco.de> | 2017-06-29 22:04:58 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2017-06-29 22:04:58 +0200 |
commit | 077a6a699129416cdeb0a9da3aba30d156e46b7a (patch) | |
tree | d5588c0024a942fef6f4d597aedac5708dd7fa45 /makefu/2configs/tools | |
parent | 10adb2d27e3005c7239585eb38dbbe3b5b01a400 (diff) | |
parent | 51e091c7c3fb52579bc9ed59d1c7db633cd24e5b (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/tools')
-rw-r--r-- | makefu/2configs/tools/dev.nix | 2 | ||||
-rw-r--r-- | makefu/2configs/tools/extra-gui.nix | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix index 4fe7f8bf..e40f5b36 100644 --- a/makefu/2configs/tools/dev.nix +++ b/makefu/2configs/tools/dev.nix @@ -12,5 +12,7 @@ cac-api cac-panel ovh-zone + whatsupnix + brain ]; } diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix index 56cdccd1..1e68e935 100644 --- a/makefu/2configs/tools/extra-gui.nix +++ b/makefu/2configs/tools/extra-gui.nix @@ -2,13 +2,16 @@ { krebs.per-user.makefu.packages = with pkgs;[ + # media gimp inkscape libreoffice - saleae-logic skype synergy tdesktop virtmanager + # Dev + saleae-logic + arduino-user-env ]; } |