X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=environments%2Fimmae-eu.nix;h=05ac857855c0b620f31850825f1d64ab308986e3;hb=69e6151c0c324f920eccb34568ed7ff523592589;hp=a7dfda192a496e597b35ef0fc8cf3bd2473907f3;hpb=840812f2980b77ea93e74666f80a7e0fe5b633eb;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index a7dfda1..05ac857 100644
--- a/environments/immae-eu.nix
+++ b/environments/immae-eu.nix
@@ -4,7 +4,7 @@ let
   # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks
   paths = [
     # archives
-    lzo unzip bzip2 p7zip xz
+    lzo unzip bzip2 xz
     # unrar is unfree
 
     # backups
@@ -54,7 +54,8 @@ let
     # monitoring
     cnagios mtop pg_activity nagios-cli mtr
     iftop htop iotop iperf bonfire
-    goaccess tcpdump tshark tcpflow mitmproxy
+    goaccess tcpdump tshark tcpflow
+    # failing mitmproxy
     # nagnu
 
     # messaging/forums/news
@@ -88,6 +89,7 @@ let
     vimPlugins.vim-plug
     (vim_configurable.override { python = python3; })
     mailcap
+    webapps.surfer
 
     # password management
     (pass.withExtensions (exts: [ exts.pass-otp ])) apg pwgen
@@ -116,13 +118,14 @@ let
     telnet bind.dnsutils httpie ngrep nmap p0f socat lsof psmisc
     wget patchelf rename tmux (lib.meta.hiPrio nettools)
     vlock mosh manpages openssl openssl.doc openssl.man
+    sshfs
 
     # other tools
     pgloader s3cmd lftp jq cpulimit libxslt gandi-cli
 
     # Terraform + AWS
     terraform_0_12 awscli
-    (ansible.override { python2 = python3; }) python3Packages.boto
+    ansible python3Packages.boto
     openvpn
 
     zsh-completions