X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=environments%2Fimmae-eu.nix;h=1da9373b6467d5018a12b3da37f901d2db572e33;hb=38ac9a5749743a95d27a5231d05eb93c2340e6bc;hp=fea96740b72bfcf8f4a8f2b53d0f8a8aa0498d7c;hpb=ca732a83f6d298847560f66b4aa4cb53011c0c88;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index fea9674..1da9373 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
@@ -31,7 +31,7 @@ let
     # e-mails
     muttprint mutt-ics
     notmuch-python2 notmuch-python3 notmuch-vim
-    neomutt mairix notmuch
+    neomutt mairix
     bogofilter fetchmail
     sieve-connect
 
@@ -64,9 +64,9 @@ let
     newsboat irssi
 
     # nix
-    mylibs.yarn2nixPackage.yarn2nix nix
+    yarn2nix-moretea.yarn2nix nix
     nixops nix-prefetch-scripts nix-generate-from-cpan
-    nix-zsh-completions bundix nodePackages.bower2nix
+    bundix nodePackages.bower2nix
     nodePackages.node2nix niv
     # (nixos {}).nixos-generate-config
     # (nixos {}).nixos-install
@@ -84,13 +84,14 @@ let
     rtorrent
     ldapvi
     fzf
-    buku
+    #buku # broken
     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 {