diff --git a/hm/common.nix b/hm/common.nix
index 39f3832..507f0a8 100644
--- a/hm/common.nix
+++ b/hm/common.nix
@@ -418,24 +418,27 @@ in
       # time = "en_DK.UTF-8"; # TODO Disabled because complaints during nixos-rebuild switch
     };
     packages = with pkgs; [
-      # dotfiles dependencies
+      # Terminal utils
       coreutils
-      bash
-      gnugrep
-      gnused
-      gnutar
-      openssl
-      wget
-      curl
-      python3Packages.pip
+      moreutils
       rename
       which
+      file
 
-      # shell
-      zsh-completions
-      nix-zsh-completions
-      zsh-history-substring-search
-      powerline-go
+      # Pipe utils
+      gnugrep
+      gnused
+      gawk
+
+      # Extraction
+      gnutar
+      unzip
+      unrar
+      p7zip
+
+      # Documentation
+      man
+      tldr
       neofetch
 
       # nix utils
@@ -443,15 +446,10 @@ in
       nix-tree
       nix-output-monitor
 
-      # terminal essentials
-      file
-      moreutils
-      man
-      unzip
-      unrar
-      p7zip
-
       # remote
+      wget
+      curl
+      openssl
       openssh
       rsync
       borgbackup
@@ -479,6 +477,7 @@ in
 
       # password
       pwgen
+
       (pkgs.writeShellApplication {
         name = "git-sync-init";
         text = (lib.strings.concatLines
@@ -495,19 +494,6 @@ in
           )
         );
       })
-
-      # Mail
-      isync
-      msmtp
-      notmuch
-      neomutt
-      lynx
-
-      # Organisation
-      vdirsyncer
-      khard
-      khal
-      todoman
     ];
     sessionVariables = {
       # Favourite commands