diff --git a/.envrc b/.envrc
index 4945571..7889373 100644
--- a/.envrc
+++ b/.envrc
@@ -38,7 +38,6 @@ use_guix()
         direnv
         git
         git:send-email
-        git-cal
         gnupg
         guile-colorized
         guile-readline
@@ -51,47 +50,13 @@ use_guix()
     # Environment packages.
     PACKAGES=(help2man guile-sqlite3 guile-gcrypt
     autoconf autoconf-archive automake libtool
-    pkg-config openssl libxml2)
+    make cmake gcc-toolchain pkg-config
+    openssl libxml2 libstrophe json-c)
 
     # Thanks <https://lists.gnu.org/archive/html/guix-devel/2016-09/msg00859.html>
-    eval "$(guix environment --search-paths --root="$gcroot" json-c --ad-hoc ${PACKAGES[@]} ${PACKAGES_MAINTENANCE[@]} "$@")"
+    eval "$(guix environment --search-paths --root="$gcroot" --ad-hoc ${PACKAGES[@]} ${PACKAGES_MAINTENANCE[@]} "$@")"
 
     export CC=gcc
-
-    # Predefine configure flags.
-    configure()
-    {
-        ./configure --localstatedir=/var --prefix=
-    }
-    export_function configure
-
-    # Run make and optionally build something.
-    build()
-    {
-        make -j 2
-        if [ $# -gt 0 ]
-        then
-            ./pre-inst-env guix build "$@"
-        fi
-    }
-    export_function build
-
-    # Predefine push Git command.
-    push()
-    {
-        git push --set-upstream origin
-    }
-    export_function push
-
-    clear                        # Clean up the screen.
-    git-cal --author='Your Name' # Show contributions calendar.
-
-    # Show commands help.
-    echo "
-build          build a package or just a project if no argument provided
-configure      run ./configure with predefined parameters
-push           push to upstream Git repository
-"
 }
 
 use guix