Add nix-diff to environment

[perso/Immae/Config/Nix.git] / environments / immae-eu.nix

diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index e726c59f1107348ca40fa75bbe8507ad53fdb618..0d34ec4b0b8d0b50be841f901252794f79731dee 100644 (file)
--- 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
   # 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
     # unrar is unfree
 
     # backups


@@ -18,7 +18,7 @@ let
 
     # cryptocurrencies
     cardano cardano-cli sia monero
 
     # cryptocurrencies
     cardano cardano-cli sia monero

-    xmr-stak
+    # failing xmr-stak

     solc
     iota-cli-app
 
     solc
     iota-cli-app
 


@@ -54,7 +54,8 @@ let
     # monitoring
     cnagios mtop pg_activity nagios-cli mtr
     iftop htop iotop iperf bonfire
     # monitoring
     cnagios mtop pg_activity nagios-cli mtr
     iftop htop iotop iperf bonfire

-    goaccess tcpdump tshark tcpflow mitmproxy
+    goaccess tcpdump tshark tcpflow
+    mitmproxy

     # nagnu
 
     # messaging/forums/news
     # nagnu
 
     # messaging/forums/news


@@ -66,7 +67,7 @@ let
     # nix
     yarn2nix-moretea.yarn2nix nix
     nixops nix-prefetch-scripts nix-generate-from-cpan
     # nix
     yarn2nix-moretea.yarn2nix nix
     nixops nix-prefetch-scripts nix-generate-from-cpan

-    bundix nodePackages.bower2nix
+    bundix nodePackages.bower2nix nix-diff

     nodePackages.node2nix niv
     # (nixos {}).nixos-generate-config
     # (nixos {}).nixos-install
     nodePackages.node2nix niv
     # (nixos {}).nixos-generate-config
     # (nixos {}).nixos-install


@@ -117,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
     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
 
     # 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
     openvpn
 
     zsh-completions