Add new packages to environment

diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index 4def84b5cab7a618489cb03d05688f3b5a1e27ed..52cdfcb57fa382a4df5c571bae72da01a1620251 100644 (file)
--- a/environments/immae-eu.nix
+++ b/environments/immae-eu.nix
@@ -40,7 +40,7 @@ let
     sieve-connect
 
     # git
-    vcsh gitRepo stgit tig ripgrep mr
+    vcsh gitRepo stgit tig ripgrep mr delta
 
     # graphical tools
     nextcloud-client firefox
@@ -103,7 +103,7 @@ let
     pdftk poppler_utils
 
     # programming
-    pelican emacs26-nox ctags
+    emacs26-nox ctags
     wdiff patch gnumake
 
     # security
@@ -124,7 +124,7 @@ let
     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
+    sshfs ncdu procps-watch8bit
 
     # other tools
     pgloader s3cmd lftp jq cpulimit libxslt gandi-cli bubblewrap
@@ -135,6 +135,9 @@ let
     openvpn
 
     zsh-completions
+
+    hetzner
+    smartmontools
   ];
 in
 buildEnv {

diff --git a/flakes/backports/flake.nix b/flakes/backports/flake.nix
index bd31ed54d2a3ca3065aad545b175367260085ee1..cb558d463c91580d9511e224a2b988fbfbb5b07d 100644 (file)
--- a/flakes/backports/flake.nix
+++ b/flakes/backports/flake.nix
@@ -13,15 +13,18 @@
         bitlbee-mastodon = pkgs.bitlbee-mastodon;
         cointop = pkgs.cointop;
         cryptpad = pkgs.cryptpad;
+        delta = pkgs.delta;
         dovecot_fts-xapian = pkgs.dovecot_fts_xapian;
         duply = pkgs.duply;
         fiche = pkgs.fiche;
         galene = pkgs.galene;
+        hetzner = pkgs.python3Packages.hetzner;
         influxdb2 = pkgs.influxdb2;
         ldapvi = pkgs.ldapvi;
         lego = pkgs.lego;
         mpd = pkgs.mpd;
         mpd-small = pkgs.mpd-small;
+        neomutt = pkgs.neomutt;
         opensmtpd = pkgs.opensmtpd;
         pass = pkgs.pass;
         pg_activity = pkgs.pg_activity;
@@ -39,15 +42,18 @@
         apprise = flake-utils.lib.mkApp { drv = packages.apprise; name = "apprise"; };
         cointop = flake-utils.lib.mkApp { drv = packages.cointop; name = "cointop"; };
         cryptpad = flake-utils.lib.mkApp { drv = packages.cryptpad; name = "cryptpad"; };
+        delta = flake-utils.lib.mkApp { drv = packages.delta; name = "delta"; };
         duply = flake-utils.lib.mkApp { drv = packages.duply; name = "duply"; };
         fiche = flake-utils.lib.mkApp { drv = packages.fiche; name = "fiche"; };
         galene = flake-utils.lib.mkApp { drv = packages.galene; name = "galene"; };
+        hetzner = flake-utils.lib.mkApp { drv = packages.hetzner; name = "hetznerctl"; };
         influxd = flake-utils.lib.mkApp { drv = packages.influxdb2; name = "influxd"; };
         influx = flake-utils.lib.mkApp { drv = packages.influxdb2; name = "influx"; };
         ldapvi = flake-utils.lib.mkApp { drv = packages.ldapvi; name = "ldapvi"; };
         lego = flake-utils.lib.mkApp { drv = packages.lego; name = "lego"; };
         mpd = flake-utils.lib.mkApp { drv = packages.mpd; name = "mpd"; };
         mpd-small = flake-utils.lib.mkApp { drv = packages.mpd-small; name = "mpd"; };
+        neomutt = flake-utils.lib.mkApp { drv = packages.neomutt; name = "neomutt"; };
         opensmtpd = flake-utils.lib.mkApp { drv = packages.opensmtpd; name = "opensmtpd"; };
         pass = flake-utils.lib.mkApp { drv = packages.pass; name = "pass"; };
         pg_activity = flake-utils.lib.mkApp { drv = packages.pg_activity; name = "pg_activity"; };
@@ -74,16 +80,19 @@
       };
       cointop = final: prev: { cointop = self.packages."${final.system}".cointop; };
       cryptpad = final: prev: { cryptpad = self.packages."${final.system}".cryptpad; };
+      delta = final: prev: { delta = self.packages."${final.system}".delta; };
       dovecot_fts-xapian = final: prev: {
         dovecot_fts-xapian = lib.overrideDeps final self.packages."${final.system}".dovecot_fts-xapian;
       };
       duply = final: prev: { duply = self.packages."${final.system}".duply; };
       fiche = final: prev: { fiche = self.packages."${final.system}".fiche; };
       galene = final: prev: { galene = self.packages."${final.system}".galene; };
+      hetzner = final: prev: { hetzner = self.packages."${final.system}".hetzner; };
       influxdb2 = final: prev: { influxdb2 = self.packages."${final.system}".influxdb2; };
       ldapvi = final: prev: { ldapvi = self.packages."${final.system}".ldapvi; };
       lego = final: prev: { lego = self.packages."${final.system}".lego; };
       mpd = final: prev: { mpd = self.packages."${final.system}".mpd; };
+      neomutt = final: prev: { neomutt = self.packages."${final.system}".neomutt; };
       opensmtpd = final: prev: { opensmtpd = self.packages."${final.system}".opensmtpd; };
       pass = final: prev: { pass = self.packages."${final.system}".pass; };
       pg_activity = final: prev: { pg_activity = self.packages."${final.system}".pg_activity; };
@@ -101,14 +110,17 @@
       // overlays.bitlbee-mastodon final prev
       // overlays.cointop final prev
       // overlays.cryptpad final prev
+      // overlays.delta final prev
       // overlays.dovecot_fts-xapian final prev
       // overlays.duply final prev
       // overlays.fiche final prev
       // overlays.galene final prev
+      // overlays.hetzner final prev
       // overlays.influxdb2 final prev
       // overlays.ldapvi final prev
       // overlays.lego final prev
       // overlays.mpd final prev
+      // overlays.neomutt final prev
       // overlays.opensmtpd final prev
       // overlays.pass final prev
       // overlays.pg_activity final prev

diff --git a/overlays/neomutt/default.nix b/overlays/neomutt/default.nix
index f03290ae206967aa031d4b4b8f7ee2232b964c0a..06de682d39968b1a6436d604fec4d87345601d25 100644 (file)
--- a/overlays/neomutt/default.nix
+++ b/overlays/neomutt/default.nix
@@ -1,5 +1,13 @@
 self: super: {
-  neomutt = super.neomutt.overrideAttrs(old: {
+  neomutt = super.neomutt.overrideAttrs(old: rec {
+    version = "20211029";
+    src = self.fetchFromGitHub {
+      owner  = "neomutt";
+      repo   = "neomutt";
+      rev = "3429205b716c12eff84db4b35daf91a7e959e31d";
+      sha256 = "17mfdi2brdmd6mjg04rsnz2aqngbmp6vb4xja9q1cvhdagcs0sxv";
+    };
+    nativeBuildInputs = old.nativeBuildInputs ++ [self.w3m];
     patches = old.patches or [] ++ [
       ./tx.patch
     ];