diff options
Diffstat (limited to '')
-rw-r--r-- | emacs.d/core/core-autocompletion.el | 7 | ||||
-rw-r--r-- | emacs.d/core/core-bindings.el (renamed from emacs.d/inits/00_bindings.el) | 7 | ||||
-rw-r--r-- | emacs.d/core/core-default.el (renamed from emacs.d/inits/00_defaults.el) | 4 | ||||
-rw-r--r-- | emacs.d/core/core-defun.el (renamed from emacs.d/inits/10_defun.el) | 2 | ||||
-rw-r--r-- | emacs.d/core/core-editor.el (renamed from emacs.d/inits/50_development.el) | 50 | ||||
-rw-r--r-- | emacs.d/core/core-flycheck.el (renamed from emacs.d/inits/50_flycheck.el) | 2 | ||||
-rw-r--r-- | emacs.d/core/core-flyspell.el (renamed from emacs.d/inits/50_flyspell.el) | 2 | ||||
-rw-r--r-- | emacs.d/core/core-git.el | 24 | ||||
-rw-r--r-- | emacs.d/core/core-load-paths.el | 12 | ||||
-rw-r--r-- | emacs.d/core/core-modes.el | 7 | ||||
-rw-r--r-- | emacs.d/core/core-ui.el (renamed from emacs.d/inits/00_ui.el) | 15 |
11 files changed, 99 insertions, 33 deletions
diff --git a/emacs.d/core/core-autocompletion.el b/emacs.d/core/core-autocompletion.el new file mode 100644 index 0000000..724ccf3 --- /dev/null +++ b/emacs.d/core/core-autocompletion.el @@ -0,0 +1,7 @@ +(use-package company + :ensure t + :config + (progn + (add-hook 'prog-mode-hook 'company-mode))) + +(provide 'core-autocompletion) diff --git a/emacs.d/inits/00_bindings.el b/emacs.d/core/core-bindings.el index ded7005..e95e837 100644 --- a/emacs.d/inits/00_bindings.el +++ b/emacs.d/core/core-bindings.el @@ -1,4 +1,9 @@ -;;; some bindings (global-set-key (kbd "M-j") 'join-line) + (global-set-key (kbd "C-x C-b") 'ivy-switch-buffer) + (global-set-key (kbd "<s-return>") 'toggle-frame-fullscreen) + +(global-set-key (kbd "C-c C-d") 'fcuny-terminal) + +(provide 'core-bindings) diff --git a/emacs.d/inits/00_defaults.el b/emacs.d/core/core-default.el index 26ec0bb..a3076eb 100644 --- a/emacs.d/inits/00_defaults.el +++ b/emacs.d/core/core-default.el @@ -23,3 +23,7 @@ (setq tab-always-indent 'complete) (global-auto-revert-mode 1) + +(setq-default indent-tabs-mode nil) + +(provide 'core-default) diff --git a/emacs.d/inits/10_defun.el b/emacs.d/core/core-defun.el index 233f771..deb315b 100644 --- a/emacs.d/inits/10_defun.el +++ b/emacs.d/core/core-defun.el @@ -5,3 +5,5 @@ (switch-to-buffer "*ansi-term*") (ansi-term "/bin/bash")) (get-buffer-process "*ansi-term*")) + +(provide 'core-defun) diff --git a/emacs.d/inits/50_development.el b/emacs.d/core/core-editor.el index a746355..c8740db 100644 --- a/emacs.d/inits/50_development.el +++ b/emacs.d/core/core-editor.el @@ -1,32 +1,25 @@ -(use-package ag - :ensure t - :defer t) - -(use-package goto-chg +(use-package swiper :ensure t - :bind (("C-." . goto-last-change) - ("C-," . goto-last-change-reverse))) + :bind ( + ("C-s" . swiper)) + :config + (setq ivy-use-virtual-buffers t) + (ivy-mode)) -(use-package projectile +(use-package counsel :ensure t - :init - (setq projectile-enable-caching t) - (setq projectile-completion-system 'ivy) :config - (projectile-global-mode)) + (setq counsel-find-file-at-point t)) -(use-package company +(use-package exec-path-from-shell :ensure t :config - (progn - (add-hook 'prog-mode-hook 'company-mode))) + (exec-path-from-shell-initialize) + (exec-path-from-shell-copy-envs '("TMPDIR" "GOPATH"))) -(use-package rainbow-delimiters +(use-package ag :ensure t - :defer t - :init - (progn - (add-hook 'emacs-lisp-mode-hook #'rainbow-delimiters-mode))) + :defer t) (use-package smartparens :ensure t @@ -58,14 +51,17 @@ ("M-S-<right>" . sp-backward-barf-sexp) ("M-d" . sp-splice-sexp)))) -(use-package gist +(use-package projectile :ensure t - :bind ("C-c g p" . gist-region-or-buffer-private) + :init + (setq projectile-enable-caching t) + (setq projectile-completion-system 'ivy) :config - (setq gist-view-gist t)) + (projectile-global-mode)) -(use-package github-browse-file - :ensure t - :defer t) +(use-package server + :config + (unless (server-running-p) + (server-start))) -(setq-default indent-tabs-mode nil) +(provide 'core-editor) diff --git a/emacs.d/inits/50_flycheck.el b/emacs.d/core/core-flycheck.el index 3d835e3..9c64bb1 100644 --- a/emacs.d/inits/50_flycheck.el +++ b/emacs.d/core/core-flycheck.el @@ -29,3 +29,5 @@ (eval-after-load 'feature-flycheck '(setq-default flycheck-display-errors-function #'flycheck-pos-tip-error-messages))) :ensure t) + +(provide 'core-flycheck) diff --git a/emacs.d/inits/50_flyspell.el b/emacs.d/core/core-flyspell.el index 14887e8..7c61b49 100644 --- a/emacs.d/inits/50_flyspell.el +++ b/emacs.d/core/core-flyspell.el @@ -7,3 +7,5 @@ ispell-list-command "--list") (add-hook 'prog-mode-hook 'flyspell-prog-mode) (add-hook 'text-mode-hook 'turn-on-flyspell))) + +(provide 'core-flyspell) diff --git a/emacs.d/core/core-git.el b/emacs.d/core/core-git.el new file mode 100644 index 0000000..2fa1167 --- /dev/null +++ b/emacs.d/core/core-git.el @@ -0,0 +1,24 @@ +(delete 'Git vc-handled-backends) + +(use-package magit + :ensure t + :bind ("C-x g" . magit-status) + :config + (progn + (setq magit-completing-read-function 'ivy-completing-read) + (setq magit-item-highlight-face 'bold))) + +(use-package gist + :ensure t + :bind ("C-c g p" . gist-region-or-buffer-private) + :config + (setq gist-view-gist t)) + +(use-package github-browse-file + :ensure t + :defer t) + +(provide 'core-git) + + + diff --git a/emacs.d/core/core-load-paths.el b/emacs.d/core/core-load-paths.el new file mode 100644 index 0000000..0dec695 --- /dev/null +++ b/emacs.d/core/core-load-paths.el @@ -0,0 +1,12 @@ +(add-to-list 'load-path (concat user-emacs-directory "core/")) + +(require 'core-default) +(require 'core-ui) +(require 'core-editor) +(require 'core-defun) +(require 'core-git) +(require 'core-flycheck) +(require 'core-flyspell) +(require 'core-autocompletion) +(require 'core-bindings) +(require 'core-modes) diff --git a/emacs.d/core/core-modes.el b/emacs.d/core/core-modes.el new file mode 100644 index 0000000..b994b1e --- /dev/null +++ b/emacs.d/core/core-modes.el @@ -0,0 +1,7 @@ +(defun fcuny/load-layers () + (mapc 'load + (directory-files (concat user-emacs-directory "modes") t "\\.el$"))) + +(fcuny/load-layers) + +(provide 'core-modes) diff --git a/emacs.d/inits/00_ui.el b/emacs.d/core/core-ui.el index 29d900a..ff70ae3 100644 --- a/emacs.d/inits/00_ui.el +++ b/emacs.d/core/core-ui.el @@ -40,10 +40,15 @@ (use-package smart-mode-line :ensure t :config - (use-package smart-mode-line-powerline-theme - :ensure t - :if window-system ; enable only in gui mode - :config - (setq sml/theme 'light)) + (setq sml/theme 'light) (setq rm-whitelist '("")) (sml/setup)) + +(use-package rainbow-delimiters + :ensure t + :defer t + :init + (progn + (add-hook 'emacs-lisp-mode-hook #'rainbow-delimiters-mode))) + +(provide 'core-ui) |