diff options
| -rw-r--r-- | emacs/.config/emacs/init.el | 43 | ||||
| -rw-r--r-- | emacs/.config/emacs/lisp/kj-init.el | 23 |
2 files changed, 40 insertions, 26 deletions
diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el index 008a0ff..f71c16b 100644 --- a/emacs/.config/emacs/init.el +++ b/emacs/.config/emacs/init.el @@ -61,10 +61,17 @@ (load custom-file :noerror t) +;; Disable annoying warnings. +(setq warning-minimum-level :error) + ;;;;; Modes +(use-package markdown-mode) +(use-package org) + (use-package emacs :elpaca nil :defer 1 + :after (markdown-mode org-mode) :init (dolist (hook '(markdown-mode-hook org-mode-hook)) @@ -460,14 +467,44 @@ (rename-buffer (kj/shell-buffer-name))))) +;;;; Applications +;;;;; Magit +(use-package magit :ensure nil) +(use-package magit + :ensure (:wait t) + :bind (:map magit-repolist-mode-map + ("c" . magit-clone) + ("i" . magit-init) + ("C" . kj/clone-project)) + :custom + (magit-repository-directories `((,kj/git-directory . 1)) "My git repositories") + (magit-repolist-columns '(("Name" 25 magit-repolist-column-ident nil) + ("Version" 25 magit-repolist-column-version + ((:sort magit-repolist-version<))) + ("B<U" 3 magit-repolist-column-unpulled-from-upstream + ((:right-align t) (:sort <))) + ("B>U" 3 magit-repolist-column-unpushed-to-upstream + ((:right-align t) (:sort <))) + ("F" 3 magit-repolist-column-flag + ((:right-align t) (:sort <))) + ("Path" 99 magit-repolist-column-path nil))) + :config + (defun kj/clone-project () + (interactive) + (let ((magit-clone-set-remote.pushDefault t)) + (magit-clone-regular (kj/read-repository) kj/git-directory nil)))) + ;;;; Include modules in lisp/ (defvar kj/module-directory (expand-file-name "lisp" user-emacs-directory)) (push kj/module-directory load-path) (require 'kj-lib) (require 'kj-init) -(cl-loop for path in (directory-files kj/module-directory) - if (string-match "\\([^/]*\\).el" path) - do (require (intern (match-string-no-properties 1 path)))) +(use-package emacs :elpaca nil + :defer 1 + :init + (cl-loop for path in (directory-files kj/module-directory) + if (string-match "\\([^/]*\\).el" path) + do (require (intern (match-string-no-properties 1 path))))) ;;;; Enable commands (put 'narrow-to-region 'disabled nil) diff --git a/emacs/.config/emacs/lisp/kj-init.el b/emacs/.config/emacs/lisp/kj-init.el index ce1f896..178a577 100644 --- a/emacs/.config/emacs/lisp/kj-init.el +++ b/emacs/.config/emacs/lisp/kj-init.el @@ -48,29 +48,6 @@ (completing-read "Repository: " repos) (concat "ssh://dragon.orbekk.com:/storage/projects/")))) -(use-package magit - :bind (:map magit-repolist-mode-map - ("c" . magit-clone) - ("i" . magit-init) - ("C" . kj/clone-project)) - :custom - (magit-repository-directories `((,kj/git-directory . 1)) "My git repositories") - (magit-repolist-columns '(("Name" 25 magit-repolist-column-ident nil) - ("Version" 25 magit-repolist-column-version - ((:sort magit-repolist-version<))) - ("B<U" 3 magit-repolist-column-unpulled-from-upstream - ((:right-align t) (:sort <))) - ("B>U" 3 magit-repolist-column-unpushed-to-upstream - ((:right-align t) (:sort <))) - ("F" 3 magit-repolist-column-flag - ((:right-align t) (:sort <))) - ("Path" 99 magit-repolist-column-path nil))) - :config - (defun kj/clone-project () - (interactive) - (let ((magit-clone-set-remote.pushDefault t)) - (magit-clone-regular (kj/read-repository) kj/git-directory nil)))) - (use-package mixed-pitch :hook (text-mode . mixed-pitch-mode) |