From 83b8408a352be98cb26ce059f318daac82f982b1 Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Sat, 31 Aug 2019 16:48:13 +0000
Subject: [PATCH] Fix GNU Emacs exec-path

---
 etc/emacs.el | 5 +----
 packages.nix | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/etc/emacs.el b/etc/emacs.el
index 5bd62d0..af4aa77 100644
--- a/etc/emacs.el
+++ b/etc/emacs.el
@@ -123,9 +123,6 @@
 ;;
 ;;
 
-(require 'exec-path-from-shell)
-(exec-path-from-shell-initialize)
-
 (recentf-mode 1)
 (put 'upcase-region 'disabled nil)
 
@@ -142,7 +139,7 @@
 
 (add-hook 'before-save-hook #'gofmt-before-save)
 
-(setq exec-path (split-string (getenv "PATH") ":"))
+(setq exec-path (append exec-path (split-string (getenv "PATH") ":")))
 
 (defun auto-complete-for-go ()
   (metafmt-mode 1)
diff --git a/packages.nix b/packages.nix
index 7d97fee..23022bf 100644
--- a/packages.nix
+++ b/packages.nix
@@ -86,7 +86,7 @@ in {
         # Version control
         magit git-gutter
         # Generic
-        smex w3m exec-path-from-shell org-kanban
+        smex w3m org-kanban
         # Appearance
         zenburn-theme solarized-theme
         # IM
@@ -100,9 +100,6 @@ in {
       ])
     ))
 
-    # We need to have `telega-server` in $PATH
-    unstable.emacsPackagesNg.melpaPackages.telega
-
     # dev
     go gnumake gcc clang clang-analyzer global ponyc
     maven binutils-unwrapped openssl bison flex fop libxslt