~edwargix/emacs.d

b692c0574f3a1049320614adbfdd01396bb2e087 — David Florness 7 years ago 95ca763
Reindent
4 files changed, 41 insertions(+), 41 deletions(-)

M init.el
M lisp/setup-dev.el
M lisp/setup-helm.el
M lisp/setup-packages.el
M init.el => init.el +31 -31
@@ 22,8 22,8 @@
  :ensure t
  :commands (markdown-mode gfm-mode)
  :mode (("README\\.md\\'" . gfm-mode)
	 ("\\.md\\'" . markdown-mode)
	 ("\\.markdown\\'" . markdown-mode))
		 ("\\.md\\'" . markdown-mode)
		 ("\\.markdown\\'" . markdown-mode))
  :init (setq markdown-command "multimarkdown"))

;;; Evil (extensible vi layer)


@@ 33,18 33,18 @@
  :ensure t
  :config
  (progn
    (evil-define-key 'motion help-mode-map (kbd "<tab>") 'forward-button)
    (evil-define-key 'motion help-mode-map (kbd "S-<tab>") 'backward-button)
    (define-key evil-ex-map "b " 'helm-mini)
    (define-key evil-ex-map "e " 'helm-find-files)
    (add-hook 'with-editor-mode-hook 'evil-insert-state)
    (evil-mode 1)))
	(evil-define-key 'motion help-mode-map (kbd "<tab>") 'forward-button)
	(evil-define-key 'motion help-mode-map (kbd "S-<tab>") 'backward-button)
	(define-key evil-ex-map "b " 'helm-mini)
	(define-key evil-ex-map "e " 'helm-find-files)
	(add-hook 'with-editor-mode-hook 'evil-insert-state)
	(evil-mode 1)))
(use-package evil-surround
  :ensure t
  :after evil
  :config
  (progn
    (global-evil-surround-mode 1)))
	(global-evil-surround-mode 1)))

;;; Magit: a Git Porcelain inside Emacs
(use-package magit


@@ 63,9 63,9 @@
  :ensure t
  :init
  (progn
    (global-flycheck-mode)
    (evil-define-key 'normal
      flycheck-error-list-mode-map (kbd "q") 'quit-window)))
	(global-flycheck-mode)
	(evil-define-key 'normal
	  flycheck-error-list-mode-map (kbd "q") 'quit-window)))

;;; Quickhelp (documentation lookup) for company
(use-package company-quickhelp


@@ 73,8 73,8 @@
  :after company
  :config
  (progn
    (setq company-quickhelp-idle-delay 1)
    (company-quickhelp-mode 1)))
	(setq company-quickhelp-idle-delay 1)
	(company-quickhelp-mode 1)))

;;; company backend for C/C++ headers
(use-package company-c-headers


@@ 94,8 94,8 @@
  :ensure t
  :config
  (defengine duckduckgo
    "https://duckduckgo.com/?q=%s"
    :keybinding "d")
	"https://duckduckgo.com/?q=%s"
	:keybinding "d")
  (engine-mode))

;;; Org mode for keeping notes, todo lists, planning, and fast


@@ 103,12 103,12 @@
(use-package org
  :init
  (progn
    (load-file "~/org/setup.el")
    (unless (package-installed-p 'org-plus-contrib)
      (package-install 'org-plus-contrib))
    (setq org-default-notes-file "~/notes.org"
	  org-return-follows-link t
	  org-read-date-force-compatible-dates nil))
	(load-file "~/org/setup.el")
	(unless (package-installed-p 'org-plus-contrib)
	  (package-install 'org-plus-contrib))
	(setq org-default-notes-file "~/notes.org"
		  org-return-follows-link t
		  org-read-date-force-compatible-dates nil))
  :bind
  (("C-c a" . org-agenda)
   ("C-c c" . org-capture)


@@ 121,20 121,20 @@
  :after org
  :config
  (progn
    (add-hook 'org-mode-hook 'org-bullets-mode)))
	(add-hook 'org-mode-hook 'org-bullets-mode)))

;;; Evil keybindings for org
(use-package evil-org
  :init
  (progn
    (add-hook 'org-mode-hook 'evil-org-mode)
    (add-hook 'evil-org-mode-hook
	      (lambda ()
		(evil-org-set-key-theme)
		(evil-define-key 'normal
		  evil-org-mode-map
		  (kbd "<return>")
		  'evil-org-return))))
	(add-hook 'org-mode-hook 'evil-org-mode)
	(add-hook 'evil-org-mode-hook
			  (lambda ()
				(evil-org-set-key-theme)
				(evil-define-key 'normal
				  evil-org-mode-map
				  (kbd "<return>")
				  'evil-org-return))))
  :ensure t
  :after org)


M lisp/setup-dev.el => lisp/setup-dev.el +3 -3
@@ 39,10 39,10 @@
  :ensure t
  :config
  (progn
    (add-hook 'after-init-hook 'global-company-mode)
	(add-hook 'after-init-hook 'global-company-mode)
	(delete 'company-semantic company-backends)
    (define-key company-active-map (kbd "M-j") 'company-select-next)
    (define-key company-active-map (kbd "M-k") 'company-select-previous)))
	(define-key company-active-map (kbd "M-j") 'company-select-next)
	(define-key company-active-map (kbd "M-k") 'company-select-previous)))




M lisp/setup-helm.el => lisp/setup-helm.el +5 -5
@@ 37,15 37,15 @@
   ("M-h" . helm-find-files-up-one-level))
  :config
  (progn
    (require 'helm-config)
    (when (executable-find "curl")
      (setq helm-net-prefer-curl t))
    (add-hook 'helm-after-initialize-hook
	(require 'helm-config)
	(when (executable-find "curl")
	  (setq helm-net-prefer-curl t))
	(add-hook 'helm-after-initialize-hook
			  ;; hide the cursor in helm buffers
			  (lambda ()
				(with-helm-buffer
				  (setq cursor-in-non-selected-windows nil))))
    (helm-mode 1)))
	(helm-mode 1)))


;;; Helm extension for yasnippet

M lisp/setup-packages.el => lisp/setup-packages.el +2 -2
@@ 11,8 11,8 @@

;;; Add melpa archive
(let* ((no-ssl (and (memq system-type '(windows-nt ms-dos))
		    (not (gnutls-available-p))))
       (url (concat (if no-ssl "http" "https") "://melpa.org/packages/")))
					(not (gnutls-available-p))))
	   (url (concat (if no-ssl "http" "https") "://melpa.org/packages/")))
  (add-to-list 'package-archives (cons "melpa" url) t))

;;; Add org archive