diff options
| author | tslil clingman <> | 2021-06-29 17:34:31 -0400 |
|---|---|---|
| committer | tslil clingman <> | 2021-06-29 18:28:18 -0400 |
| commit | 24f196ef4576ab1d8ab205e7378b439f2aa8e9ce (patch) | |
| tree | 9c1a4329e2f055ad80b7e0d5bd5a6f7843ac789f /emacs/inits/20-programming.el | |
| parent | d550a210bd05a0019ce3e1757d8ec32731d0f72c (diff) | |
Switch from Selectrum+CTRLF to vertico+consult+marginalia
In the process, rid myself of company and everything that depended on
it (RIP elpy), because i want a uniform interface for capfs, and
that's vertico+consult.
Diffstat (limited to 'emacs/inits/20-programming.el')
| -rw-r--r-- | emacs/inits/20-programming.el | 42 |
1 files changed, 15 insertions, 27 deletions
diff --git a/emacs/inits/20-programming.el b/emacs/inits/20-programming.el index 2496f92..95df93d 100644 --- a/emacs/inits/20-programming.el +++ b/emacs/inits/20-programming.el @@ -1,4 +1,4 @@ -;; Time-stamp: <2021-04-22 17:22:56 (tslil@bison)> +;; Time-stamp: <2021-06-29 17h23 EDT (hobbies)> ;; ----------------------------------------------------------------------------- ;; General setup @@ -83,24 +83,11 @@ ;; gdb-many-windows nil ;; gdb-show-main nil) -(use-package company-irony-c-headers - :ensure t - :defer t) - -(use-package company-irony - :ensure t - :defer t) - (use-package irony :ensure t :defer t :hook (irony-mode . (lambda () - (require 'company) - (company-mode-on) - (irony-cdb-autosetup-compile-options) - (require 'company-irony) - (require 'company-irony-c-headers) - (add-to-list 'company-backends '(company-irony-c-headers company-irony))))) + (irony-cdb-autosetup-compile-options)))) (use-package flycheck-irony :ensure t @@ -246,14 +233,17 @@ ;; ----------------------------------------------------------------------------- ;; Python -(use-package elpy - :ensure t - :defer t - :init - (advice-add 'python-mode :before 'elpy-enable) - :config - (setq python-shell-interpreter "python3") - (setq-default python-indent-offset 4)) +;;; TODO: need to find a LSP implementation for Python, currently elpy +;;; drags in company and i don't want that. + +;; (use-package elpy +;; :ensure t +;; :defer t +;; :init +;; (advice-add 'python-mode :before 'elpy-enable) +;; :config +;; (setq python-shell-interpreter "python3") +;; (setq-default python-indent-offset 4)) ;; ----------------------------------------------------------------------------- @@ -273,7 +263,7 @@ ("C-c C-r" . zig-run)) :config (require 'lsp) - (setq lsp-zig-zls-executable "~/prog/zig/zls/zig-cache/bin/zls")) + (setq lsp-zig-zls-executable "~/prog/zig/zls/zig-out/bin/zls")) ;; ------------------------------------------------------------------- ;; Misc languages @@ -334,9 +324,7 @@ ("M-p" . lua-backwards-to-block-begin-or-end)) :hook (lua-mode . (lambda () (require 'nodemcu-mode) - (use-package company-lua :ensure t :demand) - (nodemcu-mode 1) - (add-to-list 'company-backends 'company-lua)))) + (nodemcu-mode 1)))) (use-package verilog-mode :ensure t |