X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=environments%2Fimmae-eu.nix;h=4def84b5cab7a618489cb03d05688f3b5a1e27ed;hb=668ba4d439d3b60ade9f96fd158ed293ff211f60;hp=787d3033ad19a02c3aa0193be46c2a0c3398abc1;hpb=8c90ed19df42c1d7ee3b129e9e829c985a7cbaea;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index 787d303..4def84b 100644
--- a/environments/immae-eu.nix
+++ b/environments/immae-eu.nix
@@ -2,23 +2,27 @@
 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 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
-    xmr-stak
+    monero
+    cointop
+    # failing xmr-stak
     solc
     iota-cli-app
 
@@ -31,22 +35,22 @@ let
     # e-mails
     muttprint mutt-ics
     notmuch-python2 notmuch-python3 notmuch-vim
-    neomutt mairix notmuch
+    neomutt mairix
     bogofilter fetchmail
     sieve-connect
 
     # git
-    vcsh gitRepo gitAndTools.stgit tig ripgrep
+    vcsh gitRepo stgit tig ripgrep mr
 
     # graphical tools
     nextcloud-client firefox
-    dwm dmenu st
+    dwm dmenu st xorg.xauth tigervnc
 
     # images
     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,27 +58,29 @@ 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
-    mylibs.yarn2nixPackage.yarn2nix nix
+    yarn2nix-moretea.yarn2nix nixUnstable
     nixops nix-prefetch-scripts nix-generate-from-cpan
-    nix-zsh-completions bundix nodePackages.bower2nix
-    nodePackages.node2nix
+    bundix nodePackages.bower2nix nix-diff
+    nodePackages.node2nix niv
     # (nixos {}).nixos-generate-config
     # (nixos {}).nixos-install
     # (nixos {}).nixos-enter
     # (nixos {}).manual.manpages
 
     # note taking
-    note terminal-velocity jrnl
+    note terminal-velocity jrnl doing nb
 
     # office
     sc-im ranger
@@ -85,22 +91,27 @@ let
     ldapvi
     fzf
     buku
+    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
 
     # programming
     pelican emacs26-nox ctags
-    wdiff patch
+    wdiff patch gnumake
 
     # security
-    keybase
+    keybase gnupg
 
     # todolist/time management
-    taskwarrior vit timewarrior
+    taskwarrior vit timewarrior taskopen
+    bugwarrior
 
     # video/music
     youtube-dl ncmpc ncmpcpp ffmpeg
@@ -112,14 +123,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 openssl.doc openssl.man
+    sshfs ncdu procps-ng
 
     # 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
-    (ansible.override { python2 = python3; }) python3Packages.boto
+    ansible python3Packages.boto
     openvpn
+
+    zsh-completions
   ];
 in
 buildEnv {