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

diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index fea9674..a398359 100644
--- a/environments/immae-eu.nix
+++ b/environments/immae-eu.nix
@@ -4,21 +4,21 @@ 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
     duply
 
     # calendar/contacts
-    abook khard khal cadaver vdirsyncer pal
+    abook khard khal cadaver vdirsyncerStable pal
 
     # computing
     boinctui
 
     # cryptocurrencies
-    cardano cardano-cli sia monero_0_15_0_0
-    xmr-stak
+    monero
+    # failing 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
 
@@ -54,19 +54,20 @@ let
     # 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
-    #flrn slrn
+    flrn slrn
     telegram-cli telegram-history-dump telegramircd
     weechat profanity
     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 nix-diff
     nodePackages.node2nix niv
     # (nixos {}).nixos-generate-config
     # (nixos {}).nixos-install
@@ -74,7 +75,7 @@ let
     # (nixos {}).manual.manpages
 
     # note taking
-    note terminal-velocity jrnl doing
+    note terminal-velocity jrnl doing nb
 
     # office
     sc-im ranger
@@ -88,9 +89,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
@@ -103,7 +105,8 @@ let
     keybase gnupg
 
     # todolist/time management
-    taskwarrior vit timewarrior
+    taskwarrior vit timewarrior taskopen
+    bugwarrior
 
     # video/music
     youtube-dl ncmpc ncmpcpp ffmpeg
@@ -115,15 +118,18 @@ 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
+    sshfs ncdu procps-ng
 
     # 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 {