aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Doom/.doom.d/init.el2
-rw-r--r--Doom/.doom.d/modules/private/completion/config.el7
-rw-r--r--Doom/.doom.d/modules/private/completion/packages.el12
-rw-r--r--Doom/.doom.d/org/config.org9
4 files changed, 6 insertions, 24 deletions
diff --git a/Doom/.doom.d/init.el b/Doom/.doom.d/init.el
index ea4c402..c8d5ff5 100644
--- a/Doom/.doom.d/init.el
+++ b/Doom/.doom.d/init.el
@@ -13,7 +13,7 @@
(ocaml +lsp)
(rss +elfeed)
(narrow)
- ;;(completion)
+ (completion)
:input
;;chinese
diff --git a/Doom/.doom.d/modules/private/completion/config.el b/Doom/.doom.d/modules/private/completion/config.el
index bd1b022..9067764 100644
--- a/Doom/.doom.d/modules/private/completion/config.el
+++ b/Doom/.doom.d/modules/private/completion/config.el
@@ -18,7 +18,10 @@
(setq icomplete-separator "\t|\t")
(setq icomplete-in-buffer t)
-(after! projectile
- (setq projectile-completion-system 'default))
+(define-key!
+ [remap compile] #'compile
+ [remap find-file] #'find-file
+ [remap describe-function] #'counsel-describe-function
+ [remap describe-variable] #'counsel-describe-variable)
(add-hook 'doom-first-input-hook #'icomplete-mode)
diff --git a/Doom/.doom.d/modules/private/completion/packages.el b/Doom/.doom.d/modules/private/completion/packages.el
deleted file mode 100644
index 8a52b73..0000000
--- a/Doom/.doom.d/modules/private/completion/packages.el
+++ /dev/null
@@ -1,12 +0,0 @@
-;; -*- no-byte-compile: t; -*-
-;;; private/completion/packages.el
-
-(package! ivy)
-(package! swiper)
-(package! counsel)
-(package! amx)
-;; (package! counsel-projectile)
-;; (package! ivy-rich)
-;; (package! wgrep)
-;; (package! flx :pin "17f5c9cb2af18aa6f52910ff4a5a63591261ced5")
-;; (package! all-the-icons-ivy)
diff --git a/Doom/.doom.d/org/config.org b/Doom/.doom.d/org/config.org
index 0681d37..4c780cf 100644
--- a/Doom/.doom.d/org/config.org
+++ b/Doom/.doom.d/org/config.org
@@ -552,15 +552,6 @@ General keymap
:desc "Choose Buffer frame" "n" #'display-buffer-other-frame
:desc "Switch frames" "o" #'other-frame)
#+END_SRC
-** Remaps
-Many modules remap key functions in Emacs to other functions.
-Most I agree with, some I don't.
-So I'll remap some back.
-
-#+BEGIN_SRC elisp
-(define-key!
- [remap compile] #'compile)
-#+END_SRC
** Other
*** Leader
- Miscellaneous leader bindings that don't really fit into any particular item