From 8bd52f262261048ea9e5ef22f3c3e598708fae2a Mon Sep 17 00:00:00 2001
From: Grigory Shipunov <blame@oxapentane.com>
Date: Thu, 3 Mar 2022 22:59:31 +0100
Subject: [PATCH] add sly and minor tweaks

---
 init.el | 47 ++++++++++++++---------------------------------
 1 file changed, 14 insertions(+), 33 deletions(-)

diff --git a/init.el b/init.el
index 1ec058e..b7dd2e9 100644
--- a/init.el
+++ b/init.el
@@ -156,35 +156,17 @@
       version-control t)
 
 ;; completion framework
-(use-package ido
-  :init
-  (setq ido-enable-flex-matching t)
-  (setq ido-everywhere t)
-  (setq ido-auto-merge-work-directories-length -1)
-  (setq ido-use-filename-at-point 'guess)
-  (setq ido-create-new-buffer 'always)
-  (setq ido-file-extensions-order
-        '(".org" ".scm" ".rkt" ".py" ".jl" ".txt" ".tex" ".bib"))
-  :config
-  (ido-mode t)
-  (ido-everywhere t))
-
-(use-package smex
-  :straight t
-  :commands (smex
-             emex-major-mode-commands)
-  :bind (("M-x" . smex)
-         ("M-X" . smex-major-mode-commands))
-  :config (smex-initialize))
-
-(use-package ido-completing-read+
-  :straight t
-  :after ido
-  :config (ido-ubiquitous-mode 1))
+(straight-use-package 'ivy)
+(ivy-mode 1)
+(diminish 'ivy-mode)
+(straight-use-package 'counsel)
+(counsel-mode 1)
+(diminish 'counsel-mode)
+(global-set-key (kbd "M-s M-s") 'swiper)
 
 ;; autocompletion by default
 (straight-use-package 'company)
-(company-mode 1)
+(global-company-mode 1)
 (diminish 'company-mode)
 
 ;; better tree mode
@@ -316,7 +298,6 @@
 
 (use-package magit
   :straight t
-  :init (setq magit-completing-read-function 'magit-ido-completing-read)
   :bind (("C-x G" . magit-dispatch)
          ("C-x g" . magit-status)))
 
@@ -359,7 +340,7 @@
 (use-package ess
   :straight t
   :init
-  (setq ess-use-ido t)
+  (setq ess-use-company t)
   (setq ess-use-flymake nil))
 
 (use-package poly-R
@@ -383,7 +364,7 @@
 (use-package scheme
   :init (setq scheme-program-name "petite"))
 
-(use-package slime
+(use-package sly
   :straight t
   :config
   (setq inferior-lisp-program "sbcl"))
@@ -404,7 +385,10 @@
   (setq lsp-keymap-prefix "C-z l")
   :hook ((lsp-mode . lsp-enable-which-key-integration))
   :commands lsp)
-(use-package lsp-ui :straight t :commands lsp-ui-mode)
+
+(use-package lsp-ui
+  :straight t
+  :commands lsp-ui-mode)
 
 ;; snippets
 (straight-use-package 'yasnippet)
@@ -416,8 +400,5 @@
 (setq custom-file "~/.emacs.d/custom.el")
 (load custom-file 'noerror)
 
-;; start server
-(server-start)
-
 (provide 'init)
 ;;; init.el ends here