start refactoring init to better use 'use-package'

This commit is contained in:
Mateus Pinto Rodrigues
2019-10-12 14:58:51 -03:00
parent 91d1ddfa0b
commit e8b34a249c
9 changed files with 99 additions and 22 deletions

View File

@@ -4,9 +4,9 @@
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(package-selected-packages '(package-selected-packages
(quote '(gnu-elpa-keyring-update tide rjsx-mode use-package org-brain poly-noweb julia-mode zenburn-theme xref-js2 slime racket-mode racer polymode paredit org-ref org lua-mode json-mode js2-refactor ivy-bibtex haskell-mode ess-smart-underscore counsel company-tern cargo auto-complete))
(poly-noweb julia-mode zenburn-theme xref-js2 writeroom-mode slime racket-mode racer polymode paredit org-ref org-bullets org lua-mode json-mode js2-refactor ivy-bibtex haskell-mode geiser ess-smart-underscore counsel company-tern cargo auto-complete))) '(send-mail-function 'smtpmail-send-it)
'(tramp-syntax (quote default) nil (tramp))) '(tramp-syntax 'default nil (tramp)))
(custom-set-faces (custom-set-faces
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.

View File

@@ -1,5 +1,5 @@
;; better behavior inserting _ ;; better behavior inserting _
(require ess-smart-underscore) ;;(require 'ess-smart-underscore)
;; enable code auto completion ;; enable code auto completion
(require 'auto-complete-config) (require 'auto-complete-config)

View File

@@ -5,19 +5,69 @@
;; Always use slant for italic, not underline ;; Always use slant for italic, not underline
'(italic ((t (:slant italic)))) '(italic ((t (:slant italic))))
;; load my packages ;; Load my packages
(require 'geiser) ;; Check if packages are available (I guess)
(require 'ess-site) (eval-when-compile
(require 'use-package))
;;R
(use-package ess-site
:ensure ess
:config
(load "~/.emacs.d/elisp/ess-setup.el"))
;;Javascript
(use-package js2-mode
:ensure t
:config
(add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
;better imenu
(add-hook 'js2-mode-hook #'js2-imenu-extras-mode)
(load "~/.emacs.d/elisp/javascript.el"))
(use-package rjsx-mode
:ensure t)
;;Typescript
(use-package tide
:ensure t
:config
(load "~/.emacs.d/elisp/typescript.el"))
(use-package org-brain
:disabled
:ensure t
:init
(setq org-brain-path "~/repos/csphy/drafts")
:config
(load "~/.emacs.d/elisp/org-brain-setup.el"))
;;Common Lisp
(use-package slime
:disabled
:config
((load "~/.emacs.d/elisp/slime-setup.el")))
;;Rust
(use-package rust-mode
:ensure t
:config
(load "~/.emacs.d/elisp/rust-setup.el"))
;;Org
(use-package org
:ensure t
:config
(load "~/.emacs.d/elisp/org-setup.el"))
(use-package ivy
:ensure ivy
:ensure ivy-bibtex
:config
(load "~/.emacs.d/elisp/ivy-setup.el"))
;; load my custom setups
(load "~/.emacs.d/elisp/org-setup.el")
;(load "~/.emacs.d/elisp/slime-setup.el")
;(load "~/.emacs.d/elisp/polymode-setup.el") ;(load "~/.emacs.d/elisp/polymode-setup.el")
(load "~/.emacs.d/elisp/outline-keymap.el") (load "~/.emacs.d/elisp/outline-keymap.el")
(load "~/.emacs.d/elisp/bibtex-setup.el") (load "~/.emacs.d/elisp/bibtex-setup.el")
(load "~/.emacs.d/elisp/ivy-setup.el")
;(load "~/.emacs.d/elisp/geiser-setup.el")
(load "~/.emacs.d/elisp/keypad.el") (load "~/.emacs.d/elisp/keypad.el")
(load "~/.emacs.d/elisp/javascript.el")
;(load "~/.emacs.d/elisp/ess-setup.el")
(load "~/.emacs.d/elisp/rust-setup.el")

View File

@@ -1,8 +1,8 @@
(require 'js2-mode) ;(require 'js2-mode)
(add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode)) ;(add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
;; Better imenu ;; Better imenu
(add-hook 'js2-mode-hook #'js2-imenu-extras-mode) ;(add-hook 'js2-mode-hook #'js2-imenu-extras-mode)
(require 'js2-refactor) (require 'js2-refactor)
(require 'xref-js2) (require 'xref-js2)

7
elisp/org-brain-setup.el Normal file
View File

@@ -0,0 +1,7 @@
(setq org-id-track-globally t)
(setq org-id-locations-file "~/.emacs.d/.org-id-locations")
(push '("b" "Brain" plain (function org-brain-goto-end)
"* %i%?" :empty-lines 1)
org-capture-templates)
(setq org-brain-visualize-default-choices 'all)
(setq org-brain-title-max-length 12)

View File

@@ -7,6 +7,5 @@
;; Code completion ;; Code completion
(add-hook 'racer-mode-hook #'company-mode) (add-hook 'racer-mode-hook #'company-mode)
(require 'rust-mode)
(define-key rust-mode-map (kbd "TAB") #'company-indent-or-complete-common) (define-key rust-mode-map (kbd "TAB") #'company-indent-or-complete-common)
(setq company-tooltip-align-annotations t) (setq company-tooltip-align-annotations t)

View File

@@ -29,8 +29,7 @@
(add-to-list (add-to-list
'package-archives 'package-archives
'("melpa" . "http://melpa.org/packages/") '("melpa" . "http://melpa.org/packages/")
'("gnu" . "http://elpa.gnu.org/packages/")) '("gnu" . "http://elpa.gnu.org/packages/")))
(package-initialize))
(put 'erase-buffer 'disabled nil) (put 'erase-buffer 'disabled nil)
;; remove trailing white spaces before saving ;; remove trailing white spaces before saving
@@ -96,3 +95,6 @@
;; Make seamonkey available for use ;; Make seamonkey available for use
(setq browse-url-browser-function 'browse-url-generic (setq browse-url-browser-function 'browse-url-generic
browse-url-generic-program "seamonkey") browse-url-generic-program "seamonkey")
;; Mutt support
(setq auto-mode-alist (append '(("/tmp/neomutt.*" . mail-mode)) auto-mode-alist))

19
elisp/typescript.el Normal file
View File

@@ -0,0 +1,19 @@
(defun setup-tide-mode ()
(interactive)
(tide-setup)
(flycheck-mode +1)
(setq flycheck-check-syntax-automatically '(save mode-enabled))
(eldoc-mode +1)
(tide-hl-identifier-mode +1)
;; company is an optional dependency. You have to
;; install it separately via package-install
;; `M-x package-install [ret] company`
(company-mode +1))
;; aligns annotation to the right hand side
(setq company-tooltip-align-annotations t)
;; formats the buffer before saving
(add-hook 'before-save-hook 'tide-format-before-save)
(add-hook 'typescript-mode-hook #'setup-tide-mode)

View File

@@ -1,4 +1,4 @@
(package-initialize) ;(package-initialize)
(add-to-list 'load-path "~/.emacs.d/elisp/") (add-to-list 'load-path "~/.emacs.d/elisp/")