From 810d17537264f79da81ba849e276cfab9e378b43 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Fri, 14 Feb 2020 08:47:09 +0200 Subject: [PATCH] Update font --- 10deft.el | 5 +++-- languages/clojure.el | 4 +++- languages/erlang.el | 2 +- languages/markdown.el | 16 ++++++++++++++++ snippets/erlang-mode/doc | 9 +++++++++ snippets/erlang-mode/preambule | 2 +- themes/themes.el | 6 +++--- 7 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 languages/markdown.el create mode 100644 snippets/erlang-mode/doc diff --git a/10deft.el b/10deft.el index 19cf535..0540f8b 100644 --- a/10deft.el +++ b/10deft.el @@ -2,7 +2,8 @@ (use-package deft :ensure t :defer t - :config (setq deft-directory - (substitute-in-file-name "$HOME/OneDrive/deft"))) + :config (setq + deft-directory (substitute-in-file-name "$HOME/OneDrive/deft") + deft-default-extension "md")) (global-set-key (kbd "C-c d d") 'deft) diff --git a/languages/clojure.el b/languages/clojure.el index d030fd7..475d99a 100644 --- a/languages/clojure.el +++ b/languages/clojure.el @@ -6,7 +6,8 @@ :requires clojure-mode :commands cider-jack-in :defer t - :ensure t) + :ensure t + :config (setq cider-annotate-completion-function t)) (use-package clj-refactor :requires (cider clojure-mode) @@ -35,3 +36,4 @@ (setq-local cider-show-error-buffer 'except-in-repl)) (add-hook 'cider-repl-mode-hook 'my-clj-repl-config) +(add-hook 'cider-mode-hook #'cider-company-enable-fuzzy-completion) diff --git a/languages/erlang.el b/languages/erlang.el index 55253e2..6364f49 100644 --- a/languages/erlang.el +++ b/languages/erlang.el @@ -86,7 +86,7 @@ ;; Company list override (add-to-list (make-local-variable 'company-backends) - '(company-yasnippet company-etags company-dabbrev))) + '(company-yasnippet company-etags))) (add-hook 'erlang-mode-hook 'erlang/activate-erlang-mode) diff --git a/languages/markdown.el b/languages/markdown.el new file mode 100644 index 0000000..92e33ea --- /dev/null +++ b/languages/markdown.el @@ -0,0 +1,16 @@ +(use-package markdown-mode + :ensure t + :defer t) + +(defun activate-markdown-mode () + "Reconfigure markdown mode for your own purposes." + (set-indent 2) + (column-enforce-n 80) + + ;; Markdown mode reuses my bindings, remove them. + (define-key markdown-mode-map (kbd "C-c ") nil) + (define-key markdown-mode-map (kbd "C-c ") nil) + (define-key markdown-mode-map (kbd "C-c ") nil) + (define-key markdown-mode-map (kbd "C-c ") nil)) + +(add-hook 'markdown-mode-hook 'activate-markdown-mode) diff --git a/snippets/erlang-mode/doc b/snippets/erlang-mode/doc new file mode 100644 index 0000000..f985719 --- /dev/null +++ b/snippets/erlang-mode/doc @@ -0,0 +1,9 @@ +# -*- mode: snippet -*- +# name: doc +# -- +%%%------------------------------------------------------------------- +%%% @doc +%%% +%%% @end +%%%------------------------------------------------------------------- +$0 \ No newline at end of file diff --git a/snippets/erlang-mode/preambule b/snippets/erlang-mode/preambule index 9038f88..6c1608f 100644 --- a/snippets/erlang-mode/preambule +++ b/snippets/erlang-mode/preambule @@ -2,7 +2,7 @@ # name: preambule # -- %%%------------------------------------------------------------------- -%%% @author Maciej Szlosarczyk (${1: maciej@sosek.net}) +%%% @author Maciej Szlosarczyk (${1:maciej@sosek.net}) %%% @copyright (C) (${2:`(format-time-string "%Y")`}) Maciej Szlosarczyk %%% @doc %%% diff --git a/themes/themes.el b/themes/themes.el index 51cd59b..6deda30 100644 --- a/themes/themes.el +++ b/themes/themes.el @@ -23,7 +23,7 @@ (defun base16-mexico-light-custom () "Additional configuration for Base16 theme." - (set-face-attribute 'mode-line nil :font "Hasklig 15")) + (set-face-attribute 'mode-line nil :font "IBM Plex Mono 15")) (if (display-graphic-p) (progn @@ -38,8 +38,8 @@ (defun set-font-size (size) "Set font SIZE to X px." (interactive "NNew font size: ") - (set-face-attribute 'default nil :font (format "Hasklig %d" size)) - (set-face-attribute 'mode-line nil :font (format "Hasklig %d" size))) + (set-face-attribute 'default nil :font (format "IBM Plex Mono %d" size)) + (set-face-attribute 'mode-line nil :font (format "IBM Plex Mono %d" size))) (set-font-size 16)