diff options
Diffstat (limited to 'users/sterni/emacs/init.el')
| -rw-r--r-- | users/sterni/emacs/init.el | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/users/sterni/emacs/init.el b/users/sterni/emacs/init.el index 3c6ed78cdf..4cb741f62d 100644 --- a/users/sterni/emacs/init.el +++ b/users/sterni/emacs/init.el @@ -4,7 +4,6 @@ (package-initialize) ;; Set default font and fallback font via set-fontset-font -;; TODO(sterni): Investigate why ZWJ sequences aren't shaped properly (let ((mono-font "Bitstream Vera Sans Mono-12") (emoji-font "Noto Color Emoji-12")) (setq default-frame-alist `((font . ,mono-font))) @@ -110,20 +109,8 @@ (let ((org-folder (concat (getenv "HOME") "/files/sync/org"))) (setq org-agenda-files (directory-files-recursively org-folder "\\.org$") org-default-notes-file (concat org-folder "/inbox.org") - initial-buffer-choice org-default-notes-file)) - -;; load org-tracker and mutable config on work laptop -(let ((org-tracker-src (concat (getenv "HOME") - "/src/el/org-tracker"))) - (when (file-exists-p org-tracker-src) - (add-to-list 'load-path org-tracker-src) - - (use-package org-tracker - :hook (org-mode . org-tracker-mode) - :config - (let ((jira-config (concat (getenv "HOME") - "/.config/emacs-custom/pa-jira.el"))) - (when (file-exists-p jira-config) (load jira-config)))))) + initial-buffer-choice org-default-notes-file + org-refile-targets '((org-agenda-files . (:maxlevel . 2))))) ;; latex @@ -139,7 +126,7 @@ (message (string-trim-right word-count)))) ;; ediff -; doesn't create new window for ediff controls which I always open accidentally +;; doesn't create new window for ediff controls which I always open accidentally (setq ediff-window-setup-function 'ediff-setup-windows-plain) ;; man @@ -264,6 +251,9 @@ :config (editorconfig-mode 1)) (use-package haskell-mode) +(use-package flycheck + :init (global-flycheck-mode) + :custom flycheck-keymap-prefix (kbd "<leader>!")) (use-package lsp-mode :hook ((haskell-mode . lsp-deferred)) :commands (lsp lsp-deferred) @@ -286,6 +276,7 @@ (set-face-background 'lsp-ui-doc-background "WhiteSmoke") (set-face-foreground 'lsp-ui-sideline-code-action "SaddleBrown") (setq lsp-ui-sideline-code-actions-prefix "🔨 " + lsp-ui-sideline-show-diagnostics nil lsp-ui-sideline-show-code-actions t) ; is :custom, but won't take effect? (evil-define-key 'normal lsp-ui-mode-map ;; TODO(sterni): emulate using xref for non-lsp? @@ -347,6 +338,16 @@ (set-face-background 'languagetool-issue-default "yellow") (set-face-background 'languagetool-issue-misspelling "red")) +(use-package deft + :config + ;; This is based on (car deft-extensions), but unfortunately the variable is + ;; not re-bound in the hook defined by defcustom, so it is always "txt". + (setq deft-default-extension "org") + (evil-define-key 'normal 'global (kbd "<leader>mn") 'deft) + :custom + deft-directory (expand-file-name "~/files/sync/org/notes") + deft-extensions '("org" "md" "txt" "tex")) + (unless (server-running-p) (server-start)) |