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

diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index dddc1fd..52cdfcb 100644
--- a/environments/immae-eu.nix
+++ b/environments/immae-eu.nix
@@ -2,6 +2,9 @@
 let
   # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh
   # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks
+  vlock' = vlock.overrideAttrs(old: {
+    configureFlags = old.configureFlags ++ [ "--enable-root-password=no" ];
+  });
   paths = [
     # archives
     lzo unzip bzip2 xz
@@ -11,14 +14,15 @@ let
     duply
 
     # calendar/contacts
-    abook khard khal cadaver vdirsyncer pal
+    abook khard khal cadaver vdirsyncerStable pal
 
     # computing
     boinctui
 
     # cryptocurrencies
-    cardano cardano-cli sia monero
-    xmr-stak
+    monero
+    cointop
+    # failing xmr-stak
     solc
     iota-cli-app
 
@@ -36,7 +40,7 @@ let
     sieve-connect
 
     # git
-    vcsh gitRepo gitAndTools.stgit tig ripgrep mr
+    vcsh gitRepo stgit tig ripgrep mr delta
 
     # graphical tools
     nextcloud-client firefox
@@ -46,7 +50,7 @@ let
     feh imagemagick tiv graphicsmagick qrcode
 
     # internet browsing
-    w3m lynx links elinks browsh weboob urlview urlscan googler urlwatch
+    w3m lynx links elinks browsh woob urlview urlscan googler urlwatch
 
     # less
     python3Packages.pygments lesspipe highlight sourceHighlight
@@ -54,19 +58,21 @@ 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
+    signal-cli signaldctl
     telegram-cli telegram-history-dump telegramircd
     weechat profanity
     newsboat irssi
 
     # nix
-    yarn2nix-moretea.yarn2nix nix
+    yarn2nix-moretea.yarn2nix nixUnstable
     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
@@ -74,7 +80,7 @@ let
     # (nixos {}).manual.manpages
 
     # note taking
-    note terminal-velocity jrnl doing
+    note terminal-velocity jrnl doing nb
 
     # office
     sc-im ranger
@@ -97,14 +103,15 @@ let
     pdftk poppler_utils
 
     # programming
-    pelican emacs26-nox ctags
+    emacs26-nox ctags
     wdiff patch gnumake
 
     # security
     keybase gnupg
 
     # todolist/time management
-    taskwarrior vit timewarrior
+    taskwarrior vit timewarrior taskopen
+    bugwarrior
 
     # video/music
     youtube-dl ncmpc ncmpcpp ffmpeg
@@ -116,10 +123,11 @@ 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 openssl.doc openssl.man
+    vlock' mosh manpages openssl openssl.doc openssl.man
+    sshfs ncdu procps-watch8bit
 
     # other tools
-    pgloader s3cmd lftp jq cpulimit libxslt gandi-cli
+    pgloader s3cmd lftp jq cpulimit libxslt gandi-cli bubblewrap
 
     # Terraform + AWS
     terraform_0_12 awscli
@@ -127,6 +135,9 @@ let
     openvpn
 
     zsh-completions
+
+    hetzner
+    smartmontools
   ];
 in
 buildEnv {