From 107a59f9b0c175ea93fdeb20064c353539eb0f1a Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Thu, 3 Oct 2019 10:01:16 +0300 Subject: [PATCH] Add your own custom snippets --- .gitignore | 2 ++ 04magit.el | 2 +- 05prog-mode.el | 8 ++++++-- 06company-yasnippet.el | 24 +++++++++++++----------- languages/clojure.el | 11 ++++++----- languages/elisp.el | 4 ++-- languages/erlang.el | 17 +++++++++++++++-- languages/javascript.el | 5 ++++- snippets/emacs-lisp-mode/preambule | 8 ++++++++ snippets/erlang-mode/preambule | 12 ++++++++++++ snippets/js-mode/ar | 3 +++ snippets/tide-mode/ar | 3 +++ snippets/web-mode/ar | 3 +++ themes/themes.el | 3 ++- 14 files changed, 80 insertions(+), 25 deletions(-) create mode 100644 snippets/emacs-lisp-mode/preambule create mode 100644 snippets/erlang-mode/preambule create mode 100644 snippets/js-mode/ar create mode 100644 snippets/tide-mode/ar create mode 100644 snippets/web-mode/ar diff --git a/.gitignore b/.gitignore index 8957de9..1dfed57 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ tramp url/* transient/* .lsp-session-* +eshell/* +.yas-compiled-snippets.el \ No newline at end of file diff --git a/04magit.el b/04magit.el index 0c1c7ac..e7c3281 100644 --- a/04magit.el +++ b/04magit.el @@ -3,7 +3,7 @@ :ensure t :defer t :bind (" c" . magit-checkout) - (" b" . magit-blame) + (" b" . magit-blame-addition) (" g" . magit-status) (:map magit-blame-mode-map (" b" . 'magit-blame-quit))) diff --git a/05prog-mode.el b/05prog-mode.el index 81f1615..6e03a19 100644 --- a/05prog-mode.el +++ b/05prog-mode.el @@ -33,8 +33,9 @@ :defer t :hook (((prog-mode text-mode) . rainbow-delimiters-mode)) :init - ;;; Match parenthasis (left-right) - (electric-pair-mode t)) + ;;; Match parenthasis (left-right) + (electric-pair-mode t) + (show-paren-mode t)) ;;; Show hex (#aaa) colors as colors (use-package rainbow-mode @@ -69,3 +70,6 @@ :ensure t :defer t :config (global-column-enforce-mode t)) + +(provide '05prog-mode) +;;; 05prog-mode ends here diff --git a/06company-yasnippet.el b/06company-yasnippet.el index a1e02a2..3e7b3cb 100644 --- a/06company-yasnippet.el +++ b/06company-yasnippet.el @@ -31,19 +31,21 @@ (yas-global-mode t) (setq-default - company-minimum-prefix-length 2 ; minimum prefix character number for auto complete. + company-minimum-prefix-length 2 ;; minimum prefix character number for auto complete. company-idle-delay 0.1 - company-echo-delay 0 ;; company-show-numbers t - company-tooltip-align-annotations t ; align annotations to the right tooltip border. + 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-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-async-wait 0.03 ;; company-async-timeout 2 ) diff --git a/languages/clojure.el b/languages/clojure.el index 358fd67..d030fd7 100644 --- a/languages/clojure.el +++ b/languages/clojure.el @@ -17,16 +17,17 @@ :defer t :ensure t) +(setq-local indent-tabs-mode nil) + (defun activate-my-clojure-mode () "Goodies for clojure files." (set-indent 2) ;; Default indentation of 2 characters (column-enforce-n 80) - (clj-refactor-mode 1) - (cider-mode 1) - + (clj-refactor-mode 1) + (cider-mode 1) + (paredit-mode 1) ;; Do not show separate error window when in REPL - (setq cider-show-error-buffer 'except-in-repl) - (paredit-mode 1)) + (setq cider-show-error-buffer 'except-in-repl)) (add-hook 'clojure-mode-hook 'activate-my-clojure-mode) diff --git a/languages/elisp.el b/languages/elisp.el index 634302d..fd42eaa 100644 --- a/languages/elisp.el +++ b/languages/elisp.el @@ -2,12 +2,12 @@ "Goodies for editing emacs files." (set-indent 2) ;; Default indentation of 2 characters (column-enforce-n 80) + (setq-default indent-tabs-mode nil) ;; Company list override (add-to-list (make-local-variable 'company-backends) '(company-elisp company-yasnippet)) - (paredit-mode 1) - ) + (paredit-mode 1)) (add-hook 'emacs-lisp-mode-hook 'activate-emacs-lisp-mode) diff --git a/languages/erlang.el b/languages/erlang.el index 08f2015..26b40a4 100644 --- a/languages/erlang.el +++ b/languages/erlang.el @@ -66,14 +66,27 @@ (setq-local ctags/refresh-command (format - "ctags -e -R --languages=erlang -f %sTAGS %s. %slib/stdlib-* %slib/kernel-*" + "ctags -e -R --languages=erlang -f %sTAGS %ssrc %sdeps %sapps %s_build %slib/stdlib-* %slib/kernel-*" (projectile-project-root) (projectile-project-root) + (projectile-project-root) (projectile-project-root) + (projectile-project-root) (plist-get erlang/current-erlang :erlang-path) (plist-get erlang/current-erlang :erlang-path))) + ;; Add include path so that Erlang does not complain about + ;; missing header files. + (setq-local flycheck-erlang-include-path + (list (format "%sdeps" (projectile-project-root)) + (format "%sinclude" (projectile-project-root)) + (format "%sapps" (projectile-project-root)))) + + ;; (setq-local flycheck-erlang-library-path + ;; (list (format "%sdeps" (projectile-project-root)) + ;; (format "%sapps" (projectile-project-root)))) + ;; Company list override (add-to-list (make-local-variable 'company-backends) - '(company-etags company-yasnippet))) + '(company-yasnippet company-etags company-dabbrev))) (add-hook 'erlang-mode-hook 'erlang/activate-erlang-mode) diff --git a/languages/javascript.el b/languages/javascript.el index 4b02c6d..bb7c621 100644 --- a/languages/javascript.el +++ b/languages/javascript.el @@ -25,7 +25,10 @@ (setq js2-mode-show-strict-warnings nil) (tide-hl-identifier-mode +1) - (flycheck-add-next-checker 'javascript-standard 'javascript-tide 'append) + (if (string-match-p "rebelroam" (buffer-file-name)) + (flycheck-add-next-checker 'javascript-standard 'javascript-tide 'append)) + + (setq-local flycheck-check-syntax-automatically '(save mode-enabled)) ;; "Company list override." diff --git a/snippets/emacs-lisp-mode/preambule b/snippets/emacs-lisp-mode/preambule new file mode 100644 index 0000000..b2bec8c --- /dev/null +++ b/snippets/emacs-lisp-mode/preambule @@ -0,0 +1,8 @@ +;;;------------------------------------------------------------------- +;;; author: Maciej Szlosarczyk (${1: maciej@sosek.net}) +;;; copyright (C) (${2:`(format-time-string "%Y")`}) Maciej Szlosarczyk +;;; @doc +;;; +;;; @end +;;; Created: ${3:`(format-time-string "%d %b %Y")`} +;;;------------------------------------------------------------------- \ No newline at end of file diff --git a/snippets/erlang-mode/preambule b/snippets/erlang-mode/preambule new file mode 100644 index 0000000..9038f88 --- /dev/null +++ b/snippets/erlang-mode/preambule @@ -0,0 +1,12 @@ +# -*- mode: snippet -*- +# name: preambule +# -- +%%%------------------------------------------------------------------- +%%% @author Maciej Szlosarczyk (${1: maciej@sosek.net}) +%%% @copyright (C) (${2:`(format-time-string "%Y")`}) Maciej Szlosarczyk +%%% @doc +%%% +%%% @end +%%% Created: ${3:`(format-time-string "%d %b %Y")`} +%%%------------------------------------------------------------------- +$0 \ No newline at end of file diff --git a/snippets/js-mode/ar b/snippets/js-mode/ar new file mode 100644 index 0000000..a333bcd --- /dev/null +++ b/snippets/js-mode/ar @@ -0,0 +1,3 @@ +(${1:a}) => { + $0 +} \ No newline at end of file diff --git a/snippets/tide-mode/ar b/snippets/tide-mode/ar new file mode 100644 index 0000000..a333bcd --- /dev/null +++ b/snippets/tide-mode/ar @@ -0,0 +1,3 @@ +(${1:a}) => { + $0 +} \ No newline at end of file diff --git a/snippets/web-mode/ar b/snippets/web-mode/ar new file mode 100644 index 0000000..a333bcd --- /dev/null +++ b/snippets/web-mode/ar @@ -0,0 +1,3 @@ +(${1:a}) => { + $0 +} \ No newline at end of file diff --git a/themes/themes.el b/themes/themes.el index 580cf1a..4930bc8 100644 --- a/themes/themes.el +++ b/themes/themes.el @@ -11,6 +11,7 @@ (load "$HOME/.emacs.d/themes/themes-base16-not-harmonic.el" 'f 't) (load-theme 'base16-mexico-light t t) +(load-theme 'base16-ia-dark t t) (load-theme 'manoj-dark t t) (load-theme 'base16-one-light t t) (load-theme 'base16-zenburn t t) @@ -26,7 +27,7 @@ (if (display-graphic-p) (progn (sml/apply-theme 'respectful) - (enable-theme 'base16-mocha)) + (enable-theme 'base16-not-harmonic)) (progn (enable-theme 'base16-mexico-light) (setq base16-theme-256-color-source "base16-shell")))