emacs: Update common-lisp and packages

Previous configuratin using ~use-package~ for slime-company didn't
work properly. Added slime & slime company on package list, and added
hook and slime-setup mannually

2 files changed, 66 insertions, 94 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 4ccef61..01b2bcf 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -46,7 +46,6 @@
 			    sudo-edit
 			    exwm
 			    exwm-mff
-			    ;; exwm-firefox-core
 			    consult
 			    alsamixer
 			    simple-httpd
@@ -54,7 +53,9 @@
 			    org-superstar
 			    mastodon
 			    dashboard
-			    org-auto-tangle))
+			    org-auto-tangle
+			    slime
+			    slime-company))
 
 (setq package-archives '(("melpa" . "https://melpa.org/packages/")
 			 ("org" . "https://orgmode.org/elpa/")
@@ -535,14 +536,7 @@ Contains the list of packages that need to be installed.")
 	 ("<tab>" . company-indent-or-complete-common))
   :custom
   (company-minimum-prefix-length 1)
-  (company-idle-delay 0.0)
-  :config
-  (setq global-company-mode t))
-
-(define-key company-active-map (kbd "\C-n") 'company-select-next)
-(define-key company-active-map (kbd "\C-p") 'company-select-previous)
-(define-key company-active-map (kbd "\C-d") 'company-show-doc-buffer)
-(define-key company-active-map (kbd "M-.") 'company-show-location)
+  (company-idle-delay 0.0))
 
 (use-package dap-mode
   :custom
@@ -561,21 +555,13 @@ Contains the list of packages that need to be installed.")
 (add-to-list 'completion-styles 'initials t)
 
 (add-hook 'emacs-lisp-mode-hook #'rainbow-delimiters-mode)
-(add-hook 'scheme-mode-hook #'rainbow-delimiters-mode)
-
-(use-package slime
-  :ensure t
-  :config
-  (setq inferior-lisp-program "sbcl"))
+(add-hook 'emacs-lisp-mode-hook #'company-mode)
 
-(use-package slime-company
-  :after (slime company)
-  :config
-  (setq slime-company-completion 'fuzzy
-	slime-company-after-completion 'slime-company-just-one-space)
-  (slime-setup '(slime-fancy slime-company)))
+(setq inferior-lisp-program "sbcl")
+(slime-setup '(slime-fancy slime-company))
 
 (add-hook 'lisp-mode-hook #'rainbow-delimiters-mode)
+(add-hook 'lisp-mode-hook #'company-mode)
 
 (defun apollo/lsp-mode-setup ()
   (setq lsp-headerline-breadcrumb-segments '(path-up-to-project file symbols))
diff --git a/org/emacs.org b/org/emacs.org
index 1d43c76..21a5b35 100755
--- a/org/emacs.org
+++ b/org/emacs.org
@@ -21,55 +21,56 @@ Set backup fails at ~~/Trash~
 ** List of required packages
 Request the following packages:
 #+begin_src emacs-lisp
-    (defconst my-package-list '(org-snooze
-				all-the-icons
-				all-the-icons-dired
-				all-the-icons-ivy-rich
-				dap-mode
-				toc-org
-				emojify
-				general
-				doom-themes
-				gruvbox-theme
-				doom-modeline
-				counsel
-				which-key
-				ivy
-				ivy-rich
-				helpful
-				password-store
-				org
-				org-modern
-				visual-fill-column
-				rainbow-delimiters
-				flycheck
-				lsp-mode
-				lsp-ui
-				json-mode
-				rjsx-mode
-				typescript-mode
-				python-mode
-				pyvenv
-				company
-				company-box
-				magit
-				elfeed
-				elfeed-goodies
-				paredit
-				corfu
-				monkeytype
-				sudo-edit
-				exwm
-				exwm-mff
-				;; exwm-firefox-core
-				consult
-				alsamixer
-				simple-httpd
-				eshell-syntax-highlighting
-				org-superstar
-				mastodon
-				dashboard
-				org-auto-tangle))
+  (defconst my-package-list '(org-snooze
+			      all-the-icons
+			      all-the-icons-dired
+			      all-the-icons-ivy-rich
+			      dap-mode
+			      toc-org
+			      emojify
+			      general
+			      doom-themes
+			      gruvbox-theme
+			      doom-modeline
+			      counsel
+			      which-key
+			      ivy
+			      ivy-rich
+			      helpful
+			      password-store
+			      org
+			      org-modern
+			      visual-fill-column
+			      rainbow-delimiters
+			      flycheck
+			      lsp-mode
+			      lsp-ui
+			      json-mode
+			      rjsx-mode
+			      typescript-mode
+			      python-mode
+			      pyvenv
+			      company
+			      company-box
+			      magit
+			      elfeed
+			      elfeed-goodies
+			      paredit
+			      corfu
+			      monkeytype
+			      sudo-edit
+			      exwm
+			      exwm-mff
+			      consult
+			      alsamixer
+			      simple-httpd
+			      eshell-syntax-highlighting
+			      org-superstar
+			      mastodon
+			      dashboard
+			      org-auto-tangle
+			      slime
+			      slime-company))
 #+end_src
 ** Installation & activation
 Set ~package-archives~, and install packages
@@ -604,14 +605,7 @@ Hook with ~dired-mode~
 	   ("<tab>" . company-indent-or-complete-common))
     :custom
     (company-minimum-prefix-length 1)
-    (company-idle-delay 0.0)
-    :config
-    (setq global-company-mode t))
-
-  (define-key company-active-map (kbd "\C-n") 'company-select-next)
-  (define-key company-active-map (kbd "\C-p") 'company-select-previous)
-  (define-key company-active-map (kbd "\C-d") 'company-show-doc-buffer)
-  (define-key company-active-map (kbd "M-.") 'company-show-location)
+    (company-idle-delay 0.0))
 
   (use-package dap-mode
     :custom
@@ -630,27 +624,19 @@ Hook with ~dired-mode~
 #+end_src
 ** Emacs lisp
 #+begin_src emacs-lisp
-(setq tab-always-indent 'complete)
-(add-to-list 'completion-styles 'initials t)
+  (setq tab-always-indent 'complete)
+  (add-to-list 'completion-styles 'initials t)
 
-(add-hook 'emacs-lisp-mode-hook #'rainbow-delimiters-mode)
-(add-hook 'scheme-mode-hook #'rainbow-delimiters-mode)
+  (add-hook 'emacs-lisp-mode-hook #'rainbow-delimiters-mode)
+  (add-hook 'emacs-lisp-mode-hook #'company-mode)
 #+end_src
 ** Common Lisp
 #+begin_src emacs-lisp
-  (use-package slime
-    :ensure t
-    :config
-    (setq inferior-lisp-program "sbcl"))
-
-  (use-package slime-company
-    :after (slime company)
-    :config
-    (setq slime-company-completion 'fuzzy
-	  slime-company-after-completion 'slime-company-just-one-space)
-    (slime-setup '(slime-fancy slime-company)))
+  (setq inferior-lisp-program "sbcl")
+  (slime-setup '(slime-fancy slime-company))
 
   (add-hook 'lisp-mode-hook #'rainbow-delimiters-mode)
+  (add-hook 'lisp-mode-hook #'company-mode)
 #+end_src
 ** LSP
 #+begin_src emacs-lisp