Add new theme and make lua a standalone lang module

lisp/icejam-base.el

@@ -146,7 +146,7 @@
 (use-package which-key :ensure t :defer t
   :hook ((elpaca-after-init . which-key-mode))
   :config
-  (setopt which-key-idle-delay 0.5))
+  (setopt which-key-idle-delay 0.2))
 
 ;;;;;;;;;;;;;;;;; Use C-n to create a new line
 (setopt next-line-add-newlines t)

lisp/icejam-complete-at-point.el

@@ -49,12 +49,16 @@
 
   ;; Set default completion values:
   (set-default 'completion-at-point-functions
-               (list #'cape-dabbrev #'cape-file #'cape-keyword)))
+               (list (cape-capf-super #'cape-dabbrev #'yasnippet-capf)
+                     #'cape-file
+                     #'cape-keyword)))
 
 (defun icejam-set-no-lsp-capfs ()
   "Set `completion-at-point-function` to non-LSP list."
   (setq-local completion-at-point-functions
-              (list #'cape-dabbrev #'cape-file #'cape-keyword)))
+              (list (cape-capf-super #'cape-dabbrev #'yasnippet-capf)
+                    #'cape-file
+                    #'cape-keyword)))
 
 (defun icejam-set-lsp-capfs ()
   "Set `completion-at-point-function` to list where LSP is supported."

lisp/icejam-custom-init.el

@@ -128,6 +128,7 @@
 (use-package icejam-lang-javascript :ensure nil)
 (use-package icejam-lang-kotlin :ensure nil)
 (use-package icejam-lang-lean :ensure nil)
+(use-package icejam-lang-lua :ensure nil)
 (use-package icejam-lang-markdown :ensure nil)
 (use-package icejam-lang-ocaml :ensure nil)
 (use-package icejam-lang-other :ensure nil)

lisp/icejam-themes.el

@@ -59,6 +59,7 @@
   (load-theme 'base16-gruvbox-dark-pale t t)
   (require 'icejam-base16-zenburn)
   (require 'icejam-base16-harmonic-light)
+  (require 'icejam-base16-catppuccin-latte)
 
   (if (memq window-system '(x mac ns))
       (enable-theme 'icejam-base16-zenburn)

lisp/langs/icejam-lang-elixir.el

@@ -19,7 +19,8 @@
                  :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 ()
   [[:description
@@ -38,7 +39,7 @@
   "This function deletes Elixir snippets I don't use."
   (-> 'elixir-mode
       (yas--table-get-create)
-      (yas--remove-template-by-uuid "defmodule")))
+      (yas--remove-template-by-uuid "defmodule XXX end")))
 
 (add-to-list
  'icejam-language-transient-alist '(elixir-ts-mode . icejam-elixir-lang-menu))
@@ -52,8 +53,8 @@
   ;; If needed, switch the one below to false to disable documentation pop-ups
   ;; (setq-local lsp-ui-doc-enable t)
 
-  (setq-local lsp-eldoc-enable-hover nil)
-  (setq-local lsp-completion-enable-additional-text-edit nil)
+  (setq-local lsp-eldoc-enable-hover nil
+              lsp-completion-enable-additional-text-edit nil)
   (icejam-set-lsp-capfs)
   (icejam-delete-elixir-snippets))
 

lisp/langs/icejam-lang-lua.el

@@ -0,0 +1,31 @@
+;;; icejam-lang-lua.el --- summary
+
+;; Author: Maciej Szlosarczyk
+;; Maintainer: Maciej Szlosarczyk
+;; Version: 0.1-snapshot
+
+;;; Commentary:
+
+;; Lua mode
+
+;;; Code:
+(eval-when-compile
+  (declare-function column-enforce-n 'column-enforce-mode (number))
+  (declare-function lsp 'lsp-mode)
+  (declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function icejam-set-lsp-capfs 'icejam-complete-at-point)
+  (defvar icejam-language-transient-alist))
+
+(use-package lua-mode :ensure t :defer t :after (lsp-mode))
+
+(defun icejam-activate-lua-mode ()
+  "All things related to Lua."
+  (icejam-set-indent 4)
+  (column-enforce-n 100)
+  (lsp)
+  (icejam-set-lsp-capfs))
+
+(add-hook 'lua-mode-hook 'icejam-activate-lua-mode)
+
+(provide 'icejam-lang-lua)
+;;; icejam-lang-lua.el ends here

lisp/langs/icejam-lang-markdown.el

@@ -6,6 +6,7 @@
   (declare-function elpaca-installed-p "elpaca")
   (declare-function column-enforce-n 'column-enforce-mode (number))
   (declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function icejam-set-no-lsp-capfs 'icejam-prog-mode)
   (declare-function rxt--re-builder-switch-pcre-mode "pcre2el"))
 
 ;; Markdown is a dependency of LSP mode. By wrapping it in unless we silence

lisp/langs/icejam-lang-other.el

@@ -18,9 +18,9 @@
 (use-package nginx-mode :ensure t :defer t)
 (use-package
   jenkinsfile-mode
-  :ensure (:repo "https://github.com/john2x/jenkinsfile-mode.git" :branch "master")
+  :ensure (:repo "https://github.com/john2x/jenkinsfile-mode.git"
+                 :branch "master")
   :defer t)
-(use-package lua-mode :ensure t :defer t)
 
 ;; Graphql schema definition files.
 (use-package graphql-mode :ensure t :defer t

lisp/themes/icejam-base16-catppuccin-latte.el

@@ -0,0 +1,49 @@
+;; icejam-base16-catppuccin-latte.el -- A base16 colorscheme
+
+;;; Commentary:
+;; Base16: (https://github.com/tinted-theming/home)
+
+;;; Authors:
+;; Scheme: https://github.com/catppuccin/catppuccin
+;; Template: Kaleb Elwert <belak@coded.io>
+
+;;; Code:
+
+;; Modifications:
+;; 03 darker by 8% #bcc0cc => #aaafbe
+
+(eval-when-compile
+  (declare-function base16-theme-define "base16-theme" (theme-name theme-colors)))
+
+(defvar icejam-base16-catppuccin-latte-theme-colors
+  '(:base00 "#eff1f5"
+            :base01 "#e6e9ef"
+            :base02 "#ccd0da"
+            :base03 "#aaafbe"
+            :base04 "#acb0be"
+            :base05 "#4c4f69"
+            :base06 "#dc8a78"
+            :base07 "#7287fd"
+            :base08 "#d20f39"
+            :base09 "#fe640b"
+            :base0A "#df8e1d"
+            :base0B "#40a02b"
+            :base0C "#179299"
+            :base0D "#1e66f5"
+            :base0E "#8839ef"
+            :base0F "#dd7878")
+  "All colors for Base16 Catppuccin Latte are defined here.")
+
+;; Define the theme
+(deftheme icejam-base16-catppuccin-latte)
+
+;; Add all the faces to the theme
+(with-eval-after-load 'base16-theme
+  (base16-theme-define 'icejam-base16-catppuccin-latte
+                       icejam-base16-catppuccin-latte-theme-colors))
+
+;; Mark the theme as provided
+(provide-theme 'icejam-base16-catppuccin-latte)
+(provide 'icejam-base16-catppuccin-latte)
+
+;;; icejam-base16-catppuccin-latte.el ends here

snippets/text-mode/dco-signoff

@@ -0,0 +1,4 @@
+# -*- mode: snippet -*-
+# name: dco-signoff
+# --
+Signed-off-by: Maciej Szlosarczyk (${1:maciej@sosek.net})