This commit is contained in:
commit
a0b74ef1db
GPG key ID:
41D62D42D3B0D765
51 changed files with 1464 additions and 684 deletions
|
|
@ -9,12 +9,13 @@
|
|||
;; Avy is a navigation manager.
|
||||
|
||||
;;; Code:
|
||||
(use-package avy :straight t :defer t
|
||||
:config
|
||||
(setq avy-timeout-seconds 1)
|
||||
(require 'icejam-keys-mode)
|
||||
|
||||
(use-package avy :ensure t :defer t
|
||||
:custom (avy-timeout-seconds 1 "Wait for 1 second for candidates")
|
||||
:bind (:map icejam-keys-mode-map
|
||||
([(hyper j)] . avy-goto-char-timer)) ;; Jump to text.
|
||||
)
|
||||
;; Jump to text in sight with CMD-j
|
||||
([(hyper j)] . avy-goto-char-timer)))
|
||||
|
||||
(provide 'icejam-avy)
|
||||
;;; icejam-avy.el ends here
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
;; pkg/base defines basic packages and environment.
|
||||
|
||||
;;; Code:
|
||||
(require 'icejam-keys-mode)
|
||||
|
||||
;;;;;;;; Other optimizations ;;;;;;;;;;;;;;;;;
|
||||
;;;;;;;; Stolen from Doom Emacs. ;;;;;;;;;;;;;
|
||||
|
|
@ -40,19 +41,19 @@
|
|||
(global-set-key (kbd "RET") 'newline)
|
||||
|
||||
;;;;;;;;; Easy copying of data ;;;;;;;;;;;;;;;
|
||||
(use-package easy-kill :straight t :defer t
|
||||
:config (global-set-key [remap kill-ring-save] 'easy-kill))
|
||||
(use-package easy-kill :ensure t
|
||||
:bind ([remap kill-ring-save] . easy-kill))
|
||||
|
||||
;; Move buffers around with buffer keys
|
||||
(use-package buffer-move :straight t :defer t)
|
||||
|
||||
(use-package buffer-move :ensure t :defer t)
|
||||
|
||||
;; Garbage collection magic hack
|
||||
(use-package gcmh :straight t
|
||||
:config (gcmh-mode 1)
|
||||
(setq gcmh-verbose nil
|
||||
gcmh-idle-delay 'auto
|
||||
gcmh-auto-idle-delay-factor 10))
|
||||
(use-package gcmh :ensure t
|
||||
:custom ((gcmh-verbose nil "Do not log GC messages.")
|
||||
(gcmh-idle-delay 'auto "Compute GC delay based on gcmh-auto-idle-delay-factor")
|
||||
(gcmh-auto-idle-delay-factor 10 "Original value was 10"))
|
||||
:config
|
||||
(gcmh-mode t))
|
||||
|
||||
;; #====================== Backup config #==============================
|
||||
(setq backup-directory-alist
|
||||
|
|
@ -96,13 +97,17 @@
|
|||
;; Allow to execute path from shell
|
||||
(use-package exec-path-from-shell
|
||||
:if (memq window-system '(x mac ns))
|
||||
:straight t
|
||||
:config (add-to-list 'exec-path "/usr/local/bin")
|
||||
(dolist (var '("DEFT_PATH" "LANG" "LC_CTYPE"))
|
||||
(add-to-list 'exec-path-from-shell-variables var))
|
||||
(exec-path-from-shell-initialize))
|
||||
:ensure t
|
||||
:config
|
||||
(add-to-list 'exec-path "/usr/local/bin")
|
||||
(dolist (var '("DEFT_PATH" "LANG" "LC_CTYPE"))
|
||||
(add-to-list 'exec-path-from-shell-variables var))
|
||||
(exec-path-from-shell-initialize))
|
||||
|
||||
(use-package direnv :straight t :config (direnv-mode))
|
||||
(use-package direnv :ensure t
|
||||
:config
|
||||
(declare-function direnv-mode "direnv")
|
||||
(direnv-mode t))
|
||||
|
||||
;; Draw underline lower
|
||||
(setq x-underline-at-descent-line t)
|
||||
|
|
@ -114,33 +119,34 @@
|
|||
indicate-empty-lines nil)
|
||||
|
||||
;;;;;;;;;;;;;;;;; Treemacs
|
||||
(use-package treemacs :straight t :defer t
|
||||
:config (treemacs-follow-mode 1) ;; Follow the current project.
|
||||
(use-package treemacs :ensure t
|
||||
:commands (treemacs-follow-mode treemacs-project-follow-mode treemacs)
|
||||
:bind (:map icejam-keys-mode-map
|
||||
([(hyper b)] . treemacs))) ;; Show the folder tree
|
||||
|
||||
(use-package treemacs-all-the-icons :defer t :requires (treemacs) :straight t
|
||||
([(hyper b)] . treemacs))
|
||||
:config
|
||||
(treemacs-load-theme "all-the-icons")
|
||||
(treemacs-follow-mode t)
|
||||
(treemacs-project-follow-mode t))
|
||||
|
||||
(use-package treemacs-all-the-icons :ensure t :defer t
|
||||
:requires (treemacs)
|
||||
:commands (treemacs-load-theme)
|
||||
:config (treemacs-load-theme "all-the-icons"))
|
||||
|
||||
;;;;;;;;;;;;;;;;; Record frequency of different commands. Review them later
|
||||
(use-package keyfreq
|
||||
:defer t
|
||||
:straight t
|
||||
(use-package keyfreq :ensure t
|
||||
:config
|
||||
(declare-function keyfreq-mode "keyfreq")
|
||||
(declare-function keyfreq-autosave-mode "keyfreq")
|
||||
(keyfreq-mode t)
|
||||
(keyfreq-autosave-mode t))
|
||||
|
||||
;;;;;;;;;;;;;;;;; Show hints about key combinations
|
||||
(use-package which-key
|
||||
:straight t
|
||||
:config
|
||||
(setq which-key-idle-delay 0.5)
|
||||
(which-key-mode t))
|
||||
(use-package which-key :ensure t
|
||||
:custom (which-key-idle-delay 0.5)
|
||||
:config (which-key-mode t))
|
||||
|
||||
;;;;;;;;;;;;;;;;; Use C-n to create a new line
|
||||
(setq next-line-add-newlines t)
|
||||
(setopt next-line-add-newlines t)
|
||||
|
||||
;;;;;;;;;;;;;;;;; Speed up long line display by disabling bidirectional text
|
||||
(setq-default bidi-paragraph-direction 'left-to-right
|
||||
|
|
|
|||
21
lisp/icejam-blocking.el
Normal file
21
lisp/icejam-blocking.el
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
;;; icejam-blocking.el --- summary
|
||||
|
||||
;; Author: Maciej Szlosarczyk
|
||||
;; Maintainer: Maciej Szlosarczyk
|
||||
;; Version: 0.1-snapshot
|
||||
|
||||
;;; Commentary:
|
||||
;; These packages are foundational dependency and possibly can be blocking.
|
||||
;;; Code:
|
||||
|
||||
(use-package transient :ensure (:wait t))
|
||||
(use-package diminish :ensure (:wait t))
|
||||
(use-package company :ensure (:wait t))
|
||||
|
||||
;; https://emacs-lsp.github.io/lsp-mode/page/performance/#use-plists-for-deserialization
|
||||
;; This supposedly makes it faster.
|
||||
(setenv "LSP_USE_PLISTS" "true")
|
||||
(use-package lsp-mode :ensure (:wait t))
|
||||
|
||||
(provide 'icejam-blocking)
|
||||
;;; icejam-blocking.el ends here
|
||||
|
|
@ -2,104 +2,89 @@
|
|||
;;; Commentary:
|
||||
;;; Company completion framework configuration
|
||||
;;; Code:
|
||||
(require 'icejam-blocking)
|
||||
|
||||
(use-package yasnippet
|
||||
:straight t
|
||||
:defer t)
|
||||
|
||||
(use-package yasnippet-snippets
|
||||
:straight t
|
||||
:defer t
|
||||
:requires (yasnippet)
|
||||
(use-package yasnippet :ensure t
|
||||
:config
|
||||
(yas-global-mode t)
|
||||
(unbind-key "C-c & C-n" yas-minor-mode-map)
|
||||
(unbind-key "C-c & C-s" yas-minor-mode-map)
|
||||
(unbind-key "C-c & C-v" yas-minor-mode-map))
|
||||
|
||||
(yas-global-mode t)
|
||||
(use-package yasnippet-snippets :ensure t :after (yasnippet))
|
||||
(use-package company-box :ensure t :after (company)
|
||||
:hook (company-mode . company-box-mode))
|
||||
|
||||
(use-package company
|
||||
:commands (company-indent-or-complete-common company-yasnippet)
|
||||
:requires (yasnippet
|
||||
yasnippet-snippets)
|
||||
:straight t
|
||||
:defer t)
|
||||
(with-eval-after-load 'company
|
||||
(global-company-mode t)
|
||||
|
||||
(use-package company-box
|
||||
:straight t
|
||||
:defer t
|
||||
:requires (company)
|
||||
:hook (((company-mode) . company-box-mode)))
|
||||
;; Hacks for orderless
|
||||
(defun just-one-face (fn &rest args)
|
||||
(let ((orderless-match-faces [completions-common-part]))
|
||||
(apply fn args)))
|
||||
|
||||
(global-company-mode t)
|
||||
(advice-add 'company-capf--candidates :around #'just-one-face)
|
||||
|
||||
;; Hacks for orderless
|
||||
(defun just-one-face (fn &rest args)
|
||||
(let ((orderless-match-faces [completions-common-part]))
|
||||
(apply fn args)))
|
||||
(defun company-completion-styles (capf-fn &rest args)
|
||||
(let ((completion-styles '(partial-completion basic)))
|
||||
(apply capf-fn args)))
|
||||
|
||||
(advice-add 'company-capf--candidates :around #'just-one-face)
|
||||
(advice-add 'company-capf :around #'company-completion-styles)
|
||||
|
||||
(defun company-completion-styles (capf-fn &rest args)
|
||||
(let ((completion-styles '(partial-completion basic)))
|
||||
(apply capf-fn args)))
|
||||
(setq-default
|
||||
company-minimum-prefix-length 3 ;; minimum prefix character number for auto complete.
|
||||
company-idle-delay 0.1
|
||||
company-require-match nil
|
||||
company-echo-delay 0 ;;;; company-show-numbers t
|
||||
company-tooltip-align-annotations t ;; align annotations to the right tooltip border.
|
||||
company-tooltip-flip-when-above t
|
||||
company-tooltip-limit 10 ;; tooltip candidates max limit.
|
||||
company-tooltip-minimum 2 ;; minimum candidates limit.
|
||||
company-tooltip-minimum-width 10 ;; The minimum width of the tooltip's inner area.
|
||||
;; This doesn't include the margins and the scroll bar.
|
||||
company-tooltip-margin 2 ;; width of margin columns to show around the tooltip
|
||||
company-tooltip-offset-display 'lines ;; 'lines - how to show tooltip unshown candidates number.
|
||||
company-show-numbers nil ;; t: show quick-access numbers for the first ten candidates.
|
||||
company-selection-wrap-around t ;; loop over candidates
|
||||
company-dabbrev-other-buffers t ;; Only offer dabbrev from the same major mode
|
||||
company-dabbrev-downcase nil ;; Preserve case of candidates
|
||||
company-format-margin-function nil
|
||||
;; company-async-wait 0.03
|
||||
;; company-async-timeout 2
|
||||
)
|
||||
|
||||
(advice-add 'company-capf :around #'company-completion-styles)
|
||||
;; Absolute defaults for company mode
|
||||
(setq company-backends
|
||||
'((company-files ; files & directory
|
||||
company-keywords ; keywords
|
||||
company-capf
|
||||
)
|
||||
(company-dabbrev company-abbrev)
|
||||
))
|
||||
|
||||
(setq-default
|
||||
company-minimum-prefix-length 3 ;; minimum prefix character number for auto complete.
|
||||
company-idle-delay 0.1
|
||||
company-require-match nil
|
||||
company-echo-delay 0 ;;;; company-show-numbers t
|
||||
company-tooltip-align-annotations t ;; align annotations to the right tooltip border.
|
||||
company-tooltip-flip-when-above t
|
||||
company-tooltip-limit 10 ;; tooltip candidates max limit.
|
||||
company-tooltip-minimum 2 ;; minimum candidates limit.
|
||||
company-tooltip-minimum-width 10 ;; The minimum width of the tooltip's inner area.
|
||||
;; This doesn't include the margins and the scroll bar.
|
||||
company-tooltip-margin 2 ;; width of margin columns to show around the tooltip
|
||||
company-tooltip-offset-display 'lines ;; 'lines - how to show tooltip unshown candidates number.
|
||||
company-show-numbers nil ;; t: show quick-access numbers for the first ten candidates.
|
||||
company-selection-wrap-around t ;; loop over candidates
|
||||
company-dabbrev-other-buffers t ;; Only offer dabbrev from the same major mode
|
||||
company-dabbrev-downcase nil ;; Preserve case of candidates
|
||||
company-format-margin-function nil
|
||||
;; company-async-wait 0.03
|
||||
;; company-async-timeout 2
|
||||
)
|
||||
;; Use standard emacs next and previous bindings for navigating company
|
||||
;; suggestions
|
||||
(define-key company-active-map (kbd "C-p") 'company-select-previous-or-abort)
|
||||
(define-key company-active-map (kbd "C-n") 'company-select-next-or-abort)
|
||||
|
||||
;; Absolute defaults for company mode
|
||||
(setq company-backends
|
||||
'((company-files ; files & directory
|
||||
company-keywords ; keywords
|
||||
company-capf
|
||||
)
|
||||
(company-dabbrev company-abbrev)
|
||||
))
|
||||
(defun icejam-insert-space-and-complete ()
|
||||
"Insert space before trying to complete a section."
|
||||
(interactive)
|
||||
(save-excursion
|
||||
(insert " "))
|
||||
(company-indent-or-complete-common))
|
||||
|
||||
;; Use standard emacs next and previous bindings for navigating company
|
||||
;; suggestions
|
||||
(define-key company-active-map (kbd "C-p") 'company-select-previous-or-abort)
|
||||
(define-key company-active-map (kbd "C-n") 'company-select-next-or-abort)
|
||||
|
||||
(defun icejam-insert-space-and-complete ()
|
||||
"Insert space before trying to complete a section."
|
||||
(interactive)
|
||||
(save-excursion
|
||||
(insert " "))
|
||||
(company-indent-or-complete-common))
|
||||
|
||||
;; Only use RETURN for completion in company
|
||||
(unbind-key "TAB" company-active-map)
|
||||
;; Only use RETURN for completion in company
|
||||
(unbind-key "TAB" company-active-map)
|
||||
|
||||
;;; Yasnippet configuration
|
||||
(define-key prog-mode-map (kbd "C-c y") 'company-yasnippet)
|
||||
(define-key prog-mode-map (kbd "<f13>") 'icejam-insert-space-and-complete)
|
||||
(define-key prog-mode-map (kbd "TAB") 'company-indent-or-complete-common)
|
||||
(define-key prog-mode-map (kbd "C-c y") 'company-yasnippet)
|
||||
(define-key prog-mode-map (kbd "<f13>") 'icejam-insert-space-and-complete)
|
||||
(define-key prog-mode-map (kbd "TAB") 'company-indent-or-complete-common)
|
||||
|
||||
(define-key text-mode-map (kbd "C-c y") 'company-yasnippet)
|
||||
(define-key text-mode-map (kbd "<f13>") 'icejam-insert-space-and-complete)
|
||||
(define-key text-mode-map (kbd "TAB") 'company-indent-or-complete-common)
|
||||
(define-key text-mode-map (kbd "C-c y") 'company-yasnippet)
|
||||
(define-key text-mode-map (kbd "<f13>") 'icejam-insert-space-and-complete)
|
||||
(define-key text-mode-map (kbd "TAB") 'company-indent-or-complete-common))
|
||||
|
||||
(provide 'icejam-company-yasnippet)
|
||||
;;; icejam-company-yasnippet.el ends here
|
||||
|
|
|
|||
|
|
@ -1,41 +1,26 @@
|
|||
;;; icejam-completing-read -- Functions related to completing-read -*- lexical-binding: t; -*-
|
||||
;;; Commentary:
|
||||
;;;
|
||||
;;; completing-read is the way of completing things in minibuffer. This module
|
||||
;;; provides all of that functionality, everything related to minbuffer being helpful.
|
||||
;;;
|
||||
;;; Code:
|
||||
|
||||
(require 'icejam-keys-mode)
|
||||
|
||||
(use-package vertico :straight t :defer t
|
||||
:init
|
||||
(defun icejam-vertico-next-page ()
|
||||
(interactive)
|
||||
(vertico-next 15))
|
||||
(defun icejam-vertico-previous-page ()
|
||||
(interactive)
|
||||
(vertico-previous 15))
|
||||
(vertico-mode)
|
||||
:custom
|
||||
(vertico-scroll-margin 0) ;; Different scroll margin
|
||||
(vertico-count 15) ;; Show more candidates
|
||||
(vertico-resize t) ;; Grow and shrink the Vertico minibuffer
|
||||
(vertico-cycle t) ;; Enable cycling for `vertico-next/previous')
|
||||
:bind (:map vertico-map
|
||||
("<next>" . icejam-vertico-next-page)
|
||||
("<prior>" . icejam-vertico-previous-page)))
|
||||
;; Preparations for using Vertico/Orderless
|
||||
(setq
|
||||
;; Support opening new minibuffers from inside existing minibuffers.
|
||||
enable-recursive-minibuffers t
|
||||
;; Hide commands in M-x which do not work in the current mode. Vertico
|
||||
;; commands are hidden in normal buffers. This setting is useful beyond
|
||||
;; Vertico.
|
||||
read-extended-command-predicate #'command-completion-default-include-p
|
||||
;; Do not allow the cursor in the minibuffer prompt
|
||||
minibuffer-prompt-properties '(read-only t cursor-intangible t face minibuffer-prompt))
|
||||
|
||||
;; Support opening new minibuffers from inside existing minibuffers.
|
||||
(setq enable-recursive-minibuffers t)
|
||||
|
||||
;; Hide commands in M-x which do not work in the current mode. Vertico
|
||||
;; commands are hidden in normal buffers. This setting is useful beyond
|
||||
;; Vertico.
|
||||
(setq read-extended-command-predicate #'command-completion-default-include-p)
|
||||
|
||||
;; Add prompt indicator to `completing-read-multiple'.
|
||||
;; We display [CRM<separator>], e.g., [CRM,] if the separator is a comma.
|
||||
(defvar crm-separator)
|
||||
(defun crm-indicator (args)
|
||||
"Add prompt indicator. Use ARGSs later."
|
||||
>>>>>>> use-elpaca
|
||||
(cons (format "[CRM%s] %s"
|
||||
(replace-regexp-in-string
|
||||
"\\`\\[.*?]\\*\\|\\[.*?]\\*\\'" ""
|
||||
|
|
@ -43,29 +28,33 @@
|
|||
(car args))
|
||||
(cdr args)))
|
||||
(advice-add #'completing-read-multiple :filter-args #'crm-indicator)
|
||||
|
||||
;; Do not allow the cursor in the minibuffer prompt
|
||||
(setq minibuffer-prompt-properties
|
||||
'(read-only t cursor-intangible t face minibuffer-prompt))
|
||||
(add-hook 'minibuffer-setup-hook #'cursor-intangible-mode)
|
||||
|
||||
;; Optionally use the `orderless' completion style.
|
||||
(use-package orderless :straight t :defer t
|
||||
:custom
|
||||
;; Configure a custom style dispatcher (see the Consult wiki)
|
||||
;; (orderless-style-dispatchers '(+orderless-consult-dispatch orderless-affix-dispatch))
|
||||
;; (orderless-component-separator #'orderless-escapable-split-on-space)
|
||||
(completion-styles '(orderless basic))
|
||||
(completion-category-defaults nil)
|
||||
(completion-category-overrides '((file (styles partial-completion)))))
|
||||
;; Actual orderless
|
||||
(use-package vertico :ensure t
|
||||
:custom ((vertico-scroll-margin 1 "Scroll on N-1")
|
||||
(vertico-count 15 "Show 5 more candidates")
|
||||
(vertico-resize t "Grow and shrink the vertico minibufffer")
|
||||
(vertico-cycle t "Cycle completion"))
|
||||
:config
|
||||
(vertico-mode t))
|
||||
|
||||
(use-package marginalia :straight t :defer t :init (marginalia-mode))
|
||||
(use-package consult :straight t :defer t)
|
||||
(use-package helpful :straight t :defer t)
|
||||
(use-package orderless :ensure t
|
||||
:custom ((completion-styles '(orderless partial-completion basic)
|
||||
"Fallback to basic if orderless does not work.")
|
||||
(completion-category-defaults nil)
|
||||
(completion-category-overrides
|
||||
'((file (styles partial-completion))))))
|
||||
|
||||
(with-eval-after-load 'consult
|
||||
(define-key icejam-keys-mode-map (kbd "C-c a") 'consult-ripgrep)
|
||||
(define-key icejam-keys-mode-map (kbd "C-c t") 'find-file))
|
||||
|
||||
(use-package marginalia :ensure t
|
||||
:config (marginalia-mode t))
|
||||
(use-package consult :ensure t
|
||||
:bind (:map icejam-keys-mode-map
|
||||
("C-c t" . find-file)
|
||||
("M-g" . consult-goto-line)
|
||||
("C-c a" . consult-ripgrep)))
|
||||
(use-package helpful :ensure t)
|
||||
|
||||
(provide 'icejam-completing-read)
|
||||
;;; icejam-completing-read.el ends here
|
||||
|
|
|
|||
|
|
@ -9,35 +9,37 @@
|
|||
;;; Copilot and other GPT stuff
|
||||
|
||||
;;; Code:
|
||||
(use-package copilot
|
||||
:straight (:host github :repo "copilot-emacs/copilot.el" :files ("*.el"))
|
||||
:ensure t)
|
||||
|
||||
;; Do not enable copilot by default because it sorta sucks?
|
||||
;; (add-hook 'prog-mode-hook 'copilot-mode)
|
||||
(define-key copilot-completion-map (kbd "<tab>") 'copilot-accept-completion)
|
||||
(define-key copilot-completion-map (kbd "TAB") 'copilot-accept-completion)
|
||||
(use-package copilot :ensure (:host github :repo "copilot-emacs/copilot.el" :files ("*.el"))
|
||||
:defer t
|
||||
;; It sort of sucks so let's disable it.
|
||||
;; :hook ((prog-mode . copilot-mode))
|
||||
:bind (:map copilot-completion-map
|
||||
([tab] . copilot-accept-completion))
|
||||
:config
|
||||
(add-to-list 'copilot-indentation-alist '(emacs-lisp-mode . 2)))
|
||||
|
||||
;; Enable Anthropic Claude LLM support for chat (it also sucks)
|
||||
(use-package gptel :straight t :ensure t)
|
||||
|
||||
(defcustom anthropic-api-key "api-key" "The value of your Anthropic API key."
|
||||
:type 'string
|
||||
:group 'icejam
|
||||
:initialize 'custom-initialize-set)
|
||||
|
||||
(setq
|
||||
gptel-model "claude-3-5-sonnet-20240620"
|
||||
gptel-backend (gptel-make-anthropic "Claude" :stream t :key (lambda () anthropic-api-key)))
|
||||
(use-package gptel :ensure t :defer t
|
||||
:config
|
||||
(setq
|
||||
gptel-model 'claude-3-5-sonnet-20241022
|
||||
gptel-backend (gptel-make-anthropic "Claude"
|
||||
:stream t :key (lambda () anthropic-api-key))))
|
||||
|
||||
;; Pretend to be 'AI editor'.
|
||||
(use-package elysium :straight t :ensure t
|
||||
:custom (elysium-window-size 0.33) ; The elysium buffer will be 1/3 your screen
|
||||
(elysium-window-style 'vertical)) ; Can be customized to horizontal
|
||||
(use-package elysium :ensure t :defer t
|
||||
:custom
|
||||
((elysium-window-size 0.33 "The elysium buffer will be 1/3 your screen")
|
||||
(elysium-window-style 'vertical "Elysium buffer will be vertical")))
|
||||
|
||||
;; Merging with SMerge
|
||||
(require 'smerge-mode)
|
||||
(add-hook 'prog-mode-hook 'smerge-mode)
|
||||
(use-package smerge-mode :ensure nil
|
||||
:hook ((prog-mode . smerge-mode)))
|
||||
|
||||
(provide 'icejam-copilot)
|
||||
;;; icejam-copilot.el ends here
|
||||
|
|
|
|||
|
|
@ -14,21 +14,62 @@
|
|||
(setq gc-cons-threshold 500000000)
|
||||
(setq gc-cons-percentage 0.6)
|
||||
|
||||
;;; Use straight.el for package management
|
||||
(defvar bootstrap-version)
|
||||
(let ((bootstrap-file
|
||||
(expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
|
||||
(bootstrap-version 5))
|
||||
(unless (file-exists-p bootstrap-file)
|
||||
(with-current-buffer
|
||||
(url-retrieve-synchronously
|
||||
"https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
|
||||
'silent 'inhibit-cookies)
|
||||
(goto-char (point-max))
|
||||
(eval-print-last-sexp)))
|
||||
(load bootstrap-file nil 'nomessage))
|
||||
;; Allow for deeper stacktraces / recursion
|
||||
;; (setq max-lisp-eval-depth 10000)
|
||||
|
||||
(straight-use-package 'use-package)
|
||||
;;; Use elpaca for package management.
|
||||
(defvar elpaca-installer-version 0.7)
|
||||
(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
|
||||
(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
|
||||
(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
|
||||
(defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
|
||||
:ref nil :depth 1
|
||||
:files (:defaults "elpaca-test.el" (:exclude "extensions"))
|
||||
:build (:not elpaca--activate-package)))
|
||||
(let* ((repo (expand-file-name "elpaca/" elpaca-repos-directory))
|
||||
(build (expand-file-name "elpaca/" elpaca-builds-directory))
|
||||
(order (cdr elpaca-order))
|
||||
(default-directory repo))
|
||||
(add-to-list 'load-path (if (file-exists-p build) build repo))
|
||||
(unless (file-exists-p repo)
|
||||
(make-directory repo t)
|
||||
(when (< emacs-major-version 28) (require 'subr-x))
|
||||
(condition-case-unless-debug err
|
||||
(if-let ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
|
||||
((zerop (apply #'call-process `("git" nil ,buffer t "clone"
|
||||
,@(when-let ((depth (plist-get order :depth)))
|
||||
(list (format "--depth=%d" depth) "--no-single-branch"))
|
||||
,(plist-get order :repo) ,repo))))
|
||||
((zerop (call-process "git" nil buffer t "checkout"
|
||||
(or (plist-get order :ref) "--"))))
|
||||
(emacs (concat invocation-directory invocation-name))
|
||||
((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch"
|
||||
"--eval" "(byte-recompile-directory \".\" 0 'force)")))
|
||||
((require 'elpaca))
|
||||
((elpaca-generate-autoloads "elpaca" repo)))
|
||||
(progn (message "%s" (buffer-string)) (kill-buffer buffer))
|
||||
(error "%s" (with-current-buffer buffer (buffer-string))))
|
||||
((error) (warn "%s" err) (delete-directory repo 'recursive))))
|
||||
(unless (require 'elpaca-autoloads nil t)
|
||||
(require 'elpaca)
|
||||
(elpaca-generate-autoloads "elpaca" repo)
|
||||
(load "./elpaca-autoloads")))
|
||||
(add-hook 'after-init-hook #'elpaca-process-queues)
|
||||
(elpaca `(,@elpaca-order))
|
||||
|
||||
;; Use package settings
|
||||
(setq use-package-verbose t)
|
||||
(setq use-package-compute-statistics t)
|
||||
(elpaca elpaca-use-package
|
||||
;; Enable use-package :ensure support for Elpaca.
|
||||
(elpaca-use-package-mode))
|
||||
|
||||
(elpaca-load-lockfile (concat user-emacs-directory "elpaca.lock"))
|
||||
|
||||
(defun icejam-elpaca-write-lock ()
|
||||
"Write elpaca lock file."
|
||||
(interactive)
|
||||
(elpaca-write-lockfile (concat user-emacs-directory "elpaca.lock")))
|
||||
|
||||
;; I don't know why this needs to be here and with a lisp directory, but
|
||||
;; normal subdirs.el file doesn't work.
|
||||
|
|
@ -39,6 +80,7 @@
|
|||
|
||||
;; General configuration files.
|
||||
(require 'icejam-keys-mode)
|
||||
(require 'icejam-blocking)
|
||||
(require 'icejam-base)
|
||||
(require 'icejam-sys-specific)
|
||||
(require 'icejam-tree-sitter)
|
||||
|
|
@ -64,7 +106,7 @@
|
|||
;; Actual supported languages and file syntax.
|
||||
(require 'icejam-lang-clang)
|
||||
(require 'icejam-lang-clojure)
|
||||
;; (require 'icejam-lang-common-lisp) ;; I don't use common lisp often, so let's not load.
|
||||
;; (require 'icejam-lang-common-lisp)
|
||||
(require 'icejam-lang-dart)
|
||||
(require 'icejam-lang-dhall)
|
||||
(require 'icejam-lang-elisp)
|
||||
|
|
|
|||
|
|
@ -10,21 +10,19 @@
|
|||
|
||||
;;; Code:
|
||||
|
||||
(use-package dashboard
|
||||
:straight t
|
||||
:config
|
||||
(dashboard-setup-startup-hook)
|
||||
|
||||
(setq dashboard-footer-messages
|
||||
'("Happy coding!" "I showed you my source code, pls respond"))
|
||||
|
||||
(setq dashboard-startup-banner 'logo)
|
||||
|
||||
(setq dashboard-items '((recents . 5)
|
||||
;; (bookmarks . 5)
|
||||
;; (agenda . 5)
|
||||
;; (registers . 5)
|
||||
(projects . 5))))
|
||||
(use-package dashboard :ensure t :demand t
|
||||
:commands dashboard-setup-startup-hook
|
||||
:hook
|
||||
((elpaca-after-init . dashboard-open))
|
||||
:custom
|
||||
((dashboard-footer-messages '("Happy coding!" "I showed you my source code, pls respond"))
|
||||
(dashboard-startup-banner 'logo)
|
||||
(dashboard-items '((recents . 5)
|
||||
;; (bookmarks . 5)
|
||||
;; (agenda . 5)
|
||||
;; (registers . 5)
|
||||
(projects . 5))))
|
||||
:config (dashboard-setup-startup-hook))
|
||||
|
||||
(provide 'icejam-dashboard)
|
||||
;;; icejam-dashboard.el ends here
|
||||
|
|
|
|||
|
|
@ -6,25 +6,21 @@
|
|||
(require 'icejam-keys-mode)
|
||||
(require 'icejam-transient)
|
||||
|
||||
(use-package deft
|
||||
:straight t
|
||||
:defer t
|
||||
:config (setq
|
||||
deft-directory (substitute-in-file-name "$DEFT_PATH")
|
||||
deft-default-extension "md"
|
||||
;; NB! deft returns absolute paths as filenames, so
|
||||
;; ignore works slightly differently.
|
||||
deft-ignore-file-regexp "\\._[0-9-A-Z_]+\\.md$"
|
||||
deft-strip-summary-regexp (concat "\\("
|
||||
"[\n\t]" ;; blank
|
||||
"\\|^:[[:ascii:]]+:.*$" ;; org-mode properties string
|
||||
"\\|^Title:.*$" ;; Title string
|
||||
"\\|^title:.*$" ;; title string
|
||||
"\\|^\\[\\[file:.*$" ;; org-mode inline-images
|
||||
;; org-mode properties
|
||||
;; "\\|:PROPERTIES:\n\\(.+\n\\)+:END:\n" ;;
|
||||
"\\)")
|
||||
deft-auto-save-interval 30.0))
|
||||
(use-package deft :ensure t
|
||||
:custom
|
||||
((deft-directory (substitute-in-file-name "$DEFT_PATH"))
|
||||
(deft-default-extension "md")
|
||||
(deft-ignore-file-regexp "\\._[0-9-A-Z_]+\\.md$")
|
||||
(deft-strip-summary-regexp (concat "\\("
|
||||
"[\n\t]" ;; blank
|
||||
"\\|^:[[:ascii:]]+:.*$" ;; org-mode properties string
|
||||
"\\|^Title:.*$" ;; Title string
|
||||
"\\|^title:.*$" ;; title string
|
||||
"\\|^\\[\\[file:.*$" ;; org-mode inline-images
|
||||
;; org-mode properties
|
||||
;; "\\|:PROPERTIES:\n\\(.+\n\\)+:END:\n" ;;
|
||||
"\\)"))
|
||||
(deft-auto-save-interval 30.0)))
|
||||
|
||||
(provide 'icejam-deft)
|
||||
;;; icejam-deft.el ends here
|
||||
|
|
|
|||
|
|
@ -9,20 +9,24 @@
|
|||
;; diminish minor modes
|
||||
|
||||
;;; Code:
|
||||
(use-package diminish :straight t)
|
||||
(require 'icejam-blocking)
|
||||
;; (use-package diminish :ensure t)
|
||||
|
||||
(eval-after-load 'flyspell '(diminish 'flyspell-mode))
|
||||
(eval-after-load 'flycheck '(diminish 'flycheck-mode))
|
||||
(eval-after-load 'rainbow-mode '(diminish 'rainbow-mode))
|
||||
(eval-after-load 'undo-tree '(diminish 'undo-tree-mode))
|
||||
(eval-after-load 'company '(diminish 'company-mode))
|
||||
(eval-after-load 'which-key '(diminish 'which-key-mode))
|
||||
(eval-after-load 'eldoc '(diminish 'eldoc-mode))
|
||||
(eval-after-load 'yasnippet '(diminish 'yas-minor-mode))
|
||||
(eval-after-load 'whitespace '(diminish 'whitespace-mode))
|
||||
(eval-after-load 'autorevert '(diminish 'auto-revert-mode))
|
||||
(eval-after-load 'ivy '(diminish 'ivy-mode))
|
||||
(eval-after-load 'gcmh '(diminish 'gcmh-mode))
|
||||
(with-eval-after-load 'diminish
|
||||
(with-eval-after-load 'flyspell (diminish 'flyspell-mode))
|
||||
(with-eval-after-load 'flycheck (diminish 'flycheck-mode))
|
||||
(with-eval-after-load 'rainbow-mode (diminish 'rainbow-mode))
|
||||
(with-eval-after-load 'undo-tree (diminish 'undo-tree-mode))
|
||||
(with-eval-after-load 'company (diminish 'company-mode))
|
||||
(with-eval-after-load 'which-key (diminish 'which-key-mode))
|
||||
(with-eval-after-load 'eldoc (diminish 'eldoc-mode))
|
||||
(with-eval-after-load 'yasnippet (diminish 'yas-minor-mode))
|
||||
(with-eval-after-load 'whitespace (diminish 'whitespace-mode))
|
||||
(with-eval-after-load 'autorevert (diminish 'auto-revert-mode))
|
||||
(with-eval-after-load 'ivy (diminish 'ivy-mode))
|
||||
(with-eval-after-load 'company-box (diminish 'company-box-mode))
|
||||
(with-eval-after-load 'smerge-mode (diminish 'smerge-mode))
|
||||
(with-eval-after-load 'gcmh (diminish 'gcmh-mode)))
|
||||
|
||||
(provide 'icejam-diminish)
|
||||
;;; icejam-diminish.el ends here
|
||||
|
|
|
|||
|
|
@ -3,11 +3,10 @@
|
|||
;;; Code:
|
||||
|
||||
;; Use flycheck globally to check syntax and compile languages
|
||||
(use-package flycheck
|
||||
:commands flycheck-define-checker
|
||||
:straight t
|
||||
:defer t
|
||||
:config (global-flycheck-mode t)
|
||||
(use-package flycheck :ensure t
|
||||
:custom ((flycheck-emacs-lisp-load-path 'inherit))
|
||||
:config
|
||||
(global-flycheck-mode t)
|
||||
(setq flycheck-emacs-lisp-load-path 'inherit)
|
||||
(unbind-key "C-c ! C-c" flycheck-mode-map)
|
||||
(unbind-key "C-c ! C-w" flycheck-mode-map)
|
||||
|
|
|
|||
|
|
@ -3,22 +3,24 @@
|
|||
;;; Highlight misspelled words
|
||||
;;; Code:
|
||||
|
||||
(use-package ispell
|
||||
:straight t
|
||||
:config (setq ispell-program-name "aspell")
|
||||
(setq ispell-extra-args
|
||||
'("--run-together" "--run-together-limit=5" "--run-together-min=2"))
|
||||
:hook ((prog-mode text-mode markdown-mode) . flyspell-mode))
|
||||
|
||||
(add-hook 'flyspell-mode-hook (lambda ()
|
||||
(unbind-key "C-," flyspell-mode-map)
|
||||
(unbind-key "C-." flyspell-mode-map)
|
||||
(unbind-key "C-;" flyspell-mode-map)
|
||||
(unbind-key "C-c $" flyspell-mode-map)
|
||||
(unbind-key "C-M-i" flyspell-mode-map)))
|
||||
|
||||
(use-package flyspell-correct :straight t :after flyspell :defer t)
|
||||
(use-package flyspell-correct-ivy :straight :after flyspell-correct :defer t)
|
||||
(use-package ispell :ensure nil
|
||||
:custom
|
||||
((ispell-program-name "aspell")
|
||||
(ispell-extra-args '("--run-together" "--run-together-limit=5" "--run-together-min=2"))))
|
||||
|
||||
(use-package flyspell :ensure nil
|
||||
:hook ((prog-mode . flyspell-mode)
|
||||
(text-mode . flyspell-mode)
|
||||
(markdown-mode . flyspell-mode))
|
||||
:config
|
||||
(unbind-key "C-," flyspell-mode-map)
|
||||
(unbind-key "C-." flyspell-mode-map)
|
||||
(unbind-key "C-;" flyspell-mode-map)
|
||||
(unbind-key "C-c $" flyspell-mode-map)
|
||||
(unbind-key "C-M-i" flyspell-mode-map))
|
||||
|
||||
(use-package flyspell-correct :ensure t :after flyspell :defer t)
|
||||
(provide 'icejam-ispell)
|
||||
;;; icejam-ispell.el ends here
|
||||
|
|
|
|||
|
|
@ -3,15 +3,8 @@
|
|||
;;; Global Language Server Protocol Config
|
||||
;;; Code:
|
||||
|
||||
;; https://emacs-lsp.github.io/lsp-mode/page/performance/#use-plists-for-deserialization
|
||||
;; This supposedly makes it faster.
|
||||
(setenv "LSP_USE_PLISTS" "true")
|
||||
|
||||
(use-package lsp-mode
|
||||
:straight t
|
||||
:defer t
|
||||
:requires (company)
|
||||
:config
|
||||
;; (use-package lsp-mode :ensure (:depth 5) :requires (company))
|
||||
(with-eval-after-load 'lsp-mode
|
||||
(setq-default lsp-file-watch-threshold 10000
|
||||
lsp-restart 'auto-restart
|
||||
lsp-prefer-capf t
|
||||
|
|
@ -66,14 +59,10 @@
|
|||
(unbind-key "s-l s d" lsp-mode-map)
|
||||
(unbind-key "s-l s q" lsp-mode-map)
|
||||
(unbind-key "s-l s r" lsp-mode-map)
|
||||
(unbind-key "s-l s s" lsp-mode-map)
|
||||
:hook ((typescript-mode . lsp-deferred)))
|
||||
(unbind-key "s-l s s" lsp-mode-map))
|
||||
|
||||
(use-package lsp-ui
|
||||
:straight t
|
||||
:requires (lsp-mode)
|
||||
:defer t
|
||||
:config
|
||||
(use-package lsp-ui :ensure t :after (lsp-mode))
|
||||
(with-eval-after-load 'lsp-ui
|
||||
(setq lsp-ui-doc-enable t
|
||||
lsp-ui-header t
|
||||
lsp-ui-delay 0.5 ;; Wait half a second to display documentation
|
||||
|
|
@ -81,10 +70,7 @@
|
|||
lsp-ui-doc-include-signature t))
|
||||
|
||||
;; Lsp debugger mode
|
||||
(use-package dap-mode
|
||||
:straight t
|
||||
:defer t
|
||||
:requires (lsp-mode lsp-ui))
|
||||
(use-package dap-mode :ensure t :after (lsp-mode lsp-ui))
|
||||
|
||||
(provide 'icejam-lsp)
|
||||
;;; icejam-lsp.el ends here
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
(require 'icejam-keys-mode)
|
||||
|
||||
(use-package magit
|
||||
:straight t
|
||||
:ensure t
|
||||
:defer t
|
||||
:bind (:map icejam-keys-mode-map
|
||||
("<f5> c" . magit-checkout)
|
||||
|
|
|
|||
|
|
@ -12,51 +12,39 @@
|
|||
(global-eldoc-mode t)
|
||||
|
||||
;; Revert tag tables without asking
|
||||
(require 'etags)
|
||||
(setq tags-revert-without-query t)
|
||||
(use-package etags :ensure nil
|
||||
:custom (tags-revert-without-query t "Revert tag tables without asking"))
|
||||
|
||||
;;; Show trailing whitespace and remove whitespace on save
|
||||
(use-package whitespace
|
||||
:commands whitespace-mode
|
||||
:straight t
|
||||
:defer t
|
||||
:hook (((prog-mode text-mode conf-mode) . whitespace-mode)
|
||||
(before-save . whitespace-cleanup))
|
||||
:config
|
||||
(setq whitespace-style #'(face trailing empty)
|
||||
;;; Insert newline on save
|
||||
require-final-newline 't))
|
||||
(use-package whitespace :ensure nil
|
||||
:custom ((whitespace-style #'(face trailing empty) "New whitespace style.")
|
||||
(require-final-newline 't "Insert newline on save"))
|
||||
:hook ((prog-mode . whitespace-mode)
|
||||
(text-mode . whitespace-mode)
|
||||
(conf-mode . whitespace-mode)
|
||||
(before-save . whitespace-cleanup)))
|
||||
|
||||
(setq-default indent-tabs-mode nil)
|
||||
|
||||
;; Use colorful, matching parens
|
||||
(use-package rainbow-delimiters
|
||||
:commands rainbow-delimiters-mode
|
||||
:straight t
|
||||
:defer t
|
||||
:hook (((prog-mode text-mode) . rainbow-delimiters-mode))
|
||||
:init
|
||||
;;; Match parenthasis (left-right)
|
||||
|
||||
;; Rework the code below to enumerate each hook separately:
|
||||
(use-package rainbow-delimiters :ensure t
|
||||
:hook ((prog-mode . rainbow-delimiters-mode)
|
||||
(text-mode . rainbow-delimiters-mode))
|
||||
:config
|
||||
(electric-pair-mode t)
|
||||
(show-paren-mode t))
|
||||
|
||||
;;; Show hex (#aaa) colors as colors
|
||||
(use-package rainbow-mode
|
||||
:commands rainbow-mode
|
||||
:straight t
|
||||
:hook ((prog-mode text-mode) . rainbow-mode))
|
||||
(use-package rainbow-mode :ensure t
|
||||
:hook ((prog-mode . rainbow-mode)
|
||||
(text-mode . rainbow-mode)))
|
||||
|
||||
;; Dash integration
|
||||
(use-package dash-at-point
|
||||
:commands dash-at-point
|
||||
:straight t
|
||||
:defer t
|
||||
:config
|
||||
(add-to-list 'dash-at-point-mode-alist
|
||||
'(enh-ruby-mode . "ruby,rubygems,rails"))
|
||||
(add-to-list 'dash-at-point-mode-alist
|
||||
'(elixir-ts-mode . "elixir,hex")))
|
||||
(use-package dash-at-point :ensure t)
|
||||
(with-eval-after-load 'dash-at-point
|
||||
(add-to-list 'dash-at-point-mode-alist '(enh-ruby-mode . "ruby,rubygems,rails"))
|
||||
(add-to-list 'dash-at-point-mode-alist '(elixir-ts-mode . "elixir,hex")))
|
||||
|
||||
;; By default, use 2 spaces for indentation
|
||||
(setq tab-width 2)
|
||||
|
|
@ -69,19 +57,17 @@
|
|||
(setq-local tab-width step)
|
||||
(setq-local tab-stop-list (number-sequence step 200 step)))
|
||||
|
||||
(use-package column-enforce-mode
|
||||
:straight t
|
||||
:defer t
|
||||
:config (global-column-enforce-mode t))
|
||||
(use-package column-enforce-mode :ensure t
|
||||
:config
|
||||
(declare-function global-column-enforce-mode "column-enforce-mode")
|
||||
(global-column-enforce-mode t))
|
||||
|
||||
;; PCRE to emacs regex translations
|
||||
(use-package pcre2el :straight t)
|
||||
;; PCRE to Emacs regex translations
|
||||
(use-package pcre2el :ensure t)
|
||||
|
||||
;; Visual regexp
|
||||
(use-package visual-regexp-steroids
|
||||
:straight t
|
||||
:requires (pcre2el)
|
||||
:config (setq vr/engine 'pcre2el))
|
||||
(use-package visual-regexp-steroids :ensure t :requires (pcre2el)
|
||||
:custom (vr/engine 'pcre2el "Use pcre2el for regexes"))
|
||||
|
||||
(provide 'icejam-prog-mode)
|
||||
;;; icejam-prog-mode.el ends here
|
||||
|
|
|
|||
|
|
@ -10,10 +10,7 @@
|
|||
|
||||
;;; Code:
|
||||
|
||||
(use-package speed-type
|
||||
:straight t
|
||||
:ensure t
|
||||
:defer t)
|
||||
(use-package speed-type :ensure t :defer t)
|
||||
|
||||
(provide 'icejam-speed-type)
|
||||
;;; icejam-speed-type.el ends here
|
||||
|
|
|
|||
|
|
@ -2,67 +2,65 @@
|
|||
;;; Commentary:
|
||||
;;; Code:
|
||||
|
||||
(use-package spaceline :straight t :defer t)
|
||||
(use-package spaceline :ensure t
|
||||
:hook ((elpaca-after-init . spaceline-emacs-theme)))
|
||||
|
||||
(use-package base16-theme :straight t
|
||||
:defer t
|
||||
:config
|
||||
;; Set themes for terminal mode
|
||||
(setq base16-theme-256-color-source "colors"))
|
||||
(use-package base16-theme :ensure t
|
||||
;; :config
|
||||
;; (load-theme 'base16-atelier-forest-light t t)
|
||||
;; (load-theme 'base16-harmonic16-light t t)
|
||||
;; (load-theme 'base16-horizon-light t t)
|
||||
;; (load-theme 'base16-humanoid-light t t)
|
||||
;; (load-theme 'base16-zenburn t)
|
||||
;; (load-theme 'base16-tomorrow-night-eighties t t)
|
||||
;; (load-theme 'base16-darcula t t)
|
||||
;; (load-theme 'base16-solarflare t t)
|
||||
;; (load-theme 'base16-snazzy t t)
|
||||
;; (load-theme 'base16-onedark t t)
|
||||
;; (load-theme 'base16-gruvbox-dark-hard t t)
|
||||
;; (load-theme 'modus-vivendi t t)
|
||||
;; (load-theme 'base16-zenbones t t)
|
||||
)
|
||||
|
||||
(use-package apropospriate-theme :straight t :defer t)
|
||||
(use-package leuven-theme :straight t :defer t)
|
||||
(use-package modus-themes :straight t :defer t)
|
||||
(use-package darktooth-theme :straight t :defer t)
|
||||
(use-package cyberpunk-theme :straight t :defer t)
|
||||
(use-package color-theme-sanityinc-tomorrow :straight t :defer t)
|
||||
(use-package zenburn-theme :straight t :defer t)
|
||||
;; (use-package apropospriate-theme :ensure t
|
||||
;; :config (load-theme 'apropospriate-light t t))
|
||||
;; (use-package leuven-theme :ensure t
|
||||
;; :config
|
||||
;; (load-theme 'leuven t t))
|
||||
;; (use-package modus-themes :ensure t )
|
||||
;; (use-package darktooth-theme :ensure t
|
||||
;; :config
|
||||
;; (load-theme 'darktooth t t))
|
||||
|
||||
(use-package catppuccin-theme :straight t :defer t
|
||||
:config (setq catppuccin-flavor 'frappe))
|
||||
;; (use-package color-theme-sanityinc-tomorrow :ensure t
|
||||
;; :config
|
||||
;; ;; Dark themes
|
||||
;; (load-theme 'sanityinc-tomorrow-eighties t t)
|
||||
;; (load-theme 'sanityinc-tomorrow-night t t)
|
||||
;; ;; Light theme
|
||||
;; (load-theme 'sanityinc-tomorrow-day t t))
|
||||
|
||||
;; (use-package zenburn-theme :ensure t
|
||||
;; :config
|
||||
;; (load-theme 'zenburn t t))
|
||||
;; (use-package catppuccin-theme :ensure t
|
||||
;; :custom
|
||||
;; ((catpuccin-flavor 'frappe))
|
||||
;; :config
|
||||
;; (load-theme 'catppuccin t t))
|
||||
|
||||
;; Disable cursor blinking
|
||||
(blink-cursor-mode 0)
|
||||
|
||||
;; Light themes
|
||||
(load-theme 'apropospriate-light t t)
|
||||
(load-theme 'leuven t t)
|
||||
(load-theme 'base16-atelier-forest-light t t)
|
||||
(load-theme 'base16-harmonic16-light t t)
|
||||
(load-theme 'base16-horizon-light t t)
|
||||
(load-theme 'base16-humanoid-light t t)
|
||||
(load-theme 'sanityinc-tomorrow-day t t)
|
||||
|
||||
;; Dark themes
|
||||
(load-theme 'cyberpunk t t)
|
||||
(load-theme 'darktooth t t)
|
||||
(load-theme 'base16-zenburn t)
|
||||
(load-theme 'base16-tomorrow-night-eighties t t)
|
||||
(load-theme 'base16-darcula t t)
|
||||
(load-theme 'base16-solarflare t t)
|
||||
(load-theme 'base16-snazzy t t)
|
||||
(load-theme 'base16-onedark t t)
|
||||
(load-theme 'base16-gruvbox-dark-hard t t)
|
||||
(load-theme 'modus-vivendi t t)
|
||||
(load-theme 'base16-zenbones t t)
|
||||
(load-theme 'zenburn t t)
|
||||
(load-theme 'catppuccin t t)
|
||||
(load-theme 'sanityinc-tomorrow-eighties t t)
|
||||
(load-theme 'sanityinc-tomorrow-night t t)
|
||||
|
||||
;; My own theme modifications:
|
||||
(with-eval-after-load 'base16-theme
|
||||
(setq base16-theme-256-color-source "colors")
|
||||
(require 'icejam-base16-zenburn)
|
||||
(require 'icejam-base16-harmonic-light))
|
||||
(require 'icejam-base16-harmonic-light)
|
||||
|
||||
(declare-function spaceline-emacs-theme nil)
|
||||
|
||||
;; This is spacemacs modeline but I have disabled it for now.
|
||||
;; It doesn't seem like I need it for anything.
|
||||
;; (spaceline-emacs-theme)
|
||||
|
||||
(enable-theme 'icejam-base16-zenburn)
|
||||
(if (memq window-system '(x mac ns))
|
||||
(enable-theme 'icejam-base16-zenburn)
|
||||
(enable-theme 'icejam-base16-zenburn)))
|
||||
|
||||
(provide 'icejam-themes)
|
||||
;;; icejam-themes.el ends here
|
||||
|
|
|
|||
|
|
@ -5,7 +5,8 @@
|
|||
|
||||
(require 'icejam-avy)
|
||||
(require 'icejam-keys-mode)
|
||||
(use-package transient :straight t)
|
||||
(require 'icejam-blocking)
|
||||
;; (use-package transient :ensure (:wait t) :demand t)
|
||||
|
||||
(defun icejam-mark-and-indent-whole-buffer ()
|
||||
"Mark and indent whole buffer."
|
||||
|
|
@ -39,18 +40,18 @@
|
|||
"Code Commands."
|
||||
[""
|
||||
["Manipulate"
|
||||
("c" "Toggle Comment" comment-line)
|
||||
("r" "Replace" vr/replace)
|
||||
("i" "Indent" indent-region)
|
||||
("a" "Align" align-regexp)]
|
||||
("c" "Toggle Comment" comment-line)
|
||||
("r" "Replace" vr/replace)
|
||||
("i" "Indent" indent-region)]
|
||||
["Complete"
|
||||
("y" "Snippet" company-yasnippet)
|
||||
("m" "Any (Company)" company-complete)
|
||||
("g" "Ask GPT" gptel-menu)]
|
||||
("y" "Snippet" company-yasnippet)
|
||||
("m" "Any (Company)" company-complete)
|
||||
("g" "Ask GPT" gptel-menu)
|
||||
("e" "Refactor (Elysium)" elysium-query)]
|
||||
["Find"
|
||||
("s" "Swiper" consult-line)
|
||||
("u" "Vundo" vundo)
|
||||
("d" "Dash" dash-at-point)]])
|
||||
("s" "Swiper" consult-line)
|
||||
("u" "Vundo" vundo)
|
||||
("d" "Dash" dash-at-point)]])
|
||||
|
||||
(transient-define-prefix icejam-window-menu ()
|
||||
"Windows Commands."
|
||||
|
|
@ -103,8 +104,7 @@
|
|||
"Font Commands."
|
||||
[""
|
||||
["Everywhere"
|
||||
("R" "Reset to default" set-font-to-screen)
|
||||
("s" "Set size" set-font-size)]
|
||||
("s" "Adjust font size" global-text-scale-adjust)]
|
||||
["In this buffer"
|
||||
("i" "Bigger" (lambda () (interactive) (text-scale-increase 1)))
|
||||
("d" "Smaller" (lambda () (interactive) (text-scale-decrease 1)))
|
||||
|
|
|
|||
|
|
@ -6,28 +6,30 @@
|
|||
|
||||
;;; Commentary:
|
||||
|
||||
;; Load treesitter grammars automatically
|
||||
;; Load treesitter grammars automatically, based on the grammars provided by the
|
||||
;; community.
|
||||
|
||||
;;; Code:
|
||||
|
||||
(defun icejam-tree-sitter-symlink-grammar-objects ()
|
||||
"Tree-sitter-langs-build releases grammars as LANG.so, but treesit needs libtree-sitter-LANG.so."
|
||||
(dolist (file (directory-files (tree-sitter-langs--bin-dir) 'full
|
||||
(concat "\\" (car tree-sitter-load-suffixes) "$")))
|
||||
;; make symlink (or copy) libtree-sitter-c.so -> c.so
|
||||
(let ((target (concat (file-name-as-directory (file-name-directory file))
|
||||
"libtree-sitter-"
|
||||
(file-name-nondirectory file))))
|
||||
(if (memq system-type '(ms-dos windows-nt cygwin))
|
||||
(copy-file file target)
|
||||
(make-symbolic-link file target)))))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;; Tree sitter ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
(use-package tree-sitter-langs :straight t
|
||||
(use-package tree-sitter-langs :ensure t
|
||||
:config
|
||||
(add-to-list 'treesit-extra-load-path (tree-sitter-langs--bin-dir)))
|
||||
(declare-function tree-sitter-langs--bin-dir "tree-sitter-langs")
|
||||
(add-to-list 'treesit-extra-load-path (tree-sitter-langs--bin-dir))
|
||||
|
||||
;; (use-package tree-sitter-indent :straight t)
|
||||
(add-hook 'tree-sitter-after-on-hook 'tree-sitter-hl-mode)
|
||||
(defun icejam-tree-sitter-symlink-grammar-objects ()
|
||||
"Create symlinks for treesitter grammars.
|
||||
Tree-sitter-langs-build releases grammars as LANG.so. Treesit needs
|
||||
libtree-sitter-LANG.so"
|
||||
(interactive)
|
||||
(dolist (file (directory-files (tree-sitter-langs--bin-dir) 'full
|
||||
(concat "\\" (car tree-sitter-load-suffixes) "$")))
|
||||
;; make symlink (or copy) libtree-sitter-c.so -> c.so
|
||||
(let ((target (concat (file-name-as-directory (file-name-directory file))
|
||||
"libtree-sitter-"
|
||||
(file-name-nondirectory file))))
|
||||
(if (memq system-type '(ms-dos windows-nt cygwin))
|
||||
(copy-file file target)
|
||||
(make-symbolic-link file target))))))
|
||||
|
||||
(provide 'icejam-tree-sitter)
|
||||
;;; icejam-tree-sitter.el ends here
|
||||
|
|
|
|||
|
|
@ -11,9 +11,7 @@
|
|||
;;; Code:
|
||||
|
||||
;;;;;;;;;;;;;;;;; Use more advanced undo options
|
||||
(use-package vundo
|
||||
:straight t
|
||||
:defer t)
|
||||
(use-package vundo :ensure t :defer t)
|
||||
|
||||
(provide 'icejam-vundo)
|
||||
;;; icejam-vundo.el ends here
|
||||
|
|
|
|||
|
|
@ -7,19 +7,19 @@
|
|||
|
||||
(declare-function column-enforce-n "column-enforce-mode" (number))
|
||||
|
||||
(use-package clojure-mode :defer t :straight t)
|
||||
(use-package clojure-mode :defer t :ensure t)
|
||||
|
||||
(use-package cider
|
||||
:requires clojure-mode
|
||||
:commands cider-jack-in
|
||||
:defer t
|
||||
:straight t
|
||||
:ensure t
|
||||
:config (setq cider-annotate-completion-function t))
|
||||
|
||||
(use-package clj-refactor
|
||||
:requires (cider clojure-mode)
|
||||
:defer t
|
||||
:straight t)
|
||||
:ensure t)
|
||||
|
||||
;; Transient
|
||||
(transient-define-prefix icejam-lang-cider-context-menu ()
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
(require 'icejam-prog-mode)
|
||||
(require 'icejam-company-yasnippet)
|
||||
|
||||
(use-package slime :straight t)
|
||||
(use-package slime-company :straight t
|
||||
(use-package slime :ensure t)
|
||||
(use-package slime-company :ensure t
|
||||
:requires (slime company))
|
||||
|
||||
(setq inferior-lisp-program "sbcl")
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
(require 'icejam-prog-mode)
|
||||
|
||||
(use-package dart-mode :straight t :defer t)
|
||||
(use-package lsp-dart :defer t :straight t :requires (dart-mode lsp))
|
||||
(use-package dart-mode :ensure t :defer t)
|
||||
(use-package lsp-dart :defer t :ensure t :requires (dart-mode lsp))
|
||||
|
||||
(defun icejam-lang-activate-dart-mode ()
|
||||
"Reconfigure dart mode for your own purposes."
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
(require 'icejam-prog-mode)
|
||||
(require 'icejam-lsp)
|
||||
|
||||
(use-package dhall-mode :straight t :defer t :requires (lsp))
|
||||
(use-package dhall-mode :ensure t :defer t :requires (lsp))
|
||||
|
||||
(defun icejam-lang-activate-dhall-mode ()
|
||||
"Reconfigure dhall mode for your own purposes."
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
(require 'icejam-prog-mode)
|
||||
(require 'icejam-transient)
|
||||
|
||||
(use-package lispy :straight t :defer t)
|
||||
(use-package lispy :ensure t)
|
||||
|
||||
(declare-function column-enforce-n "column-enforce-mode" (number))
|
||||
(add-to-list 'auto-mode-alist '("/Eask\\'" . emacs-lisp-mode))
|
||||
|
|
@ -24,18 +24,21 @@
|
|||
(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)
|
||||
(lispy-mode)
|
||||
(setq-default indent-tabs-mode nil)
|
||||
(with-eval-after-load 'lispy
|
||||
(declare-function lispy-mode "lispy")
|
||||
(defun icejam-activate-emacs-lisp-mode ()
|
||||
"Goodies for editing Emacs files."
|
||||
(icejam-set-indent 2) ;; Default indentation of 2 characters
|
||||
(column-enforce-n 80)
|
||||
|
||||
;; Company list override
|
||||
(add-to-list (make-local-variable 'company-backends)
|
||||
'(company-yasnippet company-capf)))
|
||||
(lispy-mode t)
|
||||
(setq-default indent-tabs-mode nil)
|
||||
|
||||
(add-hook 'emacs-lisp-mode-hook 'icejam-activate-emacs-lisp-mode)
|
||||
;; Company list override
|
||||
(add-to-list (make-local-variable 'company-backends)
|
||||
'(company-yasnippet company-capf)))
|
||||
|
||||
(add-hook 'emacs-lisp-mode-hook 'icejam-activate-emacs-lisp-mode))
|
||||
|
||||
(provide 'icejam-lang-elisp)
|
||||
;;; icejam-lang-elisp.el ends here
|
||||
|
|
|
|||
|
|
@ -9,13 +9,12 @@
|
|||
(declare-function lsp "lsp-mode" nil)
|
||||
(declare-function column-enforce-n "column-enforce-mode" (number))
|
||||
|
||||
(use-package elixir-mode :defer t :straight t)
|
||||
(use-package elixir-ts-mode :straight t
|
||||
:requires (elixir-mode lsp-mode lsp-ui)
|
||||
:defines (elixir-ts-mode-map))
|
||||
(use-package elixir-mode :ensure t)
|
||||
(use-package elixir-ts-mode :ensure t :requires (elixir-mode lsp-mode lsp-ui))
|
||||
|
||||
(add-to-list 'auto-mode-alist '("\\.exs\\'" . elixir-ts-mode))
|
||||
(add-to-list 'auto-mode-alist '("\\.ex\\'" . elixir-ts-mode))
|
||||
(with-eval-after-load 'elixir-ts-mode
|
||||
(add-to-list 'auto-mode-alist '("\\.exs\\'" . elixir-ts-mode))
|
||||
(add-to-list 'auto-mode-alist '("\\.ex\\'" . elixir-ts-mode)))
|
||||
|
||||
(transient-define-prefix icejam-elixir-lang-menu ()
|
||||
"Elixir Buffer Commands."
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
|
||||
(use-package erlang
|
||||
:defer t
|
||||
:straight t
|
||||
:requires (lsp-mode lsp-ui))
|
||||
:ensure (:depth 1)
|
||||
:after (lsp lsp-ui))
|
||||
|
||||
(cl-defun icejam-erlang-emacs-path (erlang-version)
|
||||
"Find path to Emacs tooling for ERLANG-VERSION."
|
||||
|
|
@ -54,17 +54,6 @@
|
|||
"Create plist from current Erlang version."
|
||||
(seq-find 'icejam-erlang-current-version--plistp icejam-erlang-available-versions))
|
||||
|
||||
;; Flycheck checker for Erlang
|
||||
(flycheck-define-checker erlang-otp
|
||||
"An Erlang syntax checker using the Erlang interpreter."
|
||||
:command ("erlc" "-o" temporary-directory "-Wall"
|
||||
"-I" "../include" "-I" "../../include"
|
||||
"-I" "../../../include" source)
|
||||
:error-patterns
|
||||
((warning line-start (file-name) ":" line ": Warning:" (message) line-end)
|
||||
(error line-start (file-name) ":" line ": " (message) line-end))
|
||||
:modes (my-erlang-mode))
|
||||
|
||||
(defun icejam-activate-erlang-mode ()
|
||||
"All things for all Erlang, including header files."
|
||||
(when (featurep 'erlang-start) (unload-feature 'erlang-start))
|
||||
|
|
@ -86,25 +75,12 @@
|
|||
(icejam-set-indent 4)
|
||||
(column-enforce-n 80)
|
||||
|
||||
;; Add include path so that Erlang does not complain about
|
||||
;; missing header files.
|
||||
(setq-local flycheck-erlang-include-path
|
||||
(list (format "%sdeps" (project-root (project-current)))
|
||||
(format "%s_build/default/lib" (project-root (project-current)))
|
||||
(format "%sinclude" (project-root (project-current)))
|
||||
(format "%sapps" (project-root (project-current)))))
|
||||
|
||||
(setq-local flycheck-erlang-library-path
|
||||
(list (format "%sdeps" (project-root (project-current)))
|
||||
(format "%s_build/default/lib" (project-root (project-current)))
|
||||
(format "%sapps" (project-root (project-current)))))
|
||||
;; Start LSP
|
||||
(lsp)
|
||||
|
||||
;; Company list override
|
||||
(add-to-list (make-local-variable 'company-backends)
|
||||
'(company-capf company-yasnippet))
|
||||
|
||||
;; Start LSP server
|
||||
(lsp))
|
||||
'(company-capf company-yasnippet)))
|
||||
|
||||
(add-hook 'erlang-mode-hook 'icejam-activate-erlang-mode)
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
(use-package fsharp-mode
|
||||
:requires (lsp-mode lsp-ui)
|
||||
:straight t
|
||||
:ensure t
|
||||
:defer t)
|
||||
|
||||
(defun icejam-activate-fsharp-mode ()
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@
|
|||
(require 'icejam-prog-mode)
|
||||
|
||||
(use-package gleam-ts-mode
|
||||
:straight '(:type git
|
||||
:host github
|
||||
:repo "gleam-lang/gleam-mode"
|
||||
:files ("gleam-ts-mode.el")))
|
||||
:ensure (:type git
|
||||
:host github
|
||||
:repo "gleam-lang/gleam-mode"
|
||||
:files ("gleam-ts-mode.el")))
|
||||
|
||||
(add-to-list 'auto-mode-alist '("\\.gleam\\'" . gleam-ts-mode))
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
(use-package go-mode
|
||||
:requires (lsp-mode lsp-ui)
|
||||
:defer t
|
||||
:straight t)
|
||||
:ensure t)
|
||||
|
||||
(defun icejam-activate-golang-mode ()
|
||||
"Activate my own Golang mode settings."
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
(require 'icejam-prog-mode)
|
||||
|
||||
(use-package haskell-mode
|
||||
:straight t
|
||||
:ensure t
|
||||
:defer t)
|
||||
|
||||
(use-package lsp-haskell
|
||||
:straight t
|
||||
:ensure t
|
||||
:defer t
|
||||
:requires (lsp-mode lsp-ui haskell-mode))
|
||||
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
(use-package js2-mode
|
||||
:requires (web-mode company-web lsp-mode lsp-ui)
|
||||
:straight t)
|
||||
:ensure t)
|
||||
|
||||
(use-package typescript-mode :straight t)
|
||||
(use-package typescript-mode :ensure t)
|
||||
|
||||
;; (use-package vue-mode
|
||||
;; :straight t
|
||||
;; :ensure t
|
||||
;; :defer t)
|
||||
|
||||
;; Use js2-mode for javascript editing
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
(use-package kotlin-mode
|
||||
:defer t
|
||||
:straight t)
|
||||
:ensure t)
|
||||
|
||||
(use-package gradle-mode
|
||||
:defer t
|
||||
:straight t)
|
||||
:ensure t)
|
||||
|
||||
(defun icejam-activate-kotlin-mode ()
|
||||
"All things Kotlin."
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
(require 'icejam-lsp)
|
||||
|
||||
(use-package lean4-mode
|
||||
:straight (lean4-mode
|
||||
:type git
|
||||
:host github
|
||||
:repo "leanprover/lean4-mode"
|
||||
:files ("*.el" "data"))
|
||||
:ensure (lean4-mode
|
||||
:type git
|
||||
:host github
|
||||
:repo "leanprover/lean4-mode"
|
||||
:files ("*.el" "data"))
|
||||
:requires (lsp)
|
||||
:defer t)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,12 @@
|
|||
;;; Code:
|
||||
|
||||
(require 'icejam-prog-mode)
|
||||
(declare-function elpaca-installed-p "elpacs")
|
||||
(unless (elpaca-installed-p 'markdown-mode)
|
||||
(use-package markdown-mode :ensure t))
|
||||
|
||||
(use-package markdown-mode
|
||||
:straight t
|
||||
:defer t
|
||||
:init (setq-default markdown-command "pandoc"))
|
||||
(with-eval-after-load 'markdown-mode
|
||||
(setq-default markdown-command "pandoc"))
|
||||
|
||||
(defun icejam-lang-activate-markdown-mode ()
|
||||
"Reconfigure markdown mode for your own purposes."
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
(require 'icejam-prog-mode)
|
||||
(declare-function lsp "lsp-mode" nil)
|
||||
|
||||
(use-package merlin :defer t :straight t)
|
||||
(use-package opam-switch-mode :straight t :defer t)
|
||||
(use-package dune :defer t :straight t)
|
||||
(use-package tuareg
|
||||
:defer t
|
||||
:straight t
|
||||
:config (add-hook 'tuareg-mode-hook 'merlin-mode))
|
||||
(use-package merlin :defer t :ensure t)
|
||||
(use-package opam-switch-mode :defer t :ensure t)
|
||||
(use-package dune :defer t :ensure t)
|
||||
(use-package tuareg :defer t :ensure t)
|
||||
|
||||
(with-eval-after-load 'tuareg
|
||||
(add-hook 'tuareg-mode-hook 'merlin-mode))
|
||||
|
||||
(transient-define-prefix icejam-ocaml-lang-menu ()
|
||||
"Ocaml Actions."
|
||||
|
|
|
|||
|
|
@ -11,32 +11,35 @@
|
|||
;;; Code:
|
||||
|
||||
;; Infrastructure files
|
||||
(use-package dockerfile-mode :straight t :defer t)
|
||||
(use-package docker :straight t :defer t :ensure t)
|
||||
(use-package terraform-mode :straight t :defer t)
|
||||
(use-package ansible :straight t :defer t)
|
||||
(use-package nginx-mode :straight t :defer t)
|
||||
(use-package jenkinsfile-mode :straight t :defer t)
|
||||
(use-package lua-mode :straight t :defer t)
|
||||
(use-package graphql-mode :straight t :defer t)
|
||||
(add-to-list 'auto-mode-alist '("\\.graphqls\\'" . graphql-mode))
|
||||
(use-package dockerfile-mode :ensure t :defer t)
|
||||
(use-package docker :ensure t :defer t)
|
||||
(use-package terraform-mode :ensure t :defer t)
|
||||
(use-package ansible :ensure t :defer t)
|
||||
(use-package nginx-mode :ensure t :defer t)
|
||||
(use-package
|
||||
jenkinsfile-mode
|
||||
: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
|
||||
:mode ("\\.graphqls\\'" . graphql-mode))
|
||||
|
||||
;; Yaml
|
||||
(use-package yaml-mode :straight t :defer t :requires (lsp))
|
||||
(declare-function lsp "lsp-mode" nil)
|
||||
(use-package yaml-mode :ensure t :defer t :requires (lsp))
|
||||
|
||||
(defun icejam-lang-activate-yaml-mode ()
|
||||
"Activate yaml-mode."
|
||||
(lsp))
|
||||
|
||||
(add-hook 'yaml-mode-hook 'icejam-lang-activate-yaml-mode)
|
||||
(with-eval-after-load 'yaml-mode
|
||||
(defun icejam-lang-activate-yaml-mode ()
|
||||
"Activate yaml-mode."
|
||||
(lsp))
|
||||
(add-hook 'yaml-mode-hook 'icejam-lang-activate-yaml-mode))
|
||||
|
||||
;; Other text files
|
||||
(use-package json-mode :straight t :defer t)
|
||||
(use-package git-modes
|
||||
:straight t
|
||||
:defer t
|
||||
:hook ((gitignore-mode . whitespace-mode)
|
||||
(before-save . whitespace-cleanup)))
|
||||
(use-package json-mode :ensure t :defer t)
|
||||
(use-package git-modes :ensure t :defer t
|
||||
:hook (gitignore . whitespace-mode-hook))
|
||||
|
||||
(provide 'icejam-lang-other)
|
||||
;;; icejam-lang-other.el ends here
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
(use-package php-mode
|
||||
:requires (lsp-mode lsp-ui)
|
||||
:straight t)
|
||||
:ensure t)
|
||||
|
||||
(transient-define-prefix icejam-lang-php/context-menu ()
|
||||
"PHP Buffer Commands."
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
;;; Code:
|
||||
(use-package purescript-mode
|
||||
:requires (lsp-mode lsp-ui)
|
||||
:straight t)
|
||||
:ensure t)
|
||||
|
||||
(defun icejam-activate-purescript-mode ()
|
||||
"All things Purescript."
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
|
||||
(require 'icejam-prog-mode)
|
||||
|
||||
(use-package rspec-mode :straight t :defer t)
|
||||
(use-package ruby-end :straight t :defer t)
|
||||
(use-package rbs-mode :straight t :defer t)
|
||||
(use-package rspec-mode :ensure t :defer t)
|
||||
(use-package ruby-end :ensure t :defer t)
|
||||
(use-package rbs-mode :ensure t :defer t)
|
||||
|
||||
(add-to-list 'auto-mode-alist '("\\.rb\\'" . ruby-ts-mode))
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
(require 'icejam-prog-mode)
|
||||
|
||||
(use-package rust-mode
|
||||
:straight t
|
||||
:ensure t
|
||||
:defer t
|
||||
:config
|
||||
(setq rust-mode-treesitter-derive t))
|
||||
|
||||
(use-package flycheck-rust
|
||||
:straight t
|
||||
:ensure t
|
||||
:defer t
|
||||
:requires (rust-mode lsp))
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
;;; Commentary:
|
||||
;;; Code:
|
||||
|
||||
(use-package fish-mode :straight t :defer t)
|
||||
(use-package fish-mode :ensure t :defer t)
|
||||
|
||||
(add-to-list 'auto-mode-alist '("\\.zsh\\'" . sh-mode))
|
||||
(add-to-list 'auto-mode-alist '("\\zshrc\\'" . sh-mode))
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
(use-package web-mode
|
||||
:requires (lsp-mode flycheck)
|
||||
:straight t)
|
||||
:ensure t)
|
||||
|
||||
;; Eex Web mode
|
||||
(add-to-list 'auto-mode-alist '("\\.eex\\'" . web-mode))
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
;;; Code:
|
||||
(require 'icejam-prog-mode)
|
||||
|
||||
(use-package zig-mode :straight t :defer t :requires (lsp))
|
||||
(use-package zig-mode :ensure t :defer t :requires (lsp))
|
||||
|
||||
(defun icejam-activate-zig-mode ()
|
||||
"Goodies for editing zig files."
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
;;; Code:
|
||||
|
||||
(declare-function base16-theme-define (theme-name colors))
|
||||
(use-package base16-theme :straight t :defer t)
|
||||
|
||||
(defvar icejam-base16-harmonic-light-colors
|
||||
'(:base00 "#f7f9fb"
|
||||
|
|
@ -33,7 +32,9 @@
|
|||
(deftheme icejam-base16-harmonic-light)
|
||||
|
||||
;; Add all the faces to the theme
|
||||
(base16-theme-define 'icejam-base16-harmonic-light icejam-base16-harmonic-light-colors)
|
||||
(with-eval-after-load 'base16-theme
|
||||
(base16-theme-define
|
||||
'icejam-base16-harmonic-light icejam-base16-harmonic-light-colors))
|
||||
|
||||
;; Mark the theme as provided
|
||||
(provide-theme 'icejam-base16-harmonic-light)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
;; Based on harmonic-dark theme by Jannik Seibert (https://github.com/janniks)
|
||||
;;; Code:
|
||||
|
||||
(use-package base16-theme :straight t :defer t)
|
||||
(use-package base16-theme :ensure t :defer t)
|
||||
|
||||
(defvar base16-not-harmonic-colors
|
||||
'(:base00 "#102941"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
;;; Code:
|
||||
|
||||
(use-package base16-theme :straight t :defer t)
|
||||
(use-package base16-theme :ensure t :defer t)
|
||||
|
||||
(defvar base16-summerfruit-light-modified-colors
|
||||
'(:base00 "#fdfcfa"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
;; 04 made darker by 5% #808080 => #7a7a7a
|
||||
;; 0B made lighter by 10% #5f7f5f => #799979
|
||||
|
||||
(use-package base16-theme :straight t)
|
||||
(declare-function base16-theme-define "base16-theme" (theme-name theme-colors))
|
||||
|
||||
(defvar icejam-base16-zenburn-colors
|
||||
|
|
@ -42,7 +41,8 @@
|
|||
(deftheme icejam-base16-zenburn)
|
||||
|
||||
;; Add all the faces to the theme
|
||||
(base16-theme-define 'icejam-base16-zenburn icejam-base16-zenburn-colors)
|
||||
(with-eval-after-load 'base16-theme
|
||||
(base16-theme-define 'icejam-base16-zenburn icejam-base16-zenburn-colors))
|
||||
|
||||
;; Mark the theme as provided
|
||||
(provide-theme 'icejam-base16-zenburn)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue