diff --git a/README.md b/README.md
index 9437174..8e7549f 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 **My personal [NUR](https://github.com/nix-community/NUR) repository**
 
+List of packages: https://nur.nix-community.org/repos/fliegendewurst/
+
 ![Build and populate cache](https://github.com/FliegendeWurst/nur-packages/workflows/Build%20and%20populate%20cache/badge.svg)
 
 <!--
diff --git a/default.nix b/default.nix
index 9436414..c0fcb1c 100644
--- a/default.nix
+++ b/default.nix
@@ -14,6 +14,9 @@
   modules = import ./modules; # NixOS modules
   overlays = import ./overlays; # nixpkgs overlays
 
+  diskgraph = pkgs.callPackage ./pkgs/diskgraph { };
+  freqtop = pkgs.callPackage ./pkgs/freqtop { };
+  map = pkgs.callPackage ./pkgs/map { };
   ripgrep-all = pkgs.callPackage ./pkgs/ripgrep-all {
     inherit (pkgs.darwin.apple_sdk.frameworks) Security;
   };
diff --git a/pkgs/diskgraph/default.nix b/pkgs/diskgraph/default.nix
new file mode 100644
index 0000000..f9c1b90
--- /dev/null
+++ b/pkgs/diskgraph/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  pname = "diskgraph";
+  version = "2021-05-13";
+
+  src = fetchFromGitHub {
+    owner = "stolk";
+    repo = "diskgraph";
+    rev = "8d1998ca9a05e19c822f24b6285c458a6bf023ea";
+    sha256 = "sha256-OaOp+5WeMSJBum+bLDil936rpKHWyzBxGCxSZWe/wZg=";
+  };
+
+  installPhase = ''
+    install -D -m755 diskgraph $out/bin/diskgraph
+  '';
+
+  meta = with lib; {
+    description = "Graphs the disk IO in a linux terminal";
+    homepage = "https://github.com/stolk/diskgraph";
+    license = licenses.mit;
+	platforms = platforms.linux;
+    maintainers = with maintainers; [ fliegendewurst ];
+  };
+}
diff --git a/pkgs/freqtop/default.nix b/pkgs/freqtop/default.nix
new file mode 100644
index 0000000..2c4743f
--- /dev/null
+++ b/pkgs/freqtop/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  pname = "freqtop";
+  version = "2022-02-01";
+
+  src = fetchFromGitHub {
+    owner = "stolk";
+    repo = "freqtop";
+    rev = "d364fe9207e1d89e91bdbe67ca4d49c94ce0d6e0";
+    sha256 = "06qb8mxcpgnsd6f069lfmag719qdi7kwak8q61isqwilwdcs4qg5";
+  };
+
+  installPhase = ''
+    install -D -m755 freqtop $out/bin/freqtop
+  '';
+
+  meta = with lib; {
+    description = "Monitor for the CPU Frequency Scaling under Linux";
+    homepage = "https://github.com/stolk/freqtop";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ fliegendewurst ];
+  };
+}
diff --git a/pkgs/map/default.nix b/pkgs/map/default.nix
new file mode 100644
index 0000000..b15d808
--- /dev/null
+++ b/pkgs/map/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  pname = "map";
+  version = "2020-06-30";
+
+  src = fetchFromGitHub {
+    owner = "soveran";
+    repo = "map";
+    rev = "4296fd49930c32d7ae1e90a74008e8c58e219cda";
+    sha256 = "1qxx3871aa1wrcsk0v8iy4cmvymd7pqv2h5m0xpcnwcj42nh5q0f";
+  };
+
+  installPhase = ''
+    install -D -m755 map $out/bin/map
+    install -D -m644 map.1 $out/share/man/man1/map.1
+  '';
+
+  meta = with lib; {
+    description = "Map lines from stdin to commands";
+    homepage = "https://github.com/soveran/map";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ fliegendewurst ];
+  };
+}
diff --git a/pkgs/ripgrep-all/default.nix b/pkgs/ripgrep-all/default.nix
index 699555a..a433df1 100644
--- a/pkgs/ripgrep-all/default.nix
+++ b/pkgs/ripgrep-all/default.nix
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
   doCheck = false; # ...
 
   meta = with lib; {
-    description = "Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, and more";
+    description = "Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, and more [fork with email search support]";
     longDescription = ''
       Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, etc.
 
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage rec {
       a multitude of file types. rga wraps the awesome ripgrep and enables it
       to search in pdf, docx, sqlite, jpg, movie subtitles (mkv, mp4), etc.
     '';
-    homepage = "https://github.com/phiresky/ripgrep-all";
+    homepage = "https://github.com/FliegendeWurst/ripgrep-all/tree/mail-adapter";
     license = with licenses; [ agpl3Plus ];
     maintainers = with maintainers; [ fliegendewurst ];
     mainProgram = "rga";