From 42ebb1394d06aa0c32105a3602fa839d637efe3a Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Sun, 29 Oct 2017 00:52:41 +0300 Subject: [PATCH] Move everything to folders. * Remove not working function to create files with helm * Add SQL language file * Fine-tune emacs lisp completion settings --- .../base16-not-harmonic-theme.el | 0 behaviour.el => config/behaviour.el | 8 ----- emacs => config/emacs | 0 functions.el => config/functions.el | 0 key-bindings.el => config/key-bindings.el | 0 languages.el => config/languages.el | 29 +++++-------------- packages.el => config/packages.el | 0 spelling.el => config/spelling.el | 0 themes.el => config/themes.el | 2 +- windows.el => config/windows.el | 0 init.el | 16 +++++----- languages/elisp.el | 2 +- languages/sql.el | 27 +++++++++++++++++ 13 files changed, 45 insertions(+), 39 deletions(-) rename base16-not-harmonic-theme.el => config/base16-not-harmonic-theme.el (100%) rename behaviour.el => config/behaviour.el (95%) rename emacs => config/emacs (100%) rename functions.el => config/functions.el (100%) rename key-bindings.el => config/key-bindings.el (100%) rename languages.el => config/languages.el (65%) rename packages.el => config/packages.el (100%) rename spelling.el => config/spelling.el (100%) rename themes.el => config/themes.el (97%) rename windows.el => config/windows.el (100%) create mode 100644 languages/sql.el diff --git a/base16-not-harmonic-theme.el b/config/base16-not-harmonic-theme.el similarity index 100% rename from base16-not-harmonic-theme.el rename to config/base16-not-harmonic-theme.el diff --git a/behaviour.el b/config/behaviour.el similarity index 95% rename from behaviour.el rename to config/behaviour.el index 940efc6..0f2092f 100644 --- a/behaviour.el +++ b/config/behaviour.el @@ -14,7 +14,6 @@ kept-old-versions 2 version-control t) - ; Use Shells variables (when (memq window-system '(mac ns)) (exec-path-from-shell-initialize)) @@ -207,11 +206,4 @@ (require 'helm-projectile) -(with-eval-after-load 'helm-projectile - (defvar helm-source-file-not-found - (helm-build-dummy-source - "Create file" - :action (lambda (cand) (find-file cand)))) - (add-to-list 'helm-projectile-sources-list helm-source-file-not-found t)) - ;;; behaviour.el ends here diff --git a/emacs b/config/emacs similarity index 100% rename from emacs rename to config/emacs diff --git a/functions.el b/config/functions.el similarity index 100% rename from functions.el rename to config/functions.el diff --git a/key-bindings.el b/config/key-bindings.el similarity index 100% rename from key-bindings.el rename to config/key-bindings.el diff --git a/languages.el b/config/languages.el similarity index 65% rename from languages.el rename to config/languages.el index d157d79..2cf0633 100644 --- a/languages.el +++ b/config/languages.el @@ -7,28 +7,15 @@ (require 'company) ;; Imports -(load "~/.emacs.d/languages/ruby.el") -(load "~/.emacs.d/languages/python.el") -(load "~/.emacs.d/languages/elisp.el") -(load "~/.emacs.d/languages/elixir.el") -(load "~/.emacs.d/languages/rust.el") -(load "~/.emacs.d/languages/web.el") -(load "~/.emacs.d/languages/js.el") +(load "~/.emacs.d/languages/ruby.elc") +(load "~/.emacs.d/languages/python.elc") +(load "~/.emacs.d/languages/elisp.elc") +(load "~/.emacs.d/languages/elixir.elc") +(load "~/.emacs.d/languages/rust.elc") +(load "~/.emacs.d/languages/web.elc") +(load "~/.emacs.d/languages/js.elc") +(load "~/.emacs.d/languages/sql.elc") -;;; SQL -(defun sql-mode-hook () - "Editor setup for SQL." - (remove-hook 'ruby-mode-hook 'ruby-mode-config) - (remove-hook 'elixir-mode-hook 'elixir-mode-config) - (remove-hook 'emacs-lisp-mode-hook 'elisp-mode-config) - (remove-hook 'html-mode-hook 'web-mode-config) - (remove-hook 'haskell-mode-hook 'haskell-mode-config) - (remove-hook 'java-mode-hook 'java-mode-config) - - (set-indent 4)) - -(add-hook 'sql-mode-hook 'flycheck-mode) -(add-hook 'sql-mode-hook 'set-width-120) ;;; Haskell (defun haskell-mode-config () diff --git a/packages.el b/config/packages.el similarity index 100% rename from packages.el rename to config/packages.el diff --git a/spelling.el b/config/spelling.el similarity index 100% rename from spelling.el rename to config/spelling.el diff --git a/themes.el b/config/themes.el similarity index 97% rename from themes.el rename to config/themes.el index bf1656b..eb0f996 100644 --- a/themes.el +++ b/config/themes.el @@ -14,7 +14,7 @@ (display-time-mode t) () (load-theme 'flatui t t) -(load "~/.emacs.d/base16-not-harmonic-theme.el") +(load "~/.emacs.d/config/base16-not-harmonic-theme.el") (load-theme 'base16-not-harmonic t t) (load-theme 'base16-mexico-light t t) (load-theme 'base16-unikitty-light t t) diff --git a/windows.el b/config/windows.el similarity index 100% rename from windows.el rename to config/windows.el diff --git a/init.el b/init.el index 4e00246..bef40cb 100644 --- a/init.el +++ b/init.el @@ -8,14 +8,14 @@ ;; You may delete these explanatory comments. (package-initialize) -(load "~/.emacs.d/packages.elc") -(load "~/.emacs.d/functions.elc") -(load "~/.emacs.d/behaviour.elc") -(load "~/.emacs.d/themes.elc") -(load "~/.emacs.d/key-bindings.elc") -(load "~/.emacs.d/spelling.elc") -(load "~/.emacs.d/languages.elc") -(load "~/.emacs.d/windows.elc") +(load "~/.emacs.d/config/packages.elc") +(load "~/.emacs.d/config/functions.elc") +(load "~/.emacs.d/config/behaviour.elc") +(load "~/.emacs.d/config/themes.elc") +(load "~/.emacs.d/config/key-bindings.elc") +(load "~/.emacs.d/config/spelling.elc") +(load "~/.emacs.d/config/languages.elc") +(load "~/.emacs.d/config/windows.elc") (provide 'init) ;;; init.el ends here diff --git a/languages/elisp.el b/languages/elisp.el index 239ac1a..9befdfd 100644 --- a/languages/elisp.el +++ b/languages/elisp.el @@ -15,7 +15,7 @@ (company-mode 1) (flycheck-mode 1) (set (make-local-variable 'company-backends) - '((company-yasnippet company-dabbrev-code company-files)))) + '((company-yasnippet company-capf company-dabbrev-code company-files)))) ;;========== Hooks ================================= (add-hook 'emacs-lisp-mode-hook 'editor-config-elisp) diff --git a/languages/sql.el b/languages/sql.el new file mode 100644 index 0000000..0f614dd --- /dev/null +++ b/languages/sql.el @@ -0,0 +1,27 @@ +;;; SQL -- summary +;;; Commentary: + +;;; Code: + +;;========== Editor config ========================= +(defun editor-config-sql () + "Setup editor for SQL." + (set-indent 4) + (set-width-120)) + +;;========== Company config ========================= +(defun completion-config-sql () + (company-mode 1) + (flycheck-mode 1) + + (set (make-local-variable 'company-backends) + '(company-yasnippet company-etags company-dabbrev-code company-capf + company-files))) + +;;========== Hooks ========================= +(add-hook 'sql-mode-hook 'editor-config-sql) +(add-hook 'sql-mode-hook 'completion-config-sql) + + + +;;; sql.el ends here.