I broke some stuff, this fixes it
All checks were successful
/ Test config on 20 (push) Successful in 25s
All checks were successful
/ Test config on 20 (push) Successful in 25s
This commit is contained in:
parent
f0340183f6
commit
ff2dbc1796
9 changed files with 142 additions and 84 deletions
|
|
@ -3,6 +3,7 @@
|
|||
;;; Code:
|
||||
|
||||
(require 'icejam-prog-mode)
|
||||
(require 'icejam-transient)
|
||||
|
||||
(declare-function column-enforce-n "column-enforce-mode" (number))
|
||||
|
||||
|
|
@ -12,18 +13,20 @@
|
|||
["Buffer"
|
||||
("r" "Reload" icejam-revert-buffer-no-confirm)
|
||||
("i" "Indent" icejam-mark-and-indent-whole-buffer)
|
||||
("d" "Explain" helpful-at-point)
|
||||
("e" "Show Errors" flycheck-list-errors)]]
|
||||
[""
|
||||
("q" "Quit" keyboard-quit)])
|
||||
|
||||
(add-to-list
|
||||
'icejam-language-transient-alist '(emacs-lisp-mode . icejam/elisp-lang-menu))
|
||||
|
||||
(defun icejam/activate-emacs-lisp-mode ()
|
||||
"Goodies for editing Emacs files."
|
||||
(icejam/set-indent 2) ;; Default indentation of 2 characters
|
||||
(column-enforce-n 80)
|
||||
(setq-default indent-tabs-mode nil)
|
||||
|
||||
(define-key emacs-lisp-mode-map (kbd "C-c l") 'icejam/elisp-lang-menu)
|
||||
|
||||
;; Company list override
|
||||
(add-to-list (make-local-variable 'company-backends)
|
||||
'(company-yasnippet company-capf)))
|
||||
|
|
|
|||
|
|
@ -31,6 +31,9 @@
|
|||
[""
|
||||
("q" "Quit" keyboard-quit)])
|
||||
|
||||
(add-to-list
|
||||
'icejam-language-transient-alist '(elixir-ts-mode . icejam/elixir-lang-menu))
|
||||
|
||||
(defun icejam/activate-elixir-ts-mode ()
|
||||
"All things Elixir."
|
||||
(icejam/set-indent 2)
|
||||
|
|
@ -43,9 +46,6 @@
|
|||
;; If needed, switch the one below to false to disable documentation pop-ups
|
||||
;; (setq-local lsp-ui-doc-enable t)
|
||||
|
||||
;; Enable mode map
|
||||
(define-key elixir-ts-mode-map (kbd "C-c l") 'icejam/elixir-lang-menu)
|
||||
|
||||
;; Company list override
|
||||
(add-to-list (make-local-variable 'company-backends)
|
||||
'(company-capf company-yasnippet)))
|
||||
|
|
|
|||
|
|
@ -35,6 +35,9 @@
|
|||
[""
|
||||
("q" "Quit" keyboard-quit)])
|
||||
|
||||
(add-to-list
|
||||
'icejam-language-transient-alist '(elixir-ts-mode . icejam/elixir-lang-menu))
|
||||
|
||||
(defun icejam/load-ocaml-site-packages ()
|
||||
"Generate ocaml config."
|
||||
(let ((opam-share (ignore-errors (car (process-lines "opam" "var" "share")))))
|
||||
|
|
@ -47,8 +50,7 @@
|
|||
(autoload 'dune "dune" nil t nil)
|
||||
|
||||
;; Use opam switch to lookup ocamlmerlin binary
|
||||
(setq merlin-command 'opam)))
|
||||
(define-key tuareg-mode-map (kbd "C-c l") 'icejam-lang-ocaml/context-menu))
|
||||
(setq merlin-command 'opam))))
|
||||
|
||||
;; OCaml setup
|
||||
(add-hook 'tuareg-mode-hook 'merlin-mode)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,10 @@
|
|||
(require 'icejam-prog-mode)
|
||||
(require 'icejam-transient)
|
||||
|
||||
(transient-define-prefix icejam-lang-python/transient-context-menu ()
|
||||
(declare-function lsp nil)
|
||||
(declare-function column-enforce-n "column-enforce-mode" (number))
|
||||
|
||||
(transient-define-prefix icejam/python-lang-menu ()
|
||||
"Python Buffer Commands."
|
||||
[""
|
||||
["LSP"
|
||||
|
|
@ -18,14 +21,15 @@
|
|||
[""
|
||||
("q" "Quit" keyboard-quit)])
|
||||
|
||||
;; Add lookup for C-c l transient menu
|
||||
(add-to-list
|
||||
'icejam-language-transient-alist '(python-mode . icejam/python-lang-menu))
|
||||
|
||||
(defun icejam-lang/activate-python-mode ()
|
||||
"Activate python mode."
|
||||
(lsp)
|
||||
|
||||
(column-enforce-n 99)
|
||||
|
||||
(define-key python-mode-map (kbd "C-c l") 'icejam-lang-python/transient-context-menu)
|
||||
|
||||
;; Company list override
|
||||
(add-to-list (make-local-variable 'company-backends)
|
||||
'(company-capf company-yasnippet)))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue