Add new tools

diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index 4df42aa9e5404fe7ea4c9dbaadbc613fa5c27bbf..147926b48b88e03bff706fb957d9f30ef184ec27 100644 (file)
--- a/environments/immae-eu.nix
+++ b/environments/immae-eu.nix
@@ -59,7 +59,7 @@ let
     # nagnu
 
     # messaging/forums/news
-    #flrn slrn
+    flrn slrn
     telegram-cli telegram-history-dump telegramircd
     weechat profanity
     newsboat irssi
@@ -75,7 +75,7 @@ let
     # (nixos {}).manual.manpages
 
     # note taking
-    note terminal-velocity jrnl doing
+    note terminal-velocity jrnl doing nb
 
     # office
     sc-im ranger
@@ -119,7 +119,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
+    sshfs ncdu
 
     # other tools
     pgloader s3cmd lftp jq cpulimit libxslt gandi-cli

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 4b3d4b306c747983fa4f28d1a21e9092045e99aa..b260f97335f6349b0f910d79a19b7608dd5f3fbf 100644 (file)
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -17,6 +17,7 @@ rec {
   mutt-ics = callPackage ./mutt-ics { inherit mylibs; };
   nagios-cli = callPackage ./nagios-cli { inherit mylibs; };
   nagnu = callPackage ./nagnu { inherit mylibs; };
+  nb = callPackage ./nb {};
   note = callPackage ./note {};
   notmuch-python2 = callPackage ./notmuch/notmuch-python { pythonPackages = python2Packages; };
   notmuch-python3 = callPackage ./notmuch/notmuch-python { pythonPackages = python3Packages; };

diff --git a/pkgs/nb/default.nix b/pkgs/nb/default.nix
new file mode 100644 (file)
index 0000000..37cc89f
--- /dev/null
+++ b/pkgs/nb/default.nix
@@ -0,0 +1,20 @@
+{ pkgs ? import <nixpkgs> {} }: with pkgs;
+stdenv.mkDerivation {
+  pname = "nb";
+  version = "e0d4e24-master";
+  src = fetchFromGitHub {
+    owner = "xwmx";
+    repo = "nb";
+    rev = "e0d4e24201299916d736be6a9800793cec32927e";
+    sha256 = "0gpnlzxjlfn3bagw74lsrmfhxj2xzvk6sjj24wp9rjpk42d9mfml";
+  };
+  phases = "installPhase";
+  installPhase = ''
+    mkdir -p $out/bin $out/share/zsh/vendor-completions $out/share/bash-completion/completions
+    cp $src/nb $out/bin/nb
+    chmod +x $out/bin/nb
+    patchShebangs $out/bin/nb
+    cp $src/etc/nb-completion.zsh $out/share/zsh/vendor-completions/_nb
+    cp $src/etc/nb-completion.bash $out/share/bash-completion/completions/nb
+    '';
+}