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

diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index 787d303..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
@@ -31,16 +31,16 @@ 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 gitAndTools.stgit tig ripgrep mr
 
     # graphical tools
     nextcloud-client firefox
-    dwm dmenu st
+    dwm dmenu st xorg.xauth tigervnc
 
     # images
     feh imagemagick tiv graphicsmagick qrcode
@@ -64,17 +64,17 @@ 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
-    nodePackages.node2nix
+    bundix nodePackages.bower2nix
+    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
 
     # office
     sc-im ranger
@@ -84,20 +84,24 @@ 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
 
     # programming
     pelican emacs26-nox ctags
-    wdiff patch
+    wdiff patch gnumake
 
     # security
-    keybase
+    keybase gnupg
 
     # todolist/time management
     taskwarrior vit timewarrior
@@ -112,14 +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 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 {