X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=environments%2Fimmae-eu.nix;h=dddc1fd10cf7d978e6768f310e266464ab414f95;hb=f9914beb086a06e290287f299ae2c2026924a780;hp=4fdf121afe25704b2f685bfe3606e3c7c4af3415;hpb=b23c5027b611a40ad348aaaa60cb8419fb7e1ba9;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index 4fdf121..dddc1fd 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
@@ -17,7 +17,7 @@ let
     boinctui
 
     # cryptocurrencies
-    cardano cardano-cli sia monero_0_15_0_0
+    cardano cardano-cli sia monero
     xmr-stak
     solc
     iota-cli-app
@@ -64,7 +64,7 @@ let
     newsboat irssi
 
     # nix
-    mylibs.yarn2nixPackage.yarn2nix nix
+    yarn2nix-moretea.yarn2nix nix
     nixops nix-prefetch-scripts nix-generate-from-cpan
     bundix nodePackages.bower2nix
     nodePackages.node2nix niv
@@ -88,9 +88,10 @@ let
     vimPlugins.vim-plug
     (vim_configurable.override { python = python3; })
     mailcap
+    webapps.surfer
 
     # password management
-    pass apg pwgen
+    (pass.withExtensions (exts: [ exts.pass-otp ])) apg pwgen
 
     # pdf
     pdftk poppler_utils
@@ -115,15 +116,17 @@ let
     # system tools
     telnet bind.dnsutils httpie ngrep nmap p0f socat lsof psmisc
     wget patchelf rename tmux (lib.meta.hiPrio nettools)
-    vlock mosh manpages openssl
+    vlock mosh manpages openssl openssl.doc openssl.man
 
     # 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
   ];
 in
 buildEnv {