From 5e12caa3473acec29a61d2ca51e14c9cd6de5902 Mon Sep 17 00:00:00 2001 From: Claudio Maradonna Date: Thu, 5 Aug 2021 09:47:41 +0200 Subject: [PATCH] fix: more completion feature with lsp. Works Haskell Plutus with nix-shell and cabal hie.yaml --- emacs/doom-emacs/config.el | 4 ++-- emacs/doom-emacs/init.el | 12 ++++++------ emacs/doom-emacs/packages.el | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/emacs/doom-emacs/config.el b/emacs/doom-emacs/config.el index 5812cf3..6df00c2 100644 --- a/emacs/doom-emacs/config.el +++ b/emacs/doom-emacs/config.el @@ -6,8 +6,8 @@ ;; Some functionality uses this to identify you, e.g. GPG configuration, email ;; clients, file templates and snippets. -(setq user-full-name "Full name" - user-mail-address "my-email@email.org") +(setq user-full-name (getenv "DEFAULT_FULL_NAME") + user-mail-address (getenv "DEFAULT_EMAIL")) ;; Doom exposes five (optional) variables for controlling fonts in Doom. Here ;; are the three important ones: diff --git a/emacs/doom-emacs/init.el b/emacs/doom-emacs/init.el index 9249786..b0fe221 100644 --- a/emacs/doom-emacs/init.el +++ b/emacs/doom-emacs/init.el @@ -37,7 +37,7 @@ ;;indent-guides ; highlighted indent columns ligatures ; ligatures and symbols to make your code pretty again ;;minimap ; show a map of the code on the side - modeline ; snazzy, Atom-inspired modeline, plus API + (modeline +light) ; snazzy, Atom-inspired modeline, plus API ;;nav-flash ; blink cursor line after big motions ;;neotree ; a project drawer, like NERDTree for vim ophints ; highlight the region an operation acts on @@ -68,7 +68,7 @@ :emacs dired ; making dired pretty [functional] electric ; smarter, keyword-based electric-indent - ;;ibuffer ; interactive buffer management + (ibuffer +icons) ; interactive buffer management undo ; persistent, smarter undo for your inevitable mistakes vc ; version-control and Emacs, sitting in a tree @@ -87,7 +87,7 @@ ;;ansible ;;debugger ; FIXME stepping through code, to help you add bugs ;;direnv - docker + (docker +lsp) ;;editorconfig ; let someone else argue about tabs vs spaces ;;ein ; tame Jupyter notebooks with emacs (eval +overlay) ; run code, run (also, repls) @@ -132,7 +132,7 @@ ;;fstar ; (dependent) types and (monadic) effects and Z3 ;;gdscript ; the language you waited for (go +lsp) ; the hipster dialect - (haskell +dante) ; a language that's lazier than I am + (haskell +lsp) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python ;;idris ; a language you can depend on json ; At least it ain't XML @@ -159,7 +159,7 @@ ;;rest ; Emacs as a REST client ;;rst ; ReST in peace (ruby +lsp +rbenv +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + (rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good ;;(scheme +guile) ; a fully conniving family of lisps sh ; she sells {ba,z,fi}sh shells on the C xor @@ -167,7 +167,7 @@ ;;solidity ; do you need a blockchain? No. ;;swift ; who asked for emoji variables? ;;terra ; Earth and Moon in alignment for performance. - web ; the tubes + (web +lsp) ; the tubes yaml ; JSON, but readable ;;zig ; C, but simpler diff --git a/emacs/doom-emacs/packages.el b/emacs/doom-emacs/packages.el index b80e9cc..5bbe337 100644 --- a/emacs/doom-emacs/packages.el +++ b/emacs/doom-emacs/packages.el @@ -8,6 +8,7 @@ ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: ;(package! some-package) +(package! slim-mode) ;; To install a package directly from a remote git repo, you must specify a ;; `:recipe'. You'll find documentation on what `:recipe' accepts here: