diff options
| author | nin <nineinchnade@gmail.com> | 2017-07-06 20:36:05 +0200 |
|---|---|---|
| committer | nin <nineinchnade@gmail.com> | 2017-07-06 20:36:05 +0200 |
| commit | de8baa21bf122242c4ad6a4c17405259037149c8 (patch) | |
| tree | 85e34f8040799313fa73a23eddb41ab5eec1d9e9 /makefu/2configs/tools | |
| parent | 060ae725c32e6490d47bc3153de076ace26b59fd (diff) | |
| parent | 438fdd2bd8e363567f544966e49d00f728921301 (diff) | |
Merge branch 'master' of prism:stockholm
Diffstat (limited to 'makefu/2configs/tools')
| -rw-r--r-- | makefu/2configs/tools/dev.nix | 3 | ||||
| -rw-r--r-- | makefu/2configs/tools/extra-gui.nix | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix index 4fe7f8bf4..42006eb22 100644 --- a/makefu/2configs/tools/dev.nix +++ b/makefu/2configs/tools/dev.nix @@ -12,5 +12,8 @@ cac-api cac-panel ovh-zone + whatsupnix + brain + gen-oath-safe ]; } diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix index 56cdccd1f..1e68e935c 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 ]; } |