From d77b98c35bcc1d00ee49d20428357dbe09133f2c Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Thu, 20 Dec 2018 00:52:58 +0000 Subject: [PATCH] Customize sql-mode, adding sqlformat package --- core/siren-modules.el | 1 + custom.el | 2 +- modules/languages/siren-sql.el | 31 +++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 modules/languages/siren-sql.el diff --git a/core/siren-modules.el b/core/siren-modules.el index 7aa5292..af12011 100644 --- a/core/siren-modules.el +++ b/core/siren-modules.el @@ -132,6 +132,7 @@ (require 'siren-scss) (require 'siren-sh) (require 'siren-slim) +(require 'siren-sql) (require 'siren-text-mode) (require 'siren-thrift) (require 'siren-typescript) diff --git a/custom.el b/custom.el index 2db837f..edab978 100644 --- a/custom.el +++ b/custom.el @@ -7,7 +7,7 @@ '(magit-commit-arguments (quote ("-S"))) '(package-selected-packages (quote - (zoom-window yasnippet-snippets yari yaml-mode which-key web-mode use-package typescript-mode toggle-quotes tide thrift string-inflection smex smartparens smart-mode-line slim-mode seeing-is-believing scss-mode sass-mode rust-playground ruby-tools ruby-refactor ruby-compilation rubocopfmt rubocop rspec-mode robe rjsx-mode restart-emacs resize-window realgud-byebug rainbow-mode racer prettier-js plantuml-mode php-mode phi-search neotree nav multiple-cursors move-dup magit-gh-pulls lua-mode lsp-mode linum-relative json-mode imenu-anywhere ido-vertical-mode ido-completing-read+ hlinum highlight-symbol highlight-indentation highlight-indent-guides helpful helm-swoop helm-projectile helm-open-github helm-gtags helm-describe-modes helm-descbinds helm-ag go-projectile go-playground go-dlv gitignore-mode github-browse-file gitconfig-mode git-timemachine git-link full-ack flycheck-rust flycheck-gometalinter fill-column-indicator feature-mode expand-region exec-path-from-shell evil eslintd-fix editorconfig dumb-jump doom-themes dockerfile-mode direx diminish diff-hl dash-at-point company-lsp company-go coffee-mode cargo buffer-move browse-kill-ring anzu ace-window)))) + (zoom-window yasnippet-snippets yari yaml-mode which-key web-mode use-package typescript-mode toggle-quotes tide thrift string-inflection sqlformat smex smartparens smart-mode-line slim-mode seeing-is-believing scss-mode sass-mode rust-playground ruby-tools ruby-refactor ruby-compilation rubocopfmt rubocop rspec-mode robe rjsx-mode restart-emacs resize-window realgud-byebug rainbow-mode racer prettier-js plantuml-mode php-mode phi-search neotree nav multiple-cursors move-dup magit-gh-pulls lua-mode lsp-mode linum-relative json-mode imenu-anywhere ido-vertical-mode ido-completing-read+ hlinum highlight-symbol highlight-indentation highlight-indent-guides helpful helm-swoop helm-projectile helm-open-github helm-gtags helm-describe-modes helm-descbinds helm-ag go-projectile go-playground go-dlv gitignore-mode github-browse-file gitconfig-mode git-timemachine git-link full-ack flycheck-rust flycheck-gometalinter fill-column-indicator feature-mode expand-region exec-path-from-shell evil eslintd-fix editorconfig dumb-jump doom-themes dockerfile-mode direx diminish diff-hl dash-at-point company-lsp company-go coffee-mode cargo buffer-move browse-kill-ring anzu ace-window)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/modules/languages/siren-sql.el b/modules/languages/siren-sql.el new file mode 100644 index 0000000..6800f9e --- /dev/null +++ b/modules/languages/siren-sql.el @@ -0,0 +1,31 @@ +;;; siren-sql.el --- jimeh's Emacs Siren: sql-mode configuration. + +;;; Commentary: + +;; Basic configuration for sql-mode. + +;;; Code: + +(require 'siren-rainbow) + +(use-package sql-mode + :ensure nil ;; loaded from emacs built-ins + :mode "\\.sql\\'" + :hook (sql-mode . siren-sql-mode-setup) + + :init + (defun siren-sql-mode-setup () + (setq tab-width 2) + + (company-mode +1) + (highlight-indentation-current-column-mode +1))) + +(use-package sqlformat + :hook + (sql-mode . sqlformat-mode) + + :config + (setq sqlformat-command 'pgformatter)) + +(provide 'siren-sql) +;;; siren-sql.el ends here