Cleanup
Some checks failed
/ Test config on 20 (push) Failing after 42s

This commit is contained in:
Maciej 2025-01-15 11:06:47 +02:00
parent 2150285aea
commit eb58a51bab
Signed by: maciej
GPG key ID: 41D62D42D3B0D765
20 changed files with 307 additions and 347 deletions

View file

@ -1,22 +0,0 @@
;;; common-lisp.el --- summary -*- lexical-binding: t; -*-
;; Author: Maciej Szlosarczyk
;; Maintainer: Maciej Szlosarczyk
;; Version: 0.1-snapshot
;;; Commentary:
;;; Code:
(require 'icejam-prog-mode)
(require 'icejam-complete-at-point)
(use-package slime :ensure t)
(use-package slime-company :ensure t
:requires (slime company))
(setq inferior-lisp-program "sbcl")
(slime-setup '(slime-fancy slime-company slime-quicklisp slime-asdf))
(provide 'icejam-lang-common-lisp)
;;; icejam-lang-common-lisp.el ends here

View file

@ -38,6 +38,7 @@
#'cape-elisp-symbol)))
(add-hook 'emacs-lisp-mode-hook 'icejam-activate-emacs-lisp-mode)
(add-hook 'ielm-mode-hook 'icejam-set-elisp-capfs)
(provide 'icejam-lang-elisp)
;;; icejam-lang-elisp.el ends here

View file

@ -13,8 +13,7 @@
(use-package elixir-format :defer t
:ensure (:type git :host github :repo "elixir-editors/emacs-elixir" :files ("elixir-format.el")))
(use-package elixir-ts-mode :ensure t :defer t
:after (elixir-format lsp-mode lsp-ui))
(use-package elixir-ts-mode :ensure t :defer t :after (elixir-format lsp-mode lsp-ui))
(transient-define-prefix icejam-elixir-lang-menu ()
"Elixir Buffer Commands."
@ -29,6 +28,12 @@
[""
("q" "Quit" keyboard-quit)])
(defun icejam-delete-elixir-snippets ()
"This function deletes Elixir snippets I don't use."
(-> 'elixir-mode
(yas--table-get-create)
(yas--remove-template-by-uuid "defmodule")))
(add-to-list
'icejam-language-transient-alist '(elixir-ts-mode . icejam-elixir-lang-menu))
@ -43,11 +48,8 @@
(setq-local lsp-eldoc-enable-hover nil)
(setq-local lsp-completion-enable-additional-text-edit nil)
(setq-local completion-at-point-functions
(list (cape-capf-super #'lsp-completion-at-point
#'yasnippet-capf)
#'cape-dabbrev
#'cape-file)))
(icejam-set-lsp-capfs)
(icejam-delete-elixir-snippets))
(add-hook 'heex-ts-mode-hook 'icejam-activate-elixir-ts-mode)
(add-hook 'elixir-ts-mode-hook 'icejam-activate-elixir-ts-mode)

View file

@ -13,74 +13,15 @@
:ensure (:depth 1)
:after (lsp lsp-ui))
;; (cl-defun icejam-erlang-emacs-path (erlang-version)
;; "Find path to Emacs tooling for ERLANG-VERSION."
;; (car (split-string
;; (shell-command-to-string
;; (format "find $HOME/.asdf/installs/erlang/%s/ -name erlang.el"
;; erlang-version)) "erlang.el")))
;; (cl-defun icejam-erlang-path (erlang-version)
;; "Find asdf path for ERLANG-VERSION."
;; (format "$HOME/.asdf/installs/erlang/%s/" erlang-version))
;; (defun icejam-erlang-plist (erlang-version)
;; "Create property list for ERLANG-VERSION."
;; (list :version erlang-version
;; :erlang-path (icejam-erlang-path erlang-version)
;; :emacs-path (icejam-erlang-emacs-path erlang-version)))
;; (cl-defun icejam-installed-erlangs ()
;; "List Erlang versions installed with asdf."
;; (split-string
;; (shell-command-to-string
;; (format "asdf list erlang"))))
;; (cl-defun icejam-erlang-available-versions--plist ()
;; "Create plist for all installed Erlang versions."
;; (mapcar 'icejam-erlang-plist (icejam-installed-erlangs)))
;; (defvar icejam-erlang-available-versions (icejam-erlang-available-versions--plist))
;; (cl-defun icejam-erlang-currently-in-use ()
;; "Get Erlang version currently in use."
;; (car (split-string (shell-command-to-string "asdf current erlang"))))
;; (cl-defun icejam-erlang-current-version--plistp (erlang-plist)
;; "Check if currently in use Erlang is the same as the one in ERLANG-PLIST."
;; (equal (plist-get erlang-plist :version) (icejam-erlang-currently-in-use)))
;; (cl-defun icejam-erlang-current-plist ()
;; "Create plist from current Erlang version."
;; (seq-find 'icejam-erlang-current-version--plistp icejam-erlang-available-versions))
(defun icejam-activate-erlang-mode ()
"All things for all Erlang, including header files."
;; (when (featurep 'erlang-start) (unload-feature 'erlang-start))
;; (defvar erlang/current-erlang (icejam-erlang-current-plist))
;; (add-to-list (make-local-variable 'load-path)
;; (plist-get erlang/current-erlang :emacs-path))
;; (add-to-list (make-local-variable 'exec-path)
;; (format "%slib/tools-3.1/emacs"
;; (plist-get erlang/current-erlang :erlang-path)))
;; (setq-local erlang-man-root-dir
;; (format "%sman"
;; (plist-get erlang/current-erlang :erlang-path)))
;; (require 'erlang-start)
(icejam-set-indent 4)
(column-enforce-n 80)
;; Start LSP
(lsp)
;; Company list override
(add-to-list (make-local-variable 'company-backends)
'(company-capf company-yasnippet)))
;; Capf override
(icejam-set-lsp-capfs))
(add-hook 'erlang-mode-hook 'icejam-activate-erlang-mode)

View file

@ -24,9 +24,8 @@
(column-enforce-n 100)
(lsp-deferred)
;; Company list override
(add-to-list (make-local-variable 'company-backends)
'(company-capf company-yasnippet)))
;; Capf override
(icejam-set-lsp-capfs))
(add-hook 'fsharp-mode-hook 'icejam-activate-fsharp-mode)

View file

@ -23,14 +23,13 @@
:after (lsp-mode lsp-ui haskell-mode))
(defun icejam-activate-haskell-mode ()
"Run this in haskell-mode."
"Run this in `haskell-mode'."
(icejam-set-indent 2)
(column-enforce-n 80)
(lsp-deferred)
;; Company list override
(add-to-list (make-local-variable 'company-backends)
'(company-capf company-yasnippet)))
;; Capf override
(icejam-set-lsp-capfs))
(add-hook 'haskell-mode-hook 'icejam-activate-haskell-mode)

View file

@ -7,7 +7,7 @@
(require 'icejam-lsp)
(use-package js2-mode :ensure t :defer t
:after (web-mode company lsp-mode lsp-ui))
:after (web-mode lsp-mode lsp-ui))
(use-package typescript-ts-mode :ensure nil :defer t)
@ -47,9 +47,7 @@
(setq-local lsp-eldoc-enable-hover nil)
(setq-local flycheck-check-syntax-automatically '(save mode-enabled))
;; "Company list override."
(add-to-list (make-local-variable 'company-backends)
'(company-capf company-yasnippet)))
(icejam-set-lsp-capfs))
(add-hook 'js2-mode-hook 'icejam-activate-js2-mode)

View file

@ -21,9 +21,8 @@
;; Run LSP
(lsp-deferred)
;; Company list override
(add-to-list (make-local-variable 'company-backends)
'(company-capf company-yasnippet)))
;; Capf override
(icejam-set-lsp-capfs))
(add-hook 'lean4-mode-hook 'icejam-activate-lean-mode)

View file

@ -38,9 +38,8 @@
(define-key php-mode-map (kbd "C-c l") 'icejam-lang-php/context-menu)
;; Company list override
(add-to-list (make-local-variable 'company-backends)
'(company-capf company-yasnippet)))
;; Capf override
(icejam-set-lsp-capfs))
(add-hook 'php-mode-hook 'icejam-lang-activate-php-mode)

View file

@ -24,8 +24,8 @@
;; Purescript indentation
(purescript-indentation-mode t)
;; Company list override
)
;; Capf override
(icejam-set-lsp-capfs))
(add-hook 'purescript-mode-hook 'icejam-activate-purescript-mode)

View file

@ -30,9 +30,8 @@
(lsp)
(column-enforce-n 99)
;; Company list override
(add-to-list (make-local-variable 'company-backends)
'(company-capf company-yasnippet)))
;; Capf override
(icejam-set-lsp-capfs))
(add-hook 'python-mode-hook 'icejam-lang-activate-python-mode)

View file

@ -23,9 +23,8 @@
;; Start LSP
(lsp)
;; Company list override
(add-to-list (make-local-variable 'company-backends)
'(company-capf company-yasnippet)))
;; Capf override
(icejam-set-lsp-capfs))
(add-hook 'ruby-ts-mode-hook 'rspec-mode)
(add-hook 'ruby-ts-mode-hook 'ruby-end-mode)