diff options
author | lassulus <lass@lassul.us> | 2017-06-27 20:55:19 +0200 |
---|---|---|
committer | lassulus <lass@lassul.us> | 2017-06-27 20:55:19 +0200 |
commit | 7b43fe5543e20a50d06ebbbb08a9461859b48460 (patch) | |
tree | 9c30ef11e9ea852c3232478045e48c5d73341fe9 /makefu/2configs/tools | |
parent | 0e607fe1bc50b596301086b064a74232d7126f5c (diff) | |
parent | d58e8035b4101b20539279247ec083b72ba0a647 (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 4fe7f8bf4..e40f5b36f 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 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 ]; } |