From 56d8e1e0f8650cb1feb423c65f478d3827e6a51b Mon Sep 17 00:00:00 2001
From: UndeadKernel <carloscg@gmail.com>
Date: Wed, 17 Jul 2019 18:01:22 +0200
Subject: [PATCH] bindings: fix emacs bindings and add more

---
 modules/config/default/+emacs-bindings.el | 42 +++++++++++++++--------
 modules/term/eshell/config.el             |  8 +++--
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el
index 4f3e34db1..27971c133 100644
--- a/modules/config/default/+emacs-bindings.el
+++ b/modules/config/default/+emacs-bindings.el
@@ -20,20 +20,7 @@
 ;;; Leader keys
 
 (map! :leader
-      :desc "Find file in project"        "C-f" #'projectile-find-file
       :desc "Evaluate line/region"        "e"   #'+eval/line-or-region
-      :desc "Open scratch buffer"         "x"   #'doom/open-scratch-buffer
-      :desc "Open project scratch buffer" "X"   #'doom/switch-to-scratch-buffer
-
-      (:when (featurep! :term term)
-        :desc "Toggle term popup"     "`" #'+term/toggle
-        :desc "Open term here"        "~" #'+term/here)
-      (:when (featurep! :term vterm)
-        :desc "Toggle vterm popup"    "`" #'+vterm/toggle
-        :desc "Open vterm here"       "~" #'+vterm/here)
-      (:when (featurep! :term eshell)
-        :desc "Toggle eshell popup"   "`" #'+eshell/toggle
-        :desc "Open eshell here"      "~" #'+eshell/here)
 
       (:prefix ("l" . "<localleader>")) ; bound locally
       (:prefix ("!" . "checkers"))      ; bound by flycheck
@@ -49,6 +36,8 @@
         :desc "Browse emacs.d"              "E"   #'+default/browse-emacsd
         :desc "Find file from here"         "f"   (if (fboundp 'counsel-file-jump) #'counsel-file-jump #'find-file)
         :desc "Find file in other project"  "F"   #'doom/browse-in-other-project
+        :desc "Delete this file"            "K"   #'doom/delete-this-file
+        :desc "Move this file"              "m"   #'doom/move-this-file
         :desc "Find file in project"        "p"   #'projectile-find-file
         :desc "Find file in other project"  "P"   #'doom/find-file-in-other-project
         :desc "Recent files"                "r"   #'recentf-open-files
@@ -56,11 +45,25 @@
         :desc "Sudo this file"              "s"   #'doom/sudo-this-file
         :desc "Sudo find file"              "S"   #'doom/sudo-find-file
         :desc "Yank filename"               "y"   #'+default/yank-buffer-filename
-        :desc "Delete this file"            "X"   #'doom/delete-this-file)
+        :desc "Open scratch buffer"         "x"   #'doom/open-scratch-buffer
+        :desc "Open project scratch buffer" "X"   #'doom/switch-to-scratch-buffer)
+
+      ;;; <leader> g --- lookup
+      (:when (featurep! :tools lookup)
+        (:prefix-map ("g" . "lookup")
+          "k" #'+lookup/documentation
+          "d" #'+lookup/definition
+          "D" #'+lookup/references
+          "f" #'+lookup/file
+          "o" #'+lookup/online-select
+          "i" #'+lookup/in-docsets
+          "I" #'+lookup/in-all-docsets))
 
       ;;; <leader> o --- org
       "o" nil ; we need to unbind it first as Org claims this
       (:prefix-map ("o". "org")
+        :desc "Do what I mean"          "o" #'+org/dwim-at-point
+        :desc "Display inline images"   "i" #'org-display-inline-images
         :desc "Search notes for symbol" "." #'+default/search-notes-for-symbol-at-point
         (:prefix ("a" . "org agenda")
           :desc "Agenda"                  "a"   #'org-agenda
@@ -104,6 +107,17 @@
         :desc "Create Temp Template"  "c" #'aya-create
         :desc "Use Temp Template"     "e" #'aya-expand)
 
+      (:prefix-map ("t" . "terminal")
+        (:when (featurep! :term term)
+          :desc "Toggle term popup"     "t" #'+term/toggle
+          :desc "Open term here"        "T" #'+term/here)
+        (:when (featurep! :term vterm)
+          :desc "Toggle vterm popup"    "t" #'+vterm/toggle
+          :desc "Open vterm here"       "T" #'+vterm/here)
+        (:when (featurep! :term eshell)
+          :desc "Toggle eshell popup"   "t" #'+eshell/toggle
+          :desc "Open eshell here"      "T" #'+eshell/here))
+
       ;;; <leader> v --- versioning
       (:prefix-map ("v" . "versioning")
         :desc "Git revert file"             "R"   #'vc-revert
diff --git a/modules/term/eshell/config.el b/modules/term/eshell/config.el
index d2b9b5c76..c2bbf31f6 100644
--- a/modules/term/eshell/config.el
+++ b/modules/term/eshell/config.el
@@ -132,10 +132,12 @@ You should use `set-eshell-alias!' to change this.")
             :n "C"       #'+eshell/evil-change-line
             :n "d"       #'+eshell/evil-delete
             :n "D"       #'+eshell/evil-delete-line
-            :i "TAB"     #'+eshell/pcomplete
-            :i [tab]     #'+eshell/pcomplete
-            :i "C-d"     #'+eshell/quit-or-delete-char
+            :ig "TAB"     #'+eshell/pcomplete
+            :ig [tab]     #'+eshell/pcomplete
+            :ig "C-d"     #'+eshell/quit-or-delete-char
             "C-s"   #'+eshell/search-history
+            ;; Emacs bindings
+            "C-e"   #'end-of-line
             ;; Tmux-esque prefix keybinds
             "C-c s" #'+eshell/split-below
             "C-c v" #'+eshell/split-right