diff --git a/init.el b/init.el index 13f6d61..34ee03b 100644 --- a/init.el +++ b/init.el @@ -39,7 +39,7 @@ (require 'pkg/dashboard "$HOME/.emacs.d/pkg/dashboard.el") ;; Themes -(require '10themes "$HOME/.emacs.d/themes/themes.el") +(require 'themes/themes "$HOME/.emacs.d/themes/themes.el") ;; Actual supported languages and file syntax. (require 'languages/elisp "$HOME/.emacs.d/languages/elisp.el") @@ -64,7 +64,7 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(package-selected-packages - '(dashboard fsharp-mode dante dash-at-point racer racer-mode flycheck-rust rust-mode haskell-mode dune which-key erlang gitignore-mode yaml-mode nginx-mode ansible terraform-mode dockerfile-mode reason-mode merlin tuareg clj-refactor cider clojure-mode elixir-mode js2-mode web-mode enh-ruby-mode ruby-end rspec-mode planet-theme flatui-theme base16-theme smart-mode-line lsp-ui lsp-mode deft counsel-projectile flycheck company yasnippet-snippets yasnippet visual-regexp column-enforce-mode rainbow-mode rainbow-delimiters magit hydra counsel keyfreq exec-path-from-shell buffer-move use-package)) + '(helpful lsp-haskell dashboard fsharp-mode dash-at-point racer racer-mode flycheck-rust rust-mode haskell-mode dune which-key erlang gitignore-mode yaml-mode nginx-mode ansible terraform-mode dockerfile-mode reason-mode merlin tuareg clj-refactor cider clojure-mode elixir-mode js2-mode web-mode enh-ruby-mode ruby-end rspec-mode planet-theme flatui-theme base16-theme smart-mode-line lsp-ui lsp-mode deft counsel-projectile flycheck company yasnippet-snippets yasnippet visual-regexp column-enforce-mode rainbow-mode rainbow-delimiters magit hydra counsel keyfreq exec-path-from-shell buffer-move use-package)) '(safe-local-variable-values '((haskell-process-use-ghci . t) (haskell-indent-spaces . 4)))) diff --git a/pkg/base.el b/pkg/base.el index b8ff1c5..bb2bd30 100644 --- a/pkg/base.el +++ b/pkg/base.el @@ -42,8 +42,6 @@ (define-key global-map [end] 'end-of-line) ;;; Helpful key bindings -(global-set-key (kbd " b") 'describe-bindings) ;; List all key bindings - ;; there are. (global-set-key (kbd "C-c \\") 'split-window-right) ;; Split window to the right (global-set-key (kbd "C-c /") 'split-window-below) ;; Split window to the bottom diff --git a/pkg/ivy.el b/pkg/ivy.el index 1f5b0b9..b241c9a 100644 --- a/pkg/ivy.el +++ b/pkg/ivy.el @@ -5,21 +5,29 @@ (use-package counsel :ensure t :defer t) (use-package swiper :ensure t :defer t) +(use-package helpful :ensure t :defer t) (use-package ivy - :requires (counsel swiper) + :requires (counsel swiper helpful) :ensure t :defer t :config (setq ivy-use-virtual-buffers t ;; Display recent files in ivy-switch-buffer ivy-count-format "(%d of %d) " ;; Current candidate count style ivy-wrap t ;; Wrap around completions - ivy-display-style 'fancy)) ;; Formatting style + ivy-display-style 'fancy ;; Formatting style + )) + +;; Use helpful for showing Elisp documentation +(setq counsel-describe-function-function #'helpful-callable) +(setq counsel-describe-variable-function #'helpful-variable) (global-set-key (kbd "C-c a") 'counsel-rg) (global-set-key (kbd "C-c t") 'counsel-find-file) (global-set-key (kbd "C-c C-s") 'swiper) ;; Find things by regexp (global-set-key (kbd "M-x") 'counsel-M-x) ;; M-x on steroids + ;; List all key bindings there are. +;; (global-set-key (kbd " b") 'describe-bindings) (global-set-key (kbd " f") 'counsel-describe-function) (global-set-key (kbd " v") 'counsel-describe-variable) (global-set-key (kbd " l") 'counsel-find-library) diff --git a/pkg/lsp.el b/pkg/lsp.el index 3273b75..aecd235 100644 --- a/pkg/lsp.el +++ b/pkg/lsp.el @@ -25,6 +25,7 @@ (setq lsp-ui-doc-enable t lsp-ui-header t + lsp-ui-doc-position 'at-point lsp-ui-doc-include-signature t lsp-log-io nil)