X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=overlays%2Fenvironments%2Fimmae-eu.nix;h=6287a97b962514279728cbd796194ae76dbcacd8;hb=c69634936c66ccdeaabadda5d3bd42848d374778;hp=9f044d5ea96b5bc000eeb8fed9f9d2fed1635fc2;hpb=1449c51fee2063b17ec9ea80658f0fa521743c75;p=perso%2FImmae%2FConfig%2FNix%2FNUR.git

diff --git a/overlays/environments/immae-eu.nix b/overlays/environments/immae-eu.nix
index 9f044d5e..6287a97b 100644
--- a/overlays/environments/immae-eu.nix
+++ b/overlays/environments/immae-eu.nix
@@ -17,7 +17,7 @@ let
     boinctui
 
     # cryptocurrencies
-    cardano sia monero
+    cardano cardano-cli sia monero
     xmr-stak
     solc
     iota-cli-app
@@ -33,37 +33,38 @@ let
     notmuch-python2 notmuch-python3 notmuch-vim
     neomutt mairix notmuch
     bogofilter fetchmail
+    sieve-connect
 
     # git
-    vcsh gitRepo gitAndTools.stgit tig
+    vcsh gitRepo gitAndTools.stgit tig ripgrep
 
     # graphical tools
     nextcloud-client firefox
     dwm dmenu st
 
     # images
-    feh imagemagick tiv graphicsmagick
+    feh imagemagick tiv graphicsmagick qrcode
 
     # internet browsing
-    w3m lynx links elinks browsh weboob urlview googler urlwatch
+    w3m lynx links elinks browsh weboob urlview urlscan googler urlwatch
 
     # less
     python3Packages.pygments lesspipe highlight sourceHighlight
 
     # monitoring
     cnagios mtop pg_activity nagios-cli mtr
-    iftop htop iotop iperf
-    goaccess
+    iftop htop iotop iperf bonfire
+    goaccess tcpdump tshark tcpflow mitmproxy
     # nagnu
 
     # messaging/forums/news
-    flrn slrn
+    #flrn slrn
     telegram-cli telegram-history-dump telegramircd
     weechat profanity
     newsboat irssi
 
     # nix
-    mylibs.yarn2nixPackage.yarn2nix
+    mylibs.yarn2nixPackage.yarn2nix nix
     nixops nix-prefetch-scripts nix-generate-from-cpan
     nix-zsh-completions bundix nodePackages.bower2nix
     nodePackages.node2nix
@@ -82,6 +83,8 @@ let
     tmux
     rtorrent
     ldapvi
+    fzf
+    buku
 
     # password management
     pass apg pwgen
@@ -91,7 +94,7 @@ let
 
     # programming
     pelican emacs26-nox ctags
-    wdiff
+    wdiff patch
 
     # security
     keybase
@@ -102,8 +105,21 @@ let
     # video/music
     youtube-dl ncmpc ncmpcpp ffmpeg
 
+    # s6 tools (part of skawarePackages)
+    skalibs execline s6 s6-dns s6-linux-utils s6-networking
+    s6-portable-utils
+
+    # system tools
+    telnet bind.dnsutils httpie ngrep nmap p0f socat lsof psmisc
+    wget patchelf rename tmux (lib.meta.hiPrio nettools)
+
     # other tools
-    pgloader s3cmd lftp jq cpulimit libxslt
+    pgloader s3cmd lftp jq cpulimit libxslt gandi-cli
+
+    # Terraform + AWS
+    terraform_0_12 awscli
+    (ansible.override { python2 = python3; }) python3Packages.boto
+    openvpn
   ];
 in
 {
@@ -112,5 +128,6 @@ in
     inherit paths;
     pathsToLink = [ "/bin" "/etc" "/include" "/lib" "/libexec" "/share"];
     extraOutputsToInstall = [ "bin" "man" "doc" "info" ];
+    passthru = { packages = paths; };
   };
 }