Major overhaul
This commit is contained in:
Henrik Lissner
parent
4ab3ae1125
commit
6bda25da1f
76 changed files with 7431 additions and 571 deletions
|
|
@ -1,38 +0,0 @@
|
|||
;; Global editor behavior (+ evil)
|
||||
(provide 'core-editor)
|
||||
|
||||
;;;; Editing plugins ;;;;;;;;;;;;;;;;;;;
|
||||
(use-package expand-region
|
||||
:commands (er/expand-region er/contract-region))
|
||||
|
||||
(use-package rotate-text
|
||||
:commands (rotate-word-at-point rotate-region))
|
||||
|
||||
(use-package smartparens
|
||||
:init (require 'smartparens-config)
|
||||
:config
|
||||
(progn
|
||||
(smartparens-global-mode 1)
|
||||
|
||||
(setq blink-matching-paren t)
|
||||
(setq sp-autowrap-region nil ; let evil-surround handle this
|
||||
sp-highlight-pair-overlay nil
|
||||
sp-show-pair-delay 0
|
||||
sp-autoescape-string-quote nil)
|
||||
|
||||
;; Handle newlines
|
||||
(sp-pair "{" nil :post-handlers '(("||\n[i]" "RET")))
|
||||
(sp-pair "[" nil :post-handlers '(("||\n[i]" "RET")))
|
||||
(sp-with-modes '(emacs-lisp-mode lisp-mode)
|
||||
(sp-local-pair "[" nil :post-handlers '(("|" "RET"))))
|
||||
|
||||
;; Auto-close more conservatively
|
||||
(sp-pair "[" nil :unless '(sp-point-before-word-p sp-point-before-same-p))
|
||||
(sp-pair "(" nil :unless '(sp-point-before-word-p sp-point-before-same-p))
|
||||
(sp-pair "\"" nil :unless '(sp-point-after-word-p sp-point-before-word-p sp-point-before-same-p))
|
||||
(sp-pair "'" nil :unless '(sp-point-after-word-p sp-point-before-word-p sp-point-before-same-p))
|
||||
(sp-pair "\"" nil :unless '(sp-point-after-word-p sp-point-before-word-p sp-point-before-same-p))
|
||||
|
||||
(after "yasnippet"
|
||||
(defadvice yas-expand (before advice-for-yas-expand activate)
|
||||
(sp-remove-active-pair-overlay)))))
|
||||
|
|
@ -1,367 +0,0 @@
|
|||
(provide 'core-evil)
|
||||
|
||||
;;;; Eeeeeeevil ;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
(use-package evil
|
||||
:pre-load
|
||||
(setq evil-want-visual-char-semi-exclusive t
|
||||
evil-search-module 'evil-search
|
||||
evil-magic 'very-magic
|
||||
evil-want-C-u-scroll t ; enable C-u for scrolling
|
||||
evil-ex-visual-char-range t ; column range for ex commands
|
||||
|
||||
;; Color-coded state cursors
|
||||
evil-normal-state-cursor '("white" box)
|
||||
evil-emacs-state-cursor '("cyan" bar)
|
||||
evil-insert-state-cursor '("white" bar)
|
||||
evil-god-state-cursor '("orange" box)
|
||||
evil-visual-state-cursor 'hollow
|
||||
|
||||
ace-jump-mode-scope 'window
|
||||
ace-jump-mode-move-keys (nconc (loop for i from ?a to ?z collect i)
|
||||
(loop for i from ?A to ?Z collect i)))
|
||||
:config
|
||||
(progn
|
||||
(evil-mode)
|
||||
;; Always ensure evil-shift-width is consistent with tab-width
|
||||
(add-hook! 'find-file-hook (setq evil-shift-width tab-width))
|
||||
;; highlight matching delimiters (only in insert mode)
|
||||
(add-hook 'evil-insert-state-entry-hook 'show-paren-mode)
|
||||
(add-hook 'evil-insert-state-exit-hook (λ (show-paren-mode -1)))
|
||||
;; Disable highlights on insert-mode
|
||||
(add-hook 'evil-insert-state-entry-hook 'evil-ex-nohighlight)
|
||||
|
||||
;; Evil command window
|
||||
;;(my/cleanup-buffers-add "^\\*Command Line\\*$")
|
||||
|
||||
;; modes to map to different default states
|
||||
(dolist (mode-map '((cider-repl-mode . emacs)
|
||||
(comint-mode . emacs)
|
||||
(fundamental-mode . normal)
|
||||
(help-mode . normal)
|
||||
(term-mode . emacs)))
|
||||
(evil-set-initial-state `,(car mode-map) `,(cdr mode-map)))
|
||||
|
||||
(progn ; evil plugins
|
||||
(use-package evil-space :init (evil-space-default-setup))
|
||||
|
||||
(use-package evil-exchange
|
||||
:config
|
||||
(defadvice evil-force-normal-state (before evil-esc-quit-exchange activate)
|
||||
(shut-up (evil-exchange-cancel))))
|
||||
|
||||
(use-package evil-ex-registers)
|
||||
|
||||
(use-package evil-indent-textobject) ; vii/vai/vaI
|
||||
|
||||
(use-package evil-numbers)
|
||||
|
||||
(use-package evil-god-state)
|
||||
|
||||
(use-package evil-matchit :init (global-evil-matchit-mode 1))
|
||||
|
||||
(use-package evil-surround :init (global-evil-surround-mode 1))
|
||||
|
||||
(use-package evil-nerd-commenter
|
||||
:pre-load (setq evilnc-hotkey-comment-operator "gc"))
|
||||
|
||||
(use-package evil-jumper
|
||||
:pre-load (setq evil-jumper-file (expand-file-name "jumplist" my-tmp-dir))
|
||||
:config
|
||||
(progn
|
||||
(setq evil-jumper-auto-center t
|
||||
evil-jumper-auto-save-interval 3600)
|
||||
(define-key evil-motion-state-map (kbd "H-i") 'evil-jumper/forward)))
|
||||
|
||||
(use-package ace-window)
|
||||
|
||||
(use-package evil-visualstar))
|
||||
|
||||
(bind evil-ex-completion-map
|
||||
"C-r" #'evil-ex-paste-from-register ; registers in ex-mode
|
||||
"C-a" 'move-beginning-of-line
|
||||
"<s-left>" 'move-beginning-of-line
|
||||
"<s-right>" 'move-beginning-of-line
|
||||
"<s-backspace>" 'evil-delete-whole-line)
|
||||
|
||||
(progn ; evil hacks
|
||||
(defadvice evil-force-normal-state (before evil-esc-quit activate)
|
||||
(shut-up (evil-ex-nohighlight) ; turn off highlights
|
||||
;; Exit minibuffer is alive
|
||||
(if (minibuffer-window-active-p (minibuffer-window))
|
||||
(my--minibuffer-quit))))
|
||||
|
||||
;; Popwin: close popup window, if any
|
||||
(after "popwin"
|
||||
(defadvice evil-force-normal-state (before evil-esc-quit-popwin activate)
|
||||
(shut-up (popwin:close-popup-window))))
|
||||
|
||||
;; Ace-Jump: Enable half-cursor blink when using ace-jump
|
||||
(defadvice evil-ace-jump-char-mode (before evil-ace-jump-char-mode-op activate)
|
||||
(evil-half-cursor))
|
||||
(defadvice evil-ace-jump-word-mode (before evil-ace-jump-word-mode-op activate)
|
||||
(evil-half-cursor))
|
||||
(setq aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l))
|
||||
;; (setq ace-jump-mode-move-keys
|
||||
;; (nconc (loop for i from ?a to ?z collect i)
|
||||
;; (loop for i from ?A to ?Z collect i))
|
||||
|
||||
;; https://github.com/winterTTr/ace-jump-mode/issues/23
|
||||
(defun ace-jump-two-chars-mode (&optional query-char query-char-2)
|
||||
"AceJump two chars mode"
|
||||
(interactive)
|
||||
|
||||
(evil-half-cursor)
|
||||
(setq query-char (or query-char (read-char ">")))
|
||||
(setq query-char-2 (or query-char-2 (read-char (concat ">" (string query-char)))))
|
||||
|
||||
(if (eq (ace-jump-char-category query-char) 'other)
|
||||
(error "[AceJump] Non-printable character"))
|
||||
|
||||
;; others : digit , alpha, punc
|
||||
(setq ace-jump-query-char query-char)
|
||||
(setq ace-jump-current-mode 'ace-jump-char-mode)
|
||||
(ace-jump-do (regexp-quote (concat (char-to-string query-char)
|
||||
(char-to-string query-char-2)))))
|
||||
|
||||
;; Jump to new splits
|
||||
(defadvice evil-window-split (after evil-window-split-jump activate)
|
||||
(evil-window-down 1))
|
||||
(defadvice evil-window-vsplit (after evil-window-vsplit-jump activate)
|
||||
(evil-window-right 1)))
|
||||
|
||||
(progn ; extensions
|
||||
(defun evil-visual-line-state-p ()
|
||||
"Returns non-nil if in visual-line mode, nil otherwise."
|
||||
(and (evil-visual-state-p)
|
||||
(eq (evil-visual-type) 'line)))
|
||||
|
||||
(defun evil-ex-replace-special-filenames (file-name)
|
||||
"Replace special symbols in FILE-NAME.
|
||||
|
||||
% => full path to file (/project/src/thing.c)
|
||||
# => alternative file path (/project/include/thing.h)
|
||||
%:p => path to project root (/project/)
|
||||
%:d => path to current directory (/project/src/)
|
||||
%:e => the file's extension (c)
|
||||
%:r => the full path without its extension (/project/src/thing)
|
||||
%:t => the file's basename (thing.c)"
|
||||
(let ((current-fname (buffer-file-name))
|
||||
(alternate-fname (and (other-buffer)
|
||||
(buffer-file-name (other-buffer)))))
|
||||
(setq file-name
|
||||
;; %:p:h => the project root (or current directory otherwise)
|
||||
(replace-regexp-in-string "\\(^\\|[^\\\\]\\)\\(%:p\\)"
|
||||
(my--project-root) file-name t t 2))
|
||||
(setq file-name
|
||||
;; %:p => the project root (or current directory otherwise)
|
||||
(replace-regexp-in-string "\\(^\\|[^\\\\]\\)\\(%:d\\)"
|
||||
default-directory file-name t t 2))
|
||||
(when current-fname
|
||||
(setq file-name
|
||||
;; %:e => ext
|
||||
(replace-regexp-in-string "\\(^\\|[^\\\\]\\)\\(%:e\\)"
|
||||
(f-ext current-fname) file-name t t 2))
|
||||
(setq file-name
|
||||
;; %:r => filename
|
||||
(replace-regexp-in-string "\\(^\\|[^\\\\]\\)\\(%:r\\)"
|
||||
(f-no-ext current-fname) file-name t t 2))
|
||||
(setq file-name
|
||||
;; %:t => filename.ext
|
||||
(replace-regexp-in-string "\\(^\\|[^\\\\]\\)\\(%:t\\)"
|
||||
(f-base current-fname) file-name t t 2))
|
||||
(setq file-name
|
||||
;; % => file path for current frame
|
||||
(replace-regexp-in-string "\\(^\\|[^\\\\]\\)\\(%\\)"
|
||||
current-fname file-name t t 2)))
|
||||
(when alternate-fname
|
||||
(setq file-name
|
||||
;; # => file path for alternative frame
|
||||
(replace-regexp-in-string "\\(^\\|[^\\\\]\\)\\(#\\)"
|
||||
alternate-fname file-name t t 2)))
|
||||
(setq file-name
|
||||
(replace-regexp-in-string "\\\\\\([#%]\\)"
|
||||
"\\1" file-name t)))
|
||||
file-name))
|
||||
|
||||
;; (evil-ex-define-cmd "r[esize]" 'my:resize-window)
|
||||
|
||||
(progn ; ex-commands
|
||||
(evil-ex-define-cmd "full[scr]" 'toggle-frame-fullscreen)
|
||||
(evil-ex-define-cmd "present" 'toggle-theme)
|
||||
(evil-ex-define-cmd "k[ill]" 'kill-this-buffer) ; Kill current buffer
|
||||
(evil-ex-define-cmd "k[ill]o" 'cleanup-buffers) ; Kill current project buffers
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(evil-ex-define-cmd "echo" 'my:echo)
|
||||
(evil-define-command my:echo (&optional output)
|
||||
(interactive "<a>")
|
||||
(message "%s" output))
|
||||
|
||||
(evil-ex-define-cmd "k[ill]all" 'my:kill-buffers) ; Kill all buffers (bang = project buffers only)
|
||||
(evil-define-command my:kill-buffers (&optional bang)
|
||||
:repeat nil
|
||||
(interactive "<!>")
|
||||
(if (and bang (projectile-project-p))
|
||||
(projectile-kill-buffers)
|
||||
(mapc 'kill-buffer (buffer-list)))
|
||||
(delete-other-windows))
|
||||
|
||||
(evil-ex-define-cmd "ini" 'my:init-files)
|
||||
(evil-define-command my:init-files (&optional bang)
|
||||
:repeat nil
|
||||
(interactive "<!>")
|
||||
(if bang
|
||||
(ido-find-file-in-dir my-init-dir)
|
||||
(ido-find-file-in-dir my-dir)))
|
||||
|
||||
(evil-ex-define-cmd "n[otes]" 'my:notes)
|
||||
(evil-define-command my:notes ()
|
||||
:repeat nil
|
||||
(interactive)
|
||||
(ido-find-file-in-dir org-directory))
|
||||
|
||||
(evil-ex-define-cmd "recompile" 'my:byte-compile)
|
||||
(evil-define-command my:byte-compile (&optional bang)
|
||||
:repeat nil
|
||||
(interactive "<!>")
|
||||
(if bang
|
||||
(byte-recompile-directory (concat my-dir ".cask") 0 t)
|
||||
(byte-recompile-directory my-dir 0 t)))
|
||||
|
||||
(evil-ex-define-cmd "build" 'my:build)
|
||||
(evil-define-command my:build (arguments &optional bang)
|
||||
:repeat t
|
||||
(interactive "<a><!>")
|
||||
(my-build arguments))
|
||||
|
||||
(evil-ex-define-cmd "cd" 'my:cd)
|
||||
(evil-define-command my:cd (dir)
|
||||
:repeat nil
|
||||
(interactive "<f>")
|
||||
(cd (if (zerop (length dir)) "~" dir)))
|
||||
|
||||
(defun --save-exit() (save-buffer) (kill-buffer) (remove-hook 'yas-after-exit-snippet-hook '--save-exit))
|
||||
(evil-ex-define-cmd "en[ew]" 'my:create-file)
|
||||
(evil-define-command my:create-file (path &optional bang)
|
||||
"Deploy files (and their associated templates) quickly. Will prompt
|
||||
you to fill in each snippet field before buffer closes unless BANG is
|
||||
provided."
|
||||
:repeat nil
|
||||
(interactive "<f><!>")
|
||||
(let ((dir (f-dirname path))
|
||||
(fullpath (f-full path))
|
||||
(is-auto t))
|
||||
(when (and bang (not (f-exists? dir))) (f-mkdir dir))
|
||||
(if (f-exists? dir)
|
||||
(if (f-exists? fullpath)
|
||||
(error "File already exists: %s" path)
|
||||
(find-file fullpath)
|
||||
(add-hook 'yas-after-exit-snippet-hook '--save-exit)
|
||||
(if bang (--save-exit)))
|
||||
(error "Directory doesn't exist: %s" dir))))
|
||||
|
||||
(evil-ex-define-cmd "ren[ame]" 'my:rename-this-file) ; Rename file . Bang: Delete old one
|
||||
(evil-define-command my:rename-this-file (new-name &optional bang)
|
||||
"Renames current buffer and file it is visiting. Replaces %, # and other
|
||||
variables (see `evil-ex-replace-special-filenames')"
|
||||
:repeat nil
|
||||
(interactive "<f><!>")
|
||||
(let ((name (buffer-name))
|
||||
(filename (buffer-file-name)))
|
||||
(if (not (and filename (file-exists-p filename)))
|
||||
(error "Buffer '%s' is not visiting a file!" name)
|
||||
(let ((new-name
|
||||
(evil-ex-replace-special-filenames (if new-name
|
||||
new-name
|
||||
(read-file-name "New name: " filename)))))
|
||||
(if (get-buffer new-name)
|
||||
(error "A buffer named '%s' already exists!" new-name)
|
||||
(rename-file filename new-name 1)
|
||||
(rename-buffer new-name)
|
||||
(set-visited-file-name new-name)
|
||||
(set-buffer-modified-p nil)
|
||||
(save-place-forget-unreadable-files)
|
||||
(when bang
|
||||
(delete-file filename))
|
||||
(message "File '%s' successfully renamed to '%s'"
|
||||
name (file-name-nondirectory new-name)))))))
|
||||
|
||||
(evil-ex-define-cmd "x" 'my:scratch-buffer)
|
||||
(evil-define-operator my:scratch-buffer (beg end &optional bang)
|
||||
"Send a selection to the scratch buffer. If BANG, then send it to org-capture
|
||||
instead."
|
||||
:move-point nil
|
||||
:type inclusive
|
||||
(interactive "<r><!>")
|
||||
(let ((mode major-mode)
|
||||
(text (when (and (evil-visual-state-p) beg end)
|
||||
(buffer-substring beg end))))
|
||||
(if bang
|
||||
;; use org-capture with bang
|
||||
(if text
|
||||
(org-capture-string text)
|
||||
(org-capture))
|
||||
;; or scratch buffer by default
|
||||
(let ((project-dir (projectile-project-root))
|
||||
(buffer-name (if (projectile-project-p)
|
||||
(format "*scratch* (%s)" (projectile-project-name))
|
||||
"*scratch*")))
|
||||
(popwin:popup-buffer (get-buffer-create buffer-name))
|
||||
(when (eq (get-buffer buffer-name) (current-buffer))
|
||||
(cd project-dir)
|
||||
(if text (insert text))
|
||||
(funcall mode))))))
|
||||
|
||||
(evil-ex-define-cmd "al[ign]" 'my:align)
|
||||
(evil-define-command my:align (beg end &optional regexp bang)
|
||||
:repeat nil
|
||||
(interactive "<r><a><!>")
|
||||
(when regexp
|
||||
(align-regexp beg end
|
||||
(concat "\\(\\s-*\\)" (rxt-pcre-to-elisp regexp)) 1 1)))
|
||||
|
||||
(evil-ex-define-cmd "retab" 'my:retab)
|
||||
(evil-define-operator my:retab (beg end)
|
||||
"Akin to vim's :retab, this changes all tabs-to-spaces or spaces-to-tabs,
|
||||
depending on `indent-tab-mode'. Untested."
|
||||
:motion nil
|
||||
:move-point nil
|
||||
:type line
|
||||
(interactive "<r>")
|
||||
(unless (and beg end)
|
||||
(setq beg (point-min))
|
||||
(setq end (point-max)))
|
||||
(if indent-tabs-mode
|
||||
(tabify beg end)
|
||||
(untabify beg end)))
|
||||
|
||||
(evil-ex-define-cmd "run" 'my:run-code)
|
||||
(evil-define-operator my:run-code (beg end)
|
||||
:move-point nil
|
||||
(interactive "<r>")
|
||||
(cond ((and beg end)
|
||||
(my-run-code-region beg end))
|
||||
(t
|
||||
(my-run-code-buffer))))
|
||||
|
||||
(evil-ex-define-cmd "sq[uint]" 'my:narrow-indirect) ; Narrow buffer to selection
|
||||
(evil-define-operator my:narrow-indirect (beg end)
|
||||
"Indirectly narrow the region from BEG to END."
|
||||
:move-point nil
|
||||
:type exclusive
|
||||
:repeat nil
|
||||
(interactive "<r>")
|
||||
(evil-normal-state)
|
||||
(narrow-to-region-indirect beg end))
|
||||
|
||||
(evil-define-operator my:send-region-to-repl (beg end &optional bang)
|
||||
:motion nil
|
||||
:move-point nil
|
||||
:type exclusive
|
||||
:repeat nil
|
||||
(interactive "<r><!>")
|
||||
(cond ((and beg end)
|
||||
(my-send-region-to-repl beg end))
|
||||
(t
|
||||
(my-switch-to-repl)))))))
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
;; Mac-specific settings
|
||||
(provide 'core-osx)
|
||||
|
||||
;; Use a shared clipboard
|
||||
(setq x-select-enable-clipboard t)
|
||||
;; Curse Lion and its sudden but inevitable fullscreen mode!
|
||||
(setq ns-use-native-fullscreen nil)
|
||||
;; Don't open files from the workspace in a new frame
|
||||
(setq ns-pop-up-frames nil)
|
||||
|
||||
;; fix emacs PATH on OSX (GUI only)
|
||||
(use-package exec-path-from-shell
|
||||
:if (memq window-system '(mac ns))
|
||||
:init (exec-path-from-shell-initialize))
|
||||
|
||||
(after "evil"
|
||||
;; On OSX, stop copying each visual state move to the clipboard:
|
||||
;; https://bitbucket.org/lyro/evil/issue/336/osx-visual-state-copies-the-region-on
|
||||
;; Most of this code grokked from:
|
||||
;; http://stackoverflow.com/questions/15873346/elisp-rename-macro
|
||||
(defadvice evil-visual-update-x-selection (around clobber-x-select-text activate)
|
||||
(unless (featurep 'ns) ad-do-it)))
|
||||
|
||||
;; Send current file to OSX apps
|
||||
(defun my--open-file-with (path &optional appName)
|
||||
(if (and appName
|
||||
(stringp appName)
|
||||
(not (string= "" appName)))
|
||||
(setq appName (concat "-a " appName ".app")))
|
||||
(shell-command (concat "open " appName " " (shell-quote-argument path))))
|
||||
|
||||
(defun my-open-with (appName)
|
||||
(interactive "sApp name: ")
|
||||
(my--open-file-with buffer-file-name appName))
|
||||
|
||||
(defun my-send-to-transmit ()
|
||||
(interactive) (my-open-with "Transmit"))
|
||||
|
||||
(defun my-send-to-launchbar ()
|
||||
(interactive) (my-open-with "LaunchBar"))
|
||||
|
||||
(defun my-send-dir-to-launchbar ()
|
||||
(interactive) (my--open-file-with default-directory "LaunchBar"))
|
||||
|
||||
(defun my-send-dir-to-finder ()
|
||||
(interactive) (my--open-file-with default-directory "Finder"))
|
||||
126
init/core-ui.el
126
init/core-ui.el
|
|
@ -1,126 +0,0 @@
|
|||
;; User interface layout & behavior
|
||||
(provide 'core-ui)
|
||||
|
||||
;;;; Load Theme ;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
(when window-system
|
||||
;; No transparency!
|
||||
(set-frame-parameter nil 'alpha 96)
|
||||
|
||||
(unless (member *default-font (font-family-list))
|
||||
(error "Font %s isn't installed" *default-font))
|
||||
|
||||
(let ((font-str (concat *default-font "-" (number-to-string *default-font-size))))
|
||||
(add-to-list 'default-frame-alist `(font . ,font-str))
|
||||
(add-to-list 'initial-frame-alist `(font . ,font-str))))
|
||||
|
||||
(add-to-list 'custom-theme-load-path my-themes-dir)
|
||||
(load-dark-theme)
|
||||
|
||||
|
||||
;;;; GUI Settings ;;;;;;;;;;;;;;;;;;;;;;
|
||||
(tooltip-mode -1)
|
||||
(blink-cursor-mode 1) ; blink cursor
|
||||
;; (global-hl-line-mode 1) ; highlight line
|
||||
|
||||
;; Multiple cursors across buffers cause a strange redraw delay for
|
||||
;; some things, like auto-complete or evil-mode's cursor color
|
||||
;; switching.
|
||||
(setq-default cursor-in-non-selected-windows nil)
|
||||
|
||||
(setq-default visible-bell nil) ; silence of the bells
|
||||
(setq-default use-dialog-box nil) ; avoid GUI
|
||||
(setq-default redisplay-dont-pause t)
|
||||
|
||||
;; do not soft-wrap lines
|
||||
(setq-default truncate-lines t)
|
||||
(setq-default truncate-partial-width-windows nil)
|
||||
(setq-default indicate-buffer-boundaries nil)
|
||||
(setq-default indicate-empty-lines nil)
|
||||
|
||||
(when (functionp 'scroll-bar-mode) (scroll-bar-mode -1)) ; no scrollbar
|
||||
(when (functionp 'tool-bar-mode) (tool-bar-mode -1)) ; no toolbar
|
||||
(when (functionp 'menu-bar-mode) (menu-bar-mode -1)) ; no menubar
|
||||
(when (fboundp 'fringe-mode) (fringe-mode '(5 . 10))) ; no nonsense
|
||||
|
||||
(when window-system
|
||||
(setq frame-title-format '(buffer-file-name "%f" ("%b")))
|
||||
(tooltip-mode -1)
|
||||
(blink-cursor-mode 1))
|
||||
|
||||
;; Show full path in window title
|
||||
(setq frame-title-format
|
||||
'(:eval (if (buffer-file-name) (abbreviate-file-name (buffer-file-name)) "%b")))
|
||||
|
||||
|
||||
;;;; Modeline ;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
(use-package uniquify
|
||||
:config (setq uniquify-buffer-name-style 'post-forward
|
||||
uniquify-separator ":"
|
||||
uniquify-ignore-buffers-re "^\\*"))
|
||||
|
||||
(use-package smart-mode-line
|
||||
:config
|
||||
(setq rm-blacklist
|
||||
(mapconcat 'identity
|
||||
'(" SP"
|
||||
" Fill"
|
||||
" yas"
|
||||
" Fly"
|
||||
" EvilOrg"
|
||||
" Abbrev"
|
||||
" WS"
|
||||
" GitGutter"
|
||||
" Undo-Tree"
|
||||
" Projectile\\[.+\\]"
|
||||
" hs"
|
||||
" ElDoc"
|
||||
) "\\|"))
|
||||
:init
|
||||
(progn
|
||||
(setq sml/no-confirm-load-theme t
|
||||
sml/mode-width 'full
|
||||
sml/extra-filler (if window-system 1 0)
|
||||
sml/show-remote nil
|
||||
sml/modified-char "*"
|
||||
sml/encoding-format nil)
|
||||
|
||||
(setq sml/replacer-regexp-list '(("^~/Dropbox/Projects/" "PROJECTS:")
|
||||
("^~/.emacs.d/" "EMACS.D:")))
|
||||
|
||||
(after "evil" (setq evil-mode-line-format nil))
|
||||
|
||||
(setq-default mode-line-misc-info
|
||||
'((which-func-mode ("" which-func-format ""))
|
||||
(global-mode-string ("" global-mode-string ""))))
|
||||
|
||||
(add-hook! 'after-change-major-mode-hook
|
||||
(setq mode-line-format
|
||||
'((if window-system " ")
|
||||
"%e"
|
||||
mode-line-mule-info
|
||||
mode-line-client
|
||||
mode-line-remote
|
||||
mode-line-frame-identification
|
||||
mode-line-buffer-identification
|
||||
mode-line-modified
|
||||
mode-line-modes
|
||||
mode-line-misc-info
|
||||
(vc-mode vc-mode)
|
||||
" "
|
||||
mode-line-position
|
||||
" "
|
||||
mode-line-front-space
|
||||
))
|
||||
|
||||
(add-to-list 'mode-line-modes
|
||||
'(sml/buffer-identification-filling
|
||||
sml/buffer-identification-filling
|
||||
(:eval (setq sml/buffer-identification-filling
|
||||
(sml/fill-for-buffer-identification))))))
|
||||
|
||||
(let ((-linepo mode-line-position))
|
||||
(sml/setup)
|
||||
(sml/apply-theme 'respectful)
|
||||
|
||||
(setq mode-line-position -linepo)
|
||||
(sml/filter-mode-line-list 'mode-line-position))))
|
||||
281
init/core.el
281
init/core.el
|
|
@ -1,281 +0,0 @@
|
|||
(provide 'core)
|
||||
|
||||
(cd "~") ; instead of /
|
||||
|
||||
(require 'cask)
|
||||
(cask-initialize)
|
||||
|
||||
(defconst is-mac (eq system-type 'darwin))
|
||||
(defconst is-linux (eq system-type 'gnu/linux))
|
||||
|
||||
;; Make sure undo/backup folders exist
|
||||
(defconst my-tmp-dir-undo (expand-file-name "undo" my-tmp-dir))
|
||||
(defconst my-tmp-dir-backup (expand-file-name "backup" my-tmp-dir))
|
||||
(defconst my-tmp-dir-autosave (expand-file-name "autosave" my-tmp-dir))
|
||||
(unless (file-directory-p my-tmp-dir)
|
||||
(make-directory my-tmp-dir-undo t)
|
||||
(make-directory my-tmp-dir-backup t)
|
||||
(make-directory my-tmp-dir-autosave t))
|
||||
|
||||
(setq load-prefer-newer t)
|
||||
(setq debug-on-quit *debug-mode)
|
||||
|
||||
(require 'shut-up)
|
||||
(setq shut-up-ignore *debug-mode)
|
||||
(when noninteractive (shut-up-silence-emacs)) ; http://youtu.be/Z6woIRLnbmE
|
||||
|
||||
(shut-up
|
||||
;;;; Sane defaults ;;;;;;;;;;;;;;;;;;;;;;;
|
||||
(line-number-mode 1) ; hide line no in modeline
|
||||
(column-number-mode 1) ; hide col no in modeline
|
||||
(auto-compression-mode t) ; Transparently open compressed files
|
||||
(global-font-lock-mode t) ; Enable syntax highlighting for older emacs
|
||||
(global-auto-revert-mode 1) ; revert buffers for changed files
|
||||
(electric-indent-mode -1) ; In case of emacs 24.4
|
||||
|
||||
;;; window layout undo/redo
|
||||
(winner-mode 1)
|
||||
(setq winner-boring-buffers '("*Completions*" "*Help*"))
|
||||
|
||||
;;; UTF-8 please
|
||||
(setq locale-coding-system 'utf-8) ; pretty
|
||||
(set-terminal-coding-system 'utf-8) ; pretty
|
||||
(set-keyboard-coding-system 'utf-8) ; pretty
|
||||
(set-selection-coding-system 'utf-8) ; please
|
||||
(prefer-coding-system 'utf-8) ; with sugar on top
|
||||
|
||||
(fset 'yes-or-no-p 'y-or-n-p) ; y/n instead of yes/no
|
||||
|
||||
;;; Show tab characters
|
||||
;; (global-whitespace-mode 1)
|
||||
(setq whitespace-style '(face tabs tab-mark) ; needs to be re-set in every buffer
|
||||
whitespace-display-mappings
|
||||
'((tab-mark ?\t [?| ?\t] [?\\ ?\t])
|
||||
(newline-mark 10 [36 10]))) ; for whitespace-newline-mode
|
||||
|
||||
;; avoid garbage collection (default is 400k)
|
||||
(setq-default gc-cons-threshold 20000000)
|
||||
(setq-default confirm-kill-emacs nil)
|
||||
|
||||
(setq-default fill-column 80)
|
||||
|
||||
;; minibufferception? Nay!
|
||||
(setq-default enable-recursive-minibuffers nil)
|
||||
|
||||
;; Sane scroll settings
|
||||
(setq scroll-margin 5)
|
||||
(setq scroll-conservatively 9999)
|
||||
(setq scroll-preserve-screen-position 1)
|
||||
|
||||
;; Show me those keystrokes
|
||||
(setq echo-keystrokes 0.02)
|
||||
|
||||
;; I'll use visual mode, kthxbai
|
||||
(setq shift-select-mode nil)
|
||||
|
||||
(setq ring-bell-function 'ignore)
|
||||
|
||||
(setq inhibit-startup-screen t) ; don't show EMACs start screen
|
||||
(setq inhibit-splash-screen t)
|
||||
(setq inhibit-startup-buffer-menu t)
|
||||
|
||||
(setq initial-major-mode 'text-mode) ; initial scratch buffer mode
|
||||
(setq initial-scratch-message nil)
|
||||
(setq initial-scratch-buffer nil) ; empty scratch buffer
|
||||
|
||||
(setq compilation-always-kill t)
|
||||
(setq compilation-ask-about-save nil)
|
||||
(setq compilation-scroll-output t)
|
||||
|
||||
(setq sentence-end-double-space nil) ; sentences end with periods. Period.
|
||||
|
||||
(setq eval-expression-print-level nil)
|
||||
|
||||
(setq show-paren-delay 0)
|
||||
|
||||
(setq ediff-diff-options "-w")
|
||||
(setq ediff-split-window-function 'split-window-horizontally) ; side-by-side diffs
|
||||
(setq ediff-window-setup-function 'ediff-setup-windows-plain) ; no extra frames
|
||||
|
||||
;; Fixes C-i's synonymity with TAB
|
||||
(keyboard-translate ?\C-i ?\H-i)
|
||||
|
||||
;;;; Backup ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; Disable all backups (that's what git/dropbox are for)
|
||||
(setq bookmark-save-flag t)
|
||||
(setq bookmark-default-file (expand-file-name "bookmarks" my-tmp-dir))
|
||||
(setq auto-save-default nil)
|
||||
(setq auto-save-list-file-name (expand-file-name ".auto-save" my-tmp-dir-autosave))
|
||||
(setq auto-save-file-name-transforms `((".*" ,my-tmp-dir-autosave t)))
|
||||
;; In case I want to reactivate backup files
|
||||
(setq make-backup-files nil)
|
||||
(setq create-lockfiles nil)
|
||||
(setq backup-directory-alist `((".*" . ,my-tmp-dir-backup)))
|
||||
;; Remember undo history
|
||||
(setq-default undo-tree-auto-save-history t)
|
||||
(setq-default undo-tree-history-directory-alist `(("." . ,my-tmp-dir-undo)))
|
||||
;;;; Save history across sessions
|
||||
(setq savehist-additional-variables '(search ring regexp-search-ring))
|
||||
(setq savehist-file (f-expand "savehist" my-tmp-dir)) ; keep the home clean
|
||||
(savehist-mode 1)
|
||||
|
||||
;; Save cursor location across sessions
|
||||
(require 'saveplace)
|
||||
(setq save-place-file (f-expand "saveplace" my-tmp-dir))
|
||||
(add-hook 'find-file-hook ; activate save-place for files that exist
|
||||
(lambda()
|
||||
(if (file-exists-p buffer-file-name)
|
||||
(setq save-place t))))
|
||||
|
||||
(require 'recentf)
|
||||
(setq recentf-max-menu-items 0)
|
||||
(setq recentf-max-saved-items 1000)
|
||||
(setq recentf-auto-cleanup 'never)
|
||||
(setq recentf-save-file (concat my-tmp-dir "recentf"))
|
||||
(setq recentf-exclude '("/tmp/" "/ssh:" "\\.?ido\\.last\\'" "\\.revive\\'", "/TAGS\\'"))
|
||||
(recentf-mode 1)
|
||||
|
||||
;; What we do every night, Pinkie...
|
||||
(defun display-startup-echo-area-message ()
|
||||
(message "What're we gonna do tonight, Brain? (Loaded in %s)" (emacs-init-time)))
|
||||
|
||||
|
||||
;;;; Editor behavior ;;;;;;;;;;;;;;;;
|
||||
;; spaces instead of tabs
|
||||
(setq-default indent-tabs-mode nil) ; spaces instead of tabs
|
||||
(setq-default tab-always-indent nil)
|
||||
(setq-default tab-width 4)
|
||||
|
||||
(setq delete-trailing-lines nil)
|
||||
(add-hook 'before-save-hook 'delete-trailing-whitespace)
|
||||
(add-hook 'makefile-mode-hook 'indent-tabs-mode) ; Use normal tabs in makefiles
|
||||
;; Make sure scratch buffer is always "in a project"
|
||||
(add-hook 'find-file-hook
|
||||
(lambda()
|
||||
(let ((buffer (get-buffer "*scratch*"))
|
||||
(pwd (my--project-root)))
|
||||
(when (buffer-live-p buffer)
|
||||
(save-window-excursion
|
||||
(switch-to-buffer buffer)
|
||||
(unless (eq (my--project-root) pwd)
|
||||
(cd pwd)
|
||||
(rename-buffer (format "*scratch* (%s)" (file-name-base (directory-file-name pwd))))))))))
|
||||
|
||||
;; My own minor mode!
|
||||
(define-minor-mode my-mode :global t :keymap (make-sparse-keymap))
|
||||
|
||||
|
||||
;;;; Behavior adjustments ;;;;;;;;;;;;;;;;
|
||||
;; Skip special buffers on next/previous-buffer or kill-this-buffer
|
||||
(defadvice next-buffer (after void-messages-buffer-in-next-buffer activate)
|
||||
(let ((buffer-name (buffer-name)))
|
||||
(when (and (string-match-p "\\`\\(\\*.+\\*\\|TAGS\\)$" buffer-name)
|
||||
(not (string-match-p "\\`\\*scratch*" buffer-name)))
|
||||
(next-buffer))))
|
||||
(defadvice previous-buffer (after avoid-messages-buffer-in-previous-buffer activate)
|
||||
(let ((buffer-name (buffer-name)))
|
||||
(when (and (string-match-p "\\`\\(\\*.+\\*\\|TAGS\\)$" buffer-name)
|
||||
(not (string-match-p "\\`\\*scratch*" buffer-name)))
|
||||
(previous-buffer))))
|
||||
(defadvice kill-this-buffer (after kill-this-buffer-no-switch-to-special-buffers activate)
|
||||
(let ((buffer-name (buffer-name)))
|
||||
(if (and (string-match-p "^\\*.+\\*" buffer-name)
|
||||
(not (string-match-p "^\\*scratch\\*" buffer-name)))
|
||||
(previous-buffer))))
|
||||
;; Don't kill the scratch buffer, just empty and bury it
|
||||
(defadvice kill-this-buffer (around kill-this-buffer-or-empty-scratch activate)
|
||||
(if (string-match-p "^\\*scratch\\*" (buffer-name))
|
||||
(bury-buffer)
|
||||
ad-do-it))
|
||||
|
||||
|
||||
;;;; Automatic minor modes ;;;;;;;;;;;;;;;
|
||||
(defvar auto-minor-mode-alist ()
|
||||
"Alist of filename patterns vs correpsonding minor mode functions,
|
||||
see `auto-mode-alist' All elements of this alist are checked, meaning
|
||||
you can enable multiple minor modes for the same regexp.")
|
||||
(defun enable-minor-mode-based-on-extension ()
|
||||
"check file name against auto-minor-mode-alist to enable minor modes
|
||||
the checking happens for all pairs in auto-minor-mode-alist"
|
||||
(when buffer-file-name
|
||||
(let ((name buffer-file-name)
|
||||
(remote-id (file-remote-p buffer-file-name))
|
||||
(alist auto-minor-mode-alist))
|
||||
;; Remove backup-suffixes from file name.
|
||||
(setq name (file-name-sans-versions name))
|
||||
;; Remove remote file name identification.
|
||||
(when (and (stringp remote-id)
|
||||
(string-match-p (regexp-quote remote-id) name))
|
||||
(setq name (substring name (match-end 0))))
|
||||
(while (and alist (caar alist) (cdar alist))
|
||||
(if (string-match (caar alist) name)
|
||||
(funcall (cdar alist) 1))
|
||||
(setq alist (cdr alist))))))
|
||||
(add-hook 'find-file-hook 'enable-minor-mode-based-on-extension)
|
||||
|
||||
|
||||
;;;; Utility plugins ;;;;;;;;;;;;;;;;;;
|
||||
(require 'defuns) ; all the defuns
|
||||
(require 'use-package) ; Package management bootstrap
|
||||
(setq use-package-verbose *debug-mode)
|
||||
|
||||
;; Generate autoloads if necessary
|
||||
(defun my-update-autoloads (&optional forcep)
|
||||
(interactive)
|
||||
(setq generated-autoload-file (concat my-init-dir "autoload.el"))
|
||||
(when (or forcep (not (file-exists-p generated-autoload-file)))
|
||||
(if forcep (delete-file generated-autoload-file))
|
||||
(update-directory-autoloads my-init-dir my-elisp-dir))
|
||||
(require 'autoload))
|
||||
|
||||
(my-update-autoloads)
|
||||
|
||||
;; Add elisp dirs to load-path
|
||||
(let ((default-directory my-elisp-dir))
|
||||
(normal-top-level-add-to-load-path '("."))
|
||||
(normal-top-level-add-subdirs-to-load-path))
|
||||
|
||||
(use-package smex
|
||||
:commands (smex smex-major-mode-commands)
|
||||
:config
|
||||
(progn
|
||||
(smex-initialize)
|
||||
;; Hook up smex to auto-update, rather than update on every run
|
||||
(defun smex-update-after-load (unused)
|
||||
(when (boundp 'smex-cache) (smex-update)))
|
||||
(add-hook 'after-load-functions 'smex-update-after-load)))
|
||||
|
||||
(use-package popwin
|
||||
:init (popwin-mode 1)
|
||||
:config
|
||||
(progn ; popwin config
|
||||
(setq popwin:popup-window-height 0.45)
|
||||
|
||||
(push '(diff-mode :position bottom :stick t) popwin:special-display-config)
|
||||
(push '("*Backtrace*") popwin:special-display-config)
|
||||
(push '("*Warnings*") popwin:special-display-config)
|
||||
(push '("*Process List*") popwin:special-display-config)
|
||||
(push '("*Compile-Log*" :height 0.3 :position bottom :noselect t) popwin:special-display-config)
|
||||
(push '(" *undo-tree*" :width 0.3 :position right) popwin:special-display-config)
|
||||
(push '("^\\*scratch\\*.*" :regexp t :stick t) popwin:special-display-config)
|
||||
|
||||
(after "evil"
|
||||
(evil-ex-define-cmd "l[ast]" 'popwin:popup-last-buffer)
|
||||
(evil-ex-define-cmd "m[sg]" 'popwin:messages))
|
||||
|
||||
(defun popwin:toggle-popup-window ()
|
||||
(interactive)
|
||||
(if (popwin:popup-window-live-p)
|
||||
(popwin:close-popup-window)
|
||||
(popwin:popup-last-buffer)))))
|
||||
|
||||
|
||||
;;;; Start the party ;;;;;;;;;;;;;;;;;;;
|
||||
(if is-mac (require 'core-osx))
|
||||
(require 'core-ui)
|
||||
(require 'core-evil)
|
||||
(require 'core-editor)
|
||||
|
||||
(require 'server)
|
||||
(unless (server-running-p)
|
||||
(server-start)))
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
;; Inspired by http://demonastery.org/2013/04/emacs-evil-narrow-region/
|
||||
;;;###autoload
|
||||
(defun my-narrow-to-region-indirect (start end)
|
||||
"Restrict editing in this buffer to the current region, indirectly."
|
||||
(interactive "r")
|
||||
(deactivate-mark)
|
||||
(let ((buf (clone-indirect-buffer nil nil)))
|
||||
(with-current-buffer buf
|
||||
(narrow-to-region start end))
|
||||
(switch-to-buffer buf)))
|
||||
|
||||
|
||||
;; Killing Buffers ;;;;;;;;;;;;;;;;;;;;;
|
||||
;; Buffer defuns
|
||||
(defvar my-cleanup-buffers-alist '("^ \\*"
|
||||
"^\\*Backtrace\\*$"
|
||||
"^\\*Warnings\\*$"
|
||||
"^\\*Compile-Log\\*$"
|
||||
"^\\*Ediff.*\\*$"
|
||||
help-mode
|
||||
dired-mode
|
||||
reb-mode)
|
||||
"A list of buffer name regexps or major-mode symbols. If buried buffers
|
||||
match/have that mode active, `cleanup-buffers' will kill them.")
|
||||
|
||||
;;;###autoload
|
||||
(defun my--cleanup-buffers-add (regexp)
|
||||
(add-to-list 'my-cleanup-buffers-alist regexp))
|
||||
|
||||
;;;###autoload
|
||||
(defun my-cleanup-buffers ()
|
||||
"Kill left-over temporary, dired or buried special buffers"
|
||||
(interactive)
|
||||
(let* ((this-frame (selected-frame))
|
||||
(kill-list (buffer-list this-frame)))
|
||||
(setq kill-list
|
||||
(-filter (lambda (b)
|
||||
(unless (get-buffer-window b) ; don't kill if visible
|
||||
(-any? (lambda (pred)
|
||||
(cond ((stringp pred)
|
||||
(s-matches? pred (buffer-name b)))
|
||||
((symbolp pred)
|
||||
(eq (buffer-local-value 'major-mode b) pred))))
|
||||
my-cleanup-buffers-alist)))
|
||||
kill-list))
|
||||
|
||||
(message "Cleaned up %s buffers" (length kill-list))
|
||||
(mapc 'kill-buffer kill-list)))
|
||||
|
||||
;;;###autoload
|
||||
(defun my-kill-matching-buffers (regexp &optional buffer-list)
|
||||
(interactive)
|
||||
(mapc (lambda (b)
|
||||
(if (s-matches? regexp (buffer-name b))
|
||||
(kill-buffer b)))
|
||||
(if buffer-list buffer-list (buffer-list))))
|
||||
|
|
@ -1,123 +0,0 @@
|
|||
;;;###autoload
|
||||
(defun my--point-at-bol-non-blank()
|
||||
(save-excursion (evil-first-non-blank) (point)))
|
||||
|
||||
;;;###autoload
|
||||
(defun my--surrounded-p ()
|
||||
(and (looking-back "[[{(]\\(\s+\\|\n\\)?\\(\s\\|\t\\)*")
|
||||
(let* ((whitespace (match-string 1))
|
||||
(match-str (concat whitespace (match-string 2) "[])}]")))
|
||||
(looking-at-p match-str))))
|
||||
|
||||
;;;###autoload
|
||||
(defun my.backward-kill-to-bol-and-indent ()
|
||||
"Kill line to the first non-blank character. If invoked again
|
||||
afterwards, kill line to column 1."
|
||||
(interactive)
|
||||
(let ((empty-line (sp-point-in-blank-line)))
|
||||
(evil-delete (point-at-bol) (point))
|
||||
(if (not empty-line)
|
||||
(indent-according-to-mode))))
|
||||
|
||||
;;;###autoload
|
||||
(defun my.move-to-bol ()
|
||||
"Moves cursor to the first non-blank character on the line. If
|
||||
already there, move it to the true bol."
|
||||
(interactive)
|
||||
(evil-save-goal-column
|
||||
(let ((point-at-bol (my--point-at-bol-non-blank))
|
||||
(point (point)))
|
||||
(if (= point-at-bol point)
|
||||
(evil-move-beginning-of-line)
|
||||
(unless (= (point-at-bol) point)
|
||||
(evil-first-non-blank))))))
|
||||
|
||||
;;;###autoload
|
||||
(defun my.move-to-eol ()
|
||||
(interactive)
|
||||
(evil-save-goal-column
|
||||
(let ((old-point (point)))
|
||||
(when (comment-search-forward (point-at-eol) t)
|
||||
(goto-char (match-beginning 0))
|
||||
(skip-syntax-backward " ^<*" (my--point-at-bol-non-blank))
|
||||
|
||||
(if (eq old-point (point)) ;
|
||||
(evil-move-end-of-line))))))
|
||||
|
||||
;; Mimic expandtab in vim
|
||||
;;;###autoload
|
||||
(defun my.backward-delete-whitespace-to-column ()
|
||||
"Delete back to the previous column of whitespace, or as much
|
||||
whitespace as possible, or just one char if that's not possible."
|
||||
(interactive)
|
||||
(cond ;; If in a string
|
||||
((sp-point-in-string)
|
||||
(call-interactively 'backward-delete-char-untabify))
|
||||
;; If using tabs (or at bol), just delete normally
|
||||
((or indent-tabs-mode
|
||||
(= (point-at-bol) (point)))
|
||||
(call-interactively 'backward-delete-char))
|
||||
;; Otherwise, delete up to the nearest tab column
|
||||
(t (let ((movement (% (current-column) tab-width))
|
||||
(p (point)))
|
||||
(when (= movement 0)
|
||||
(setq movement tab-width))
|
||||
(save-match-data
|
||||
(if (string-match "\\w*\\(\\s-+\\)$"
|
||||
(buffer-substring-no-properties (- p movement) p))
|
||||
(backward-delete-char (- (match-end 1) (match-beginning 1)))
|
||||
(call-interactively 'backward-delete-char-untabify)))))))
|
||||
|
||||
;;;###autoload
|
||||
(defun my.dumb-indent ()
|
||||
"Inserts a tab character (or spaces x tab-width). Checks if the
|
||||
auto-complete window is open."
|
||||
(interactive)
|
||||
(if indent-tabs-mode
|
||||
(insert "\t")
|
||||
(let* ((movement (% (current-column) tab-width))
|
||||
(spaces (if (zerop movement) tab-width (- tab-width movement))))
|
||||
(insert (s-repeat spaces " ")))))
|
||||
|
||||
;;;###autoload
|
||||
(defun my.inflate-space-maybe ()
|
||||
"Checks if point is surrounded by {} [] () delimiters and adds a
|
||||
space on either side of the point if so."
|
||||
(interactive)
|
||||
(if (my--surrounded-p)
|
||||
(progn (call-interactively 'self-insert-command)
|
||||
(save-excursion (call-interactively 'self-insert-command)))
|
||||
(call-interactively 'self-insert-command)))
|
||||
|
||||
;;;###autoload
|
||||
(defun my.deflate-space-maybe ()
|
||||
"Checks if point is surrounded by {} [] () delimiters, and deletes
|
||||
spaces on either side of the point if so. Resorts to
|
||||
`my.backward-delete-whitespace-to-column' otherwise."
|
||||
(interactive)
|
||||
(save-match-data
|
||||
(if (my--surrounded-p)
|
||||
(let ((whitespace-match (match-string 1)))
|
||||
(cond ((not whitespace-match)
|
||||
(call-interactively 'delete-backward-char))
|
||||
((string-match "\n" whitespace-match)
|
||||
(evil-delete (point-at-bol) (point))
|
||||
(delete-char -1)
|
||||
(save-excursion (delete-char 1)))
|
||||
(t
|
||||
(just-one-space 0))))
|
||||
(my.backward-delete-whitespace-to-column))))
|
||||
|
||||
;;;###autoload
|
||||
(defun my.newline-and-indent ()
|
||||
"Newline and indent; if in a comment, auto-comment and properly
|
||||
indent the next line."
|
||||
(interactive)
|
||||
(cond ((sp-point-in-string)
|
||||
(evil-ret))
|
||||
((evil-in-comment-p)
|
||||
(if (eq major-mode 'js2-mode)
|
||||
(js2-line-break)
|
||||
(call-interactively 'indent-new-comment-line)))
|
||||
(t
|
||||
(evil-ret-and-indent))))
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
(eval-when-compile (require 'cl))
|
||||
|
||||
(defvar my/dark-theme-p t)
|
||||
(defvar my/presentation-mode-p nil)
|
||||
|
||||
;;;###autoload
|
||||
(defun load-dark-theme()
|
||||
(interactive)
|
||||
;; (sml/apply-theme 'respectful)
|
||||
(load-theme *dark-theme t))
|
||||
|
||||
;;;###autoload
|
||||
(defun load-light-theme()
|
||||
(interactive)
|
||||
;; (sml/apply-theme 'light)
|
||||
(load-theme *light-theme t))
|
||||
|
||||
;;;###autoload
|
||||
(defun load-font (font size)
|
||||
(interactive)
|
||||
(when window-system
|
||||
(let ((font-str (concat font "-" (number-to-string size))))
|
||||
(if (member font (font-family-list))
|
||||
(set-frame-font font-str t t)
|
||||
(error "Font %s not installed" font)))))
|
||||
|
||||
;;;###autoload
|
||||
(defun toggle-transparency ()
|
||||
(interactive)
|
||||
(if (/= (frame-parameter nil 'alpha) 96)
|
||||
(set-frame-parameter nil 'alpha 96)
|
||||
(set-frame-parameter nil 'alpha 0)))
|
||||
|
||||
;;;###autoload
|
||||
(defun toggle-theme ()
|
||||
(interactive)
|
||||
(if my/dark-theme-p
|
||||
(load-light-theme)
|
||||
(load-dark-theme)))
|
||||
|
||||
;;;###autoload
|
||||
(defun toggle-presentation-mode ()
|
||||
(interactive)
|
||||
(if my/presentation-mode-p
|
||||
(load-font *default-font *default-font-size)
|
||||
(load-font *presentation-font *presentation-font-size))
|
||||
(setq my/presentation-mode-p (not my/presentation-mode-p)))
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
|
||||
;; String Defuns ;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;;;###autoload
|
||||
(after "s"
|
||||
(defun s-count-lines (s)
|
||||
"Get number of lines in a string"
|
||||
(length (s-lines s))))
|
||||
|
||||
;; File Defuns ;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;;;###autoload
|
||||
(after "f"
|
||||
(defmacro f--exists? (file dir)
|
||||
`(f-exists? (expand-file-name ,file ,dir))))
|
||||
|
||||
;;;###autoload
|
||||
(after "projectile"
|
||||
(defun my--project-root (&optional force-pwd)
|
||||
(if (and (not force-pwd)
|
||||
(projectile-project-p))
|
||||
(projectile-project-root)
|
||||
default-directory)))
|
||||
|
||||
;; Misc Defuns ;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;;;###autoload
|
||||
(defun what-face (pos)
|
||||
"Tells you the name of the face (point) is on."
|
||||
(interactive "d")
|
||||
(let ((face (or (get-char-property (point) 'read-face-name)
|
||||
(get-char-property (point) 'face))))
|
||||
(if face (message "Face: %s" face) (message "No face at %d" pos))))
|
||||
|
||||
;;;###autoload
|
||||
(defun what-col ()
|
||||
(interactive)
|
||||
(message "Column %d" (current-column)))
|
||||
|
||||
;;;###autoload
|
||||
(defun what-bindings (key)
|
||||
(list
|
||||
(minor-mode-key-binding key)
|
||||
(local-key-binding key)
|
||||
(global-key-binding key)))
|
||||
110
init/defuns.el
110
init/defuns.el
|
|
@ -1,110 +0,0 @@
|
|||
(provide 'defuns)
|
||||
|
||||
;; Convenience ;;;;;;;;;;;;;;;;;;;;;
|
||||
(defun associate-mode (match mode)
|
||||
(add-to-list 'auto-mode-alist (cons match mode)))
|
||||
|
||||
(defun associate-minor-mode (match mode)
|
||||
(add-to-list 'auto-minor-mode-alist (cons match mode)))
|
||||
|
||||
(defmacro λ (&rest body)
|
||||
`(lambda () (interactive) ,@body))
|
||||
|
||||
(defmacro add-hook! (hook &rest body)
|
||||
`(add-hook ,hook (lambda() ,@body)))
|
||||
|
||||
;; Backwards compatibility
|
||||
(unless (fboundp 'with-eval-after-load)
|
||||
(defmacro with-eval-after-load (file &rest body)
|
||||
`(eval-after-load ,file
|
||||
`(funcall (function ,(lambda () ,@body))))))
|
||||
|
||||
(defmacro after (feature &rest forms)
|
||||
`(,(if (or (not (boundp 'byte-compile-current-file))
|
||||
(not byte-compile-current-file)
|
||||
(if (symbolp feature)
|
||||
(require feature nil :no-error)
|
||||
(load feature :no-message :no-error)))
|
||||
'progn
|
||||
(message "after: cannot find %s" feature)
|
||||
'with-no-warnings)
|
||||
(with-eval-after-load ',feature ,@forms)))
|
||||
|
||||
|
||||
;; Keybindings ;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
(defun bind (state &rest keys)
|
||||
(let ((state-list state)
|
||||
(is-global (or (stringp state)
|
||||
(vectorp state)))
|
||||
keymap)
|
||||
(if is-global
|
||||
(setq keys (-insert-at 0 state keys))
|
||||
(progn
|
||||
(if (keymapp (car keys))
|
||||
(setq keymap (pop keys)))
|
||||
(if (or (keymapp state)
|
||||
(not (listp state)))
|
||||
(setq state-list (list state)))))
|
||||
(while keys
|
||||
(let ((-key (pop keys))
|
||||
(-def (pop keys)))
|
||||
(if (stringp -key)
|
||||
(setq -key (kbd -key)))
|
||||
(if is-global
|
||||
(global-set-key -key -def)
|
||||
(dolist (-state state-list)
|
||||
(cond ((evil-state-p -state)
|
||||
(define-key
|
||||
(if keymap
|
||||
(evil-get-auxiliary-keymap keymap -state t)
|
||||
(evil-state-property -state :keymap t)) -key -def))
|
||||
((keymapp -state)
|
||||
(define-key -state -key -def)))))))))
|
||||
|
||||
(after "evil"
|
||||
(evil-define-command my--maybe-exit-insert-mode ()
|
||||
"Exits insert mode using jk without the momentary pause caused by
|
||||
key-chord-define."
|
||||
:repeat change
|
||||
(interactive)
|
||||
(let ((modified (buffer-modified-p)))
|
||||
(insert "j")
|
||||
(let ((evt (read-event nil nil 0.4)))
|
||||
(cond
|
||||
((null evt) (message ""))
|
||||
((and (integerp evt) (char-equal evt ?k))
|
||||
(delete-char -1)
|
||||
(set-buffer-modified-p modified)
|
||||
(push 'escape unread-command-events))
|
||||
(t (setq unread-command-events (append unread-command-events (list evt)))))))))
|
||||
|
||||
;; Hooks ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
(defun enable-comment-hard-wrap ()
|
||||
(set (make-local-variable 'comment-auto-fill-only-comments) t)
|
||||
(turn-on-auto-fill))
|
||||
|
||||
(defun enable-tab-width-2 ()
|
||||
(setq tab-width 2 evil-shift-width 2))
|
||||
|
||||
(defun disable-final-newline ()
|
||||
(set (make-local-variable 'require-final-newline) nil))
|
||||
|
||||
(defun load-init-files ()
|
||||
;; (mapc 'require io-modules)
|
||||
(dolist (module my-modules)
|
||||
(message "%s" (symbol-name module))
|
||||
(with-demoted-errors "#### ERROR: %s"
|
||||
(require module))))
|
||||
|
||||
|
||||
;;;; Global Defuns ;;;;;;;;;;;;;;;;;;;;;
|
||||
(defun my--minibuffer-quit ()
|
||||
"Abort recursive edit. In Delete Selection mode, if the mark is
|
||||
active, just deactivate it; then it takes a second \\[keyboard-quit]
|
||||
to abort the minibuffer."
|
||||
(interactive)
|
||||
(if (and delete-selection-mode transient-mark-mode mark-active)
|
||||
(setq deactivate-mark t)
|
||||
(when (get-buffer "*Completions*")
|
||||
(delete-windows-on "*Completions*"))
|
||||
(abort-recursive-edit)))
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
(provide 'init-auto-complete)
|
||||
|
||||
(setq tags-case-fold-search nil)
|
||||
|
||||
(use-package auto-complete
|
||||
:disabled t
|
||||
:init
|
||||
(progn
|
||||
(require 'auto-complete-config)
|
||||
|
||||
(setq ac-auto-start nil
|
||||
ac-auto-show-menu t ; Suggestions box must be invoked manually (see core-keymaps.el)
|
||||
ac-use-menu-map t ; Enable ac-menu-map map when menu is open
|
||||
ac-use-quick-help t ; Don't show tooltips unless invoked (see core-keymaps.el)
|
||||
ac-use-fuzzy t
|
||||
ac-candidate-limit 25)
|
||||
(setq ac-comphist-file (concat my-tmp-dir "ac-comphist.dat"))
|
||||
|
||||
(setq-default ac-sources '(ac-source-yasnippet ac-source-abbrev ac-source-dictionary ac-source-words-in-same-mode-buffers))
|
||||
|
||||
(add-hook 'emacs-lisp-mode-hook 'ac-emacs-lisp-mode-setup)
|
||||
(add-hook 'css-mode-hook 'ac-css-mode-setup)
|
||||
(add-hook 'shell-script-mode-hook 'ac-add-files)
|
||||
;; (add-hook 'auto-complete-mode-hook 'ac-common-setup)
|
||||
)
|
||||
:config
|
||||
(progn
|
||||
;; Redefine this function so auto-complete is available [almost] everywhere
|
||||
(defun auto-complete-mode-maybe ()
|
||||
(unless (minibufferp (current-buffer))
|
||||
(auto-complete-mode 1)))
|
||||
|
||||
(global-auto-complete-mode t)
|
||||
|
||||
(add-to-list 'ac-dictionary-files (expand-file-name "global" my-ac-dicts-dir))
|
||||
(add-to-list 'ac-dictionary-directories my-ac-dicts-dir)
|
||||
|
||||
(push '("*Popup Help*" :position bottom :height 0.35 :noselect t) popwin:special-display-config)
|
||||
|
||||
;; Tell ido not to care about case
|
||||
;; (setq completion-ignore-case t)
|
||||
|
||||
(bind 'insert ac-mode-map
|
||||
(kbd "C-x C-k") 'ac-complete-dictionary
|
||||
(kbd "C-x C-f") 'ac-complete-filename
|
||||
(kbd "C-x C-]") 'ac-complete-etags
|
||||
(kbd "C-x s") 'ac-complete-ispell
|
||||
(kbd "C-x C-s") 'ac-complete-ispell-fuzzy
|
||||
(kbd "C-x C-y") 'ac-complete-yasnippet
|
||||
(kbd "C-x C-o") 'auto-complete
|
||||
(kbd "C-SPC") 'auto-complete)
|
||||
|
||||
(bind ac-completing-map
|
||||
(kbd "<tab>") 'ac-complete
|
||||
(kbd "C-n") 'ac-next
|
||||
(kbd "C-p") 'ac-previous
|
||||
(kbd "S-C-<SPC>") 'ac-quick-help
|
||||
(kbd "C-<SPC>") 'ac-help
|
||||
(kbd "<ESC>") 'ac-stop
|
||||
(kbd "<RET>") 'ac-complete)
|
||||
|
||||
(use-package ac-etags
|
||||
:commands (ac-complete-etags)
|
||||
:config (ac-etags-setup))
|
||||
|
||||
(use-package ac-ispell
|
||||
:commands (ac-complete-ispell ac-complete-ispell-fuzzy)
|
||||
:config
|
||||
(progn (ac-ispell-setup)
|
||||
(setq ac-ispell-requires 1
|
||||
ac-ispell-fuzzy-limit 25)))))
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
(provide 'init-auto-insert)
|
||||
|
||||
(use-package autoinsert
|
||||
:init (auto-insert-mode 1)
|
||||
:config
|
||||
(progn
|
||||
;; (setq auto-insert-directory "%/.emacs.d/templates/")
|
||||
(setq auto-insert-query nil) ; Don't prompt before insertion
|
||||
(setq auto-insert-alist '())))
|
||||
|
||||
(after "yasnippet"
|
||||
(defun template (file-regexp uuid mode &optional project-only)
|
||||
(define-auto-insert file-regexp `(lambda () (my--template-insert ,uuid ',mode ,project-only))))
|
||||
|
||||
(defun my--template-insert (uuid mode &optional project-only)
|
||||
"Expand snippet template in MODE by its UUID"
|
||||
(unless (and project-only
|
||||
(not (projectile-project-p)))
|
||||
(yas-expand-snippet
|
||||
(yas--template-content
|
||||
(yas--get-template-by-uuid mode uuid)) (point-min) (point-max))
|
||||
(evil-insert-state)))
|
||||
|
||||
(template "/\\.gitignore$" "%%" 'gitignore-mode)
|
||||
|
||||
;; C/C++
|
||||
(template "/Makefile$" "%%" 'makefile-gmake-mode)
|
||||
(template "/main\\.\\([Cc]\\|cc\\|cpp\\)$" "%main.cpp%" 'c++-mode)
|
||||
(template "/win32_\\.\\([Cc]\\|cc\\|cpp\\)$" "%winmain.cpp%" 'c++-mode)
|
||||
(template "\\.\\([Hh]\\|hpp\\)$" "%.h%" 'c++-mode)
|
||||
(template "\\.\\([Cc]\\|cc\\|cpp\\)$" "%.cpp%" 'c++-mode)
|
||||
|
||||
;; Shell scripts
|
||||
(template "\\.z?sh$" "%%" 'sh-mode)
|
||||
|
||||
;; ;; ;; Ruby
|
||||
(template "/spec_helper\\.rb$" "%helper%" 'rspec-mode t)
|
||||
(template "_spec\\.rb$" "%%" 'rspec-mode t)
|
||||
(template "/\\.rspec$" "%.rspec%" 'rspec-mode t)
|
||||
(template "/Rakefile$" "%Rakefile%" 'ruby-mode t)
|
||||
(template "/Gemfile$" "%Gemfile%" 'ruby-mode t)
|
||||
;; (template "\\.gemspec$" "%.gemspec%" 'ruby-mode t)
|
||||
(template "/lib/.+\\.rb$" "%module%" 'ruby-mode t)
|
||||
(template "\\.rb$" "%%" 'ruby-mode)
|
||||
|
||||
;; ;; ;; Python
|
||||
;; ;; (template "tests?/test_.+\\.py$" "%%" 'nose-mode)
|
||||
;; ;; (template "/setup\\.py$" "%setup%" 'python-mode)
|
||||
(template "\\.py$" "%%" 'python-mode)
|
||||
|
||||
;; ;; ;; PHP
|
||||
;; ;; (template "\\.class\\.php$" "%class%" 'php-mode)
|
||||
;; ;; (template "\\.php$" "%%" 'php-mode)
|
||||
|
||||
;; ;; ;; Markdown
|
||||
(template "/README\\.md$" "%README.md%" 'markdown-mode)
|
||||
;; ;; (template "/_posts/.+\\.md$" "%jekyll-post" 'markdown-mode)
|
||||
;; ;; (template "/_layouts/.+\\.html$" "%jekyll-layout%" 'web-mode)
|
||||
|
||||
;; ;; ;; Javascript
|
||||
;; ;; (template "\\.lbaction/Contents/Info.plist$" "%lb6%" 'nxml-mode)
|
||||
;; ;; (template "\\.lbaction/.+/\\(default\\|suggestions\\)\\.js$" "%lb6%" 'js-mode)
|
||||
;; ;; (template "/package\\.json$" "%package.json%" 'json-mode)
|
||||
;; ;; (template "\\.\\(json\\|jshintrc\\)$" "%%" 'json-mode)
|
||||
|
||||
;; ;; ;; SCSS
|
||||
;; ;; (template "/master\\.scss$" "%master%" 'scss-mode)
|
||||
;; ;; (template "/normalize\\.scss$" "%normalize%" 'scss-mode)
|
||||
;; ;; (template "\\.scss$" "%%" 'scss-mode)
|
||||
|
||||
;; ;; ;; HTML
|
||||
;; ;; (template "\\.html$" "%%" 'web-mode)
|
||||
|
||||
;; ;; ;; Lua
|
||||
;; ;; (template "\\.love/main\\.lua$" "%love.main%" 'lua-mode)
|
||||
;; ;; (template "\\.love/conf\\.lua$" "%love.conf%" 'lua-mode)
|
||||
;; ;; (template "\\.lua$" "%%" 'lua-mode)
|
||||
|
||||
;; ;; ;; Java
|
||||
;; ;; (template "/src/.+/.+\\.java$ "%%" 'java-mode)
|
||||
;; ;; (template "\\.gradle$" "%%" 'groovy-mode)
|
||||
|
||||
;; ;; ;; Elisp
|
||||
(template "\\.emacs\\.d/init/.+\\.el$" "%initfile%" 'emacs-lisp-mode)
|
||||
(template "\\.emacs\\.d/snippets/.+$" "%%" 'snippet-mode))
|
||||
|
|
@ -1,107 +0,0 @@
|
|||
(provide 'init-company)
|
||||
|
||||
(use-package company
|
||||
:init
|
||||
(global-company-mode 1)
|
||||
:config
|
||||
(progn
|
||||
(setq company-idle-delay nil)
|
||||
(setq company-minimum-prefix-length 1)
|
||||
(setq company-show-numbers nil)
|
||||
(setq company-tooltip-limit 20)
|
||||
|
||||
(setq company-dabbrev-downcase nil)
|
||||
(setq company-dabbrev-ignore-case nil)
|
||||
(setq company-tooltip-align-annotations t)
|
||||
(setq company-require-match 'never)
|
||||
|
||||
(setq company-global-modes
|
||||
'(not eshell-mode comint-mode org-mode erc-mode message-mode help-mode))
|
||||
|
||||
(require 'color)
|
||||
(let ((bg (face-attribute 'default :background)))
|
||||
(custom-set-faces
|
||||
`(company-tooltip ((t (:inherit default :background ,(color-lighten-name bg 9)))))
|
||||
`(company-scrollbar-bg ((t (:background ,(color-lighten-name bg 15)))))
|
||||
`(company-scrollbar-fg ((t (:background ,(color-lighten-name bg 5)))))
|
||||
`(company-search ((t (:background ,(color-lighten-name bg 15)))))
|
||||
`(company-tooltip-selection ((t (:inherit font-lock-function-name-face))))
|
||||
`(company-tooltip-common ((t (:inherit font-lock-constant-face))))))
|
||||
|
||||
;; Sort candidates by
|
||||
(add-to-list 'company-transformers 'company-sort-by-occurrence)
|
||||
;; (add-to-list 'company-transformers 'company-sort-by-backend-importance)
|
||||
|
||||
(progn ; frontends
|
||||
(setq-default company-frontends '(company-pseudo-tooltip-unless-just-one-frontend
|
||||
company-echo-metadata-frontend
|
||||
company-preview-if-just-one-frontend)))
|
||||
|
||||
(progn ; backends
|
||||
(setq-default company-backends '(company-capf (company-yasnippet company-keywords)))
|
||||
(make-variable-buffer-local 'company-backends)
|
||||
|
||||
(defun company--backend-on (hook &rest backends)
|
||||
(add-hook hook
|
||||
`(lambda()
|
||||
(setq company-backends
|
||||
(append '((,@backends company-yasnippet)) company-backends)))))
|
||||
|
||||
(company--backend-on 'nxml-mode-hook 'company-nxml)
|
||||
(company--backend-on 'emacs-lisp-mode-hook 'company-elisp)
|
||||
|
||||
;; Rewrite evil-complete to use company-dabbrev
|
||||
(setq company-dabbrev-code-other-buffers t)
|
||||
(setq company-dabbrev-code-buffers nil)
|
||||
|
||||
(setq evil-complete-next-func
|
||||
(lambda(arg)
|
||||
(if company-candidates
|
||||
(call-interactively 'company-select-next)
|
||||
(call-interactively 'company-dabbrev))))
|
||||
|
||||
(setq evil-complete-previous-func
|
||||
(lambda (arg)
|
||||
(let ((company-selection-wrap-around t))
|
||||
(call-interactively 'company-dabbrev)
|
||||
(call-interactively 'company-select-previous))))
|
||||
|
||||
(progn ; keybinds
|
||||
(bind 'insert company-mode-map
|
||||
"C-SPC" 'company-complete-common
|
||||
"C-x C-k" 'company-keywords
|
||||
"C-x C-f" 'company-files
|
||||
"C-x C-]" 'company-etags
|
||||
"C-x s" 'company-ispell
|
||||
"C-x C-s" 'company-yasnippet
|
||||
"C-x C-o" 'company-complete
|
||||
"C-x C-n" 'company-dabbrev-code
|
||||
"C-x C-p" (λ (let ((company-selection-wrap-around t))
|
||||
(call-interactively 'company-dabbrev-code)
|
||||
(company-select-previous-or-abort))))
|
||||
|
||||
(bind company-active-map
|
||||
"C-w" nil
|
||||
"C-o" 'company-search-kill-others
|
||||
"C-n" 'company-select-next-or-abort
|
||||
"C-p" 'company-select-previous-or-abort
|
||||
"C-h" 'company-show-doc-buffer
|
||||
"C-S-h" 'company-show-location
|
||||
"C-S-s" 'company-search-candidates
|
||||
"C-s" 'company-filter-candidates
|
||||
"C-SPC" 'company-complete-common
|
||||
[tab] 'company-complete
|
||||
"<backtab>" 'company-select-previous
|
||||
[escape] 'company-abort)
|
||||
|
||||
(bind company-search-map
|
||||
"C-n" 'company-search-repeat-forward
|
||||
"C-p" 'company-search-repeat-backward
|
||||
[escape] 'company-abort)
|
||||
|
||||
;; (bind company-filter-map
|
||||
;; [escape] 'company-filterd)
|
||||
|
||||
(after "helm-company"
|
||||
(bind company-mode-map "<C-return>" 'helm-company)
|
||||
(bind company-active-map "<C-return>" 'helm-company))))))
|
||||
129
init/init-cpp.el
129
init/init-cpp.el
|
|
@ -1,129 +0,0 @@
|
|||
(provide 'init-cpp)
|
||||
|
||||
(use-package cmake-mode
|
||||
:mode "CMakeLists\\.txt$"
|
||||
:config (add-to-list 'ac-modes 'cmake-mode))
|
||||
|
||||
(setq-default c-basic-offset 4
|
||||
c-default-style "linux"
|
||||
c-tab-always-indent nil)
|
||||
|
||||
;; Setting proper includes on OSX
|
||||
(when is-mac
|
||||
(setq my/clang-includes
|
||||
'("/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1"
|
||||
"/usr/local/include"
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include"
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include"
|
||||
"/usr/include"
|
||||
"/System/Library/Frameworks"
|
||||
"/Library/Frameworks"))
|
||||
|
||||
(after "flycheck" (setq flycheck-clang-include-path my/clang-includes))
|
||||
(after "auto-complete"
|
||||
(setq ac-clang-flags (mapcar (lambda (item) (concat "-I" item)) my/clang-includes)))
|
||||
)
|
||||
|
||||
(add-to-list 'auto-mode-alist '("\\.h\\'" . c++-mode))
|
||||
(add-hook! 'c-mode-common-hook
|
||||
(use-package auto-complete-clang)
|
||||
(use-package auto-complete-c-headers)
|
||||
(setq ac-sources
|
||||
'(ac-source-clang
|
||||
ac-source-c-headers
|
||||
ac-source-yasnippet
|
||||
ac-source-words-in-same-mode-buffers))
|
||||
|
||||
(c-toggle-electric-state -1)
|
||||
(c-toggle-auto-newline -1)
|
||||
|
||||
;; DEL mapping interferes with smartparens and my.deflate-maybe
|
||||
(bind c-mode-map (kbd "DEL") nil)
|
||||
|
||||
(c-set-offset 'substatement-open '0) ; brackets should be at same indentation level as the statements they open
|
||||
(c-set-offset 'inline-open '+)
|
||||
(c-set-offset 'block-open '+)
|
||||
(c-set-offset 'brace-list-open '+) ; all "opens" should be indented by the c-indent-level
|
||||
(c-set-offset 'case-label '+) ; indent case labels by c-indent-level, too
|
||||
|
||||
;; C++11 support on mac
|
||||
(when (and is-mac (eq major-mode 'c++-mode))
|
||||
(setq flycheck-clang-language-standard "c++11"
|
||||
flycheck-clang-standard-library "libc++"
|
||||
flycheck-c/c++-clang-executable "clang++")))
|
||||
|
||||
;; C++11 syntax support (until cc-mode is updated)
|
||||
(require 'font-lock)
|
||||
(defun --copy-face (new-face face)
|
||||
"Define NEW-FACE from existing FACE."
|
||||
(copy-face face new-face)
|
||||
(eval `(defvar ,new-face nil))
|
||||
(set new-face new-face))
|
||||
|
||||
(--copy-face 'font-lock-label-face ; labels, case, public, private, proteced, namespace-tags
|
||||
'font-lock-keyword-face)
|
||||
(--copy-face 'font-lock-doc-markup-face ; comment markups such as Javadoc-tags
|
||||
'font-lock-doc-face)
|
||||
(--copy-face 'font-lock-doc-string-face ; comment markups
|
||||
'font-lock-comment-face)
|
||||
(global-font-lock-mode t)
|
||||
(setq font-lock-maximum-decoration t)
|
||||
|
||||
(add-hook 'c++-mode-hook
|
||||
'(lambda()
|
||||
;; We could place some regexes into `c-mode-common-hook', but note that their evaluation order
|
||||
;; matters.
|
||||
(font-lock-add-keywords
|
||||
nil '(;; complete some fundamental keywords
|
||||
("\\<\\(void\\|unsigned\\|signed\\|char\\|short\\|bool\\|int\\|long\\|float\\|double\\)\\>" . font-lock-keyword-face)
|
||||
;; namespace names and tags - these are rendered as constants by cc-mode
|
||||
("\\<\\(\\w+::\\)" . font-lock-function-name-face)
|
||||
;; new C++11 keywords
|
||||
("\\<\\(alignof\\|alignas\\|constexpr\\|decltype\\|noexcept\\|nullptr\\|static_assert\\|thread_local\\|override\\|final\\)\\>" . font-lock-keyword-face)
|
||||
("\\<\\(char16_t\\|char32_t\\)\\>" . font-lock-keyword-face)
|
||||
;; PREPROCESSOR_CONSTANT, PREPROCESSORCONSTANT
|
||||
("\\<[A-Z]*_[A-Z_]+\\>" . font-lock-constant-face)
|
||||
("\\<[A-Z]\\{3,\\}\\>" . font-lock-constant-face)
|
||||
;; hexadecimal numbers
|
||||
("\\<0[xX][0-9A-Fa-f]+\\>" . font-lock-constant-face)
|
||||
;; integer/float/scientific numbers
|
||||
("\\<[\\-+]*[0-9]*\\.?[0-9]+\\([ulUL]+\\|[eE][\\-+]?[0-9]+\\)?\\>" . font-lock-constant-face)
|
||||
;; c++11 string literals
|
||||
;; L"wide string"
|
||||
;; L"wide string with UNICODE codepoint: \u2018"
|
||||
;; u8"UTF-8 string", u"UTF-16 string", U"UTF-32 string"
|
||||
("\\<\\([LuU8]+\\)\".*?\"" 1 font-lock-keyword-face)
|
||||
;; R"(user-defined literal)"
|
||||
;; R"( a "quot'd" string )"
|
||||
;; R"delimiter(The String Data" )delimiter"
|
||||
;; R"delimiter((a-z))delimiter" is equivalent to "(a-z)"
|
||||
("\\(\\<[uU8]*R\"[^\\s-\\\\()]\\{0,16\\}(\\)" 1 font-lock-keyword-face t) ; start delimiter
|
||||
( "\\<[uU8]*R\"[^\\s-\\\\()]\\{0,16\\}(\\(.*?\\))[^\\s-\\\\()]\\{0,16\\}\"" 1 font-lock-string-face t) ; actual string
|
||||
( "\\<[uU8]*R\"[^\\s-\\\\()]\\{0,16\\}(.*?\\()[^\\s-\\\\()]\\{0,16\\}\"\\)" 1 font-lock-keyword-face t) ; end delimiter
|
||||
|
||||
;; user-defined types (rather project-specific)
|
||||
("\\<[A-Za-z_]+[A-Za-z_0-9]*_\\(type\\|ptr\\)\\>" . font-lock-type-face)
|
||||
("\\<\\(xstring\\|xchar\\)\\>" . font-lock-type-face)
|
||||
))
|
||||
) t)
|
||||
|
||||
;; Fix enum and C++11 lambda indentation
|
||||
(defadvice c-lineup-arglist (around my activate)
|
||||
"Improve indentation of continued C++11 lambda function opened as argument."
|
||||
(setq ad-return-value
|
||||
(if (and (equal major-mode 'c++-mode)
|
||||
(ignore-errors
|
||||
(save-excursion
|
||||
(goto-char (c-langelem-pos langelem))
|
||||
;; Detect "[...](" or "[...]{". preceded by "," or "(",
|
||||
;; and with unclosed brace.
|
||||
(looking-at ".*[(,][ \t]*\\[[^]]*\\][ \t]*[({][^}]*$"))))
|
||||
0 ; no additional indent
|
||||
ad-do-it))) ; default behavior
|
||||
|
||||
;; Shaders
|
||||
(use-package glsl-mode
|
||||
:mode (("\\.glsl\\'" . glsl-mode)
|
||||
("\\.vert\\'" . glsl-mode)
|
||||
("\\.frag\\'" . glsl-mode)
|
||||
("\\.geom\\'" . glsl-mode)))
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
(provide 'init-cscope)
|
||||
|
||||
(use-package xcscope
|
||||
:init (cscope-setup)
|
||||
:config (push '("*cscope*" :position bottom) popwin:special-display-config))
|
||||
|
||||
(add-hook 'ruby-mode-hook (function cscope-minor-mode))
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
(provide 'init-csharp)
|
||||
|
||||
(use-package omnisharp :defer t
|
||||
:config
|
||||
(progn
|
||||
(setq omnisharp-server-executable-path "~/Dropbox/projects/lib/Omnisharp/server/OmniSharp/bin/Debug/OmniSharp.exe")
|
||||
|
||||
(bind 'normal omnisharp-mdoe-map
|
||||
"gd" 'omnisharp-go-to-definition
|
||||
"")
|
||||
|
||||
(after "company"
|
||||
(company--backend-on 'csharpmode 'company-omnisharp)
|
||||
(add-hook 'csharp-mode-hook 'eldoc-mode))
|
||||
))
|
||||
|
||||
(use-package csharp-mode :mode "\\.cs$")
|
||||
;; (use-package csharp-mode
|
||||
;; :mode "\\.cs$"
|
||||
;; :config
|
||||
;; (bind 'insert csharp-mode-map (kbd "C-SPC") 'omnisharp-auto-complete))
|
||||
;; :init
|
||||
;; (add-hook! 'csharp-mode-hook (omnisharp-mode t) (flycheck-mode t)))
|
||||
|
||||
;; unity shaders
|
||||
(use-package shaderlab-mode :mode "\\.shader$")
|
||||
|
||||
;; TODO Make more Unity-friendly
|
||||
106
init/init-dev.el
106
init/init-dev.el
|
|
@ -1,106 +0,0 @@
|
|||
(provide 'init-dev)
|
||||
|
||||
(add-hook 'find-file-hook 'hl-todo-mode)
|
||||
|
||||
(use-package dash-at-point
|
||||
:commands (dash-at-point dash-at-point-with-docset)
|
||||
:if is-mac)
|
||||
|
||||
(use-package rainbow-delimiters
|
||||
:commands rainbow-delimiters-mode
|
||||
:init (add-hook 'emacs-lisp-mode-hook 'rainbow-delimiters-mode))
|
||||
|
||||
;;; Config modes
|
||||
(use-package yaml-mode
|
||||
:defer t
|
||||
:config (add-hook 'yaml-mode-hook 'enable-tab-width-2))
|
||||
|
||||
(use-package json-mode
|
||||
:mode (("\\.json\\'" . json-mode)
|
||||
("\\.jshintrc\\'" . json-mode)))
|
||||
|
||||
(use-package emr
|
||||
:commands (emr-initialize emr-show-refactor-menu)
|
||||
:init (add-hook 'prog-mode-hook 'emr-initialize)
|
||||
:config
|
||||
(progn
|
||||
(bind 'normal "gR" 'emr-show-refactor-menu)
|
||||
|
||||
(after "evil" (evil-ex-define-cmd "ref[actor]" 'emr-show-refactor-menu))))
|
||||
|
||||
|
||||
;; Variables
|
||||
(defvar-local my-run-code-interpreter nil)
|
||||
(defvar-local my-run-code-func 'my--run-code-shell)
|
||||
(defvar-local my-run-code-region-func 'my--run-code-region-shell)
|
||||
(defvar-local my-switch-to-repl-func nil)
|
||||
(defvar-local my-send-region-to-repl-func nil)
|
||||
(defvar-local my-build-func nil)
|
||||
|
||||
;; usage
|
||||
(defvar-local my-test-single-func nil)
|
||||
(defvar-local my-test-fixture-func nil)
|
||||
(defvar-local my-test-all-func nil)
|
||||
|
||||
(defun my--run-code-shell (file-path)
|
||||
(if (stringp my-run-code-interpreter)
|
||||
(message (concat my-run-code-interpreter " " file-path))
|
||||
(error "No interpreter set for %s. See `my-run-code-interpreter'"
|
||||
(symbol-name major-mode))))
|
||||
|
||||
(defun my--run-code-region-shell (beg end)
|
||||
(if (stringp my-run-code-interpreter)
|
||||
(shell-command-on-region beg end my-run-code-interpreter)
|
||||
(error "No interpreter set for %s. See `my-run-code-interpreter'"
|
||||
(symbol-name major-mode))))
|
||||
|
||||
(defun my-switch-to-repl ()
|
||||
(interactive)
|
||||
(if (functionp my-switch-to-repl-func)
|
||||
(funcall my-switch-to-repl-func)
|
||||
(error "No REPL was set for %s. See `my-switch-to-repl-func'"
|
||||
(symbol-name major-mode))))
|
||||
|
||||
(defun my-send-region-to-repl (beg end)
|
||||
(interactive "r")
|
||||
(if (functionp my-send-region-to-repl-func)
|
||||
(funcall my-send-region-to-repl-func beg end)
|
||||
(error "No region runner set for %s. See `my-send-region-to-repl-func'"
|
||||
(symbol-name major-mode))))
|
||||
|
||||
(defun my-run-code-buffer ()
|
||||
(interactive)
|
||||
(let ((mode-name (symbol-name major-mode)))
|
||||
(if (or (buffer-modified-p)
|
||||
(not (f-exists? buffer-file-name)))
|
||||
(my:run-code-region (point-min) (point-max))
|
||||
(if (functionp my-run-code-func)
|
||||
(funcall my-run-code-func buffer-file-name)
|
||||
(error "No runner set for %s. See `my-run-code-func'" mode-name)))))
|
||||
|
||||
(defun my-run-code-region (beg end)
|
||||
(interactive "r")
|
||||
(if (functionp my-run-code-region-func)
|
||||
(funcall my-run-code-region-func beg end)
|
||||
(error "No region runner set for %s. See `my-run-code-region-func'"
|
||||
(symbol-name major-mode))))
|
||||
|
||||
(defun my-build (&optional arguments)
|
||||
(interactive)
|
||||
(if (functionp my-build-func)
|
||||
(funcall my-build-func arguments)
|
||||
(error "No build function set for %s. See `my-build-func'"
|
||||
(symbol-name major-mode))))
|
||||
|
||||
|
||||
|
||||
(after "evil"
|
||||
;; (evil-ex-define-cmd "test[s]" 'my-test-single-func)
|
||||
;; (evil-ex-define-cmd "testf[ixture]" 'my-test-fixture-func)
|
||||
;; (evil-ex-define-cmd "testa[ll]" 'my-test-all-func)
|
||||
|
||||
(require 'evil-snipe)
|
||||
(global-evil-snipe-mode 1)
|
||||
|
||||
(evil-snipe-surround-compatibility)
|
||||
(evil-define-key 'visual evil-surround-mode-map (kbd "S") 'evil-surround-region))
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
(provide 'init-elisp)
|
||||
|
||||
(defun remove-elc-on-save ()
|
||||
"If you're saving an elisp file, likely the .elc is no longer valid."
|
||||
(make-local-variable 'after-save-hook)
|
||||
(add-hook 'after-save-hook
|
||||
(lambda ()
|
||||
(if (file-exists-p (concat buffer-file-name "c"))
|
||||
(delete-file (concat buffer-file-name "c"))))))
|
||||
|
||||
(add-hook 'after-save-hook 'remove-elc-on-save)
|
||||
(add-hook 'emacs-lisp-mode-hook 'turn-on-eldoc-mode)
|
||||
|
||||
(evil-define-operator my:elisp-eval (beg end)
|
||||
:move-point nil
|
||||
(interactive "<r>")
|
||||
(cond ((and beg end)
|
||||
(eval-region beg end))
|
||||
(t (eval-buffer))))
|
||||
|
||||
;; Real go-to-definition for elisp
|
||||
(bind 'motion emacs-lisp-mode-map "gd"
|
||||
(λ (let ((func (function-called-at-point)))
|
||||
(if func (find-function func)))))
|
||||
|
||||
;; Go-to-definition in other buffer
|
||||
(bind 'motion emacs-lisp-mode-map "gD"
|
||||
(λ (let ((func (function-called-at-point)))
|
||||
(if func (find-function-other-window func)))))
|
||||
|
||||
(bind 'motion emacs-lisp-mode-map "g r" 'my:elisp-eval)
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
(provide 'init-eshell)
|
||||
|
||||
;; (evil-set-initial-state 'eshell-mode 'emacs)
|
||||
|
||||
;; (push '("*eshell*" :position left :width 80 :stick t) popwin:special-display-config)
|
||||
|
||||
;; ;; eshell
|
||||
;; (setq eshell-directory-name (concat my-tmp-dir "eshell"))
|
||||
;; (setq eshell-scroll-to-bottom-on-input 'all)
|
||||
;; (setq eshell-buffer-shorthand t)
|
||||
|
||||
|
||||
;; ;; em-alias
|
||||
;; (setq eshell-aliases-file (concat my-tmp-dir ".eshell-aliases"))
|
||||
|
||||
|
||||
;; ;; em-glob
|
||||
;; (setq eshell-glob-case-insensitive t)
|
||||
;; (setq eshell-error-if-no-glob t)
|
||||
|
||||
|
||||
;; ;; em-hist
|
||||
;; (setq eshell-history-size 1024)
|
||||
|
||||
|
||||
;; ;; plan 9 smart shell
|
||||
;; ;; (after "esh-module"
|
||||
;; ;; (add-to-list 'eshell-modules-list 'eshell-smart)
|
||||
;; ;; (setq eshell-where-to-jump 'begin)
|
||||
;; ;; (setq eshell-review-quick-commands nil)
|
||||
;; ;; (setq eshell-smart-space-goes-to-end t))
|
||||
|
||||
;; (defun my-current-git-branch ()
|
||||
;; (let ((branch (car (loop for match in (split-string (shell-command-to-string "git branch") "\n")
|
||||
;; when (string-match "^\*" match)
|
||||
;; collect match))))
|
||||
;; (if (not (eq branch nil))
|
||||
;; (concat " [" (substring branch 2) "]")
|
||||
;; "")))
|
||||
|
||||
;; (defun my-eshell-prompt ()
|
||||
;; (concat (propertize (abbreviate-file-name (eshell/pwd)) 'face 'eshell-prompt)
|
||||
;; (propertize (my-current-git-branch) 'face 'font-lock-function-name-face)
|
||||
;; (propertize " $ " 'face 'font-lock-constant-face)))
|
||||
|
||||
|
||||
;; ;; em-prompt
|
||||
;; (setq eshell-prompt-function 'my-eshell-prompt)
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
(provide 'init-fly)
|
||||
|
||||
(use-package flycheck
|
||||
:defer t
|
||||
:init (add-hook 'prog-mode-hook 'flycheck-mode)
|
||||
:config
|
||||
(progn ; flycheck settings
|
||||
(setq-default flycheck-indication-mode 'right-fringe
|
||||
;; Removed checks on idle/change for snappiness
|
||||
flycheck-check-syntax-automatically '(save mode-enabled)
|
||||
flycheck-disabled-checkers '(emacs-lisp-checkdoc make))
|
||||
|
||||
(my--cleanup-buffers-add "^\\*Flycheck.*\\*$")
|
||||
|
||||
(bind 'normal flycheck-error-list-mode-map
|
||||
[escape] 'kill-this-buffer
|
||||
"q" 'kill-this-buffer)
|
||||
|
||||
(evil-initial-state 'flycheck-error-list-mode 'emacs)
|
||||
|
||||
(evil-ex-define-cmd "er[rors]" (λ (flycheck-buffer) (flycheck-list-errors)))
|
||||
|
||||
(defun my--evil-flycheck-buffer ()
|
||||
(if (and (featurep 'flycheck) flycheck-mode)
|
||||
(flycheck-buffer)))
|
||||
|
||||
;; Check buffer when normal mode is entered
|
||||
(add-hook 'evil-normal-state-entry-hook 'my--evil-flycheck-buffer)
|
||||
;; And on ESC in normal mode.
|
||||
(defadvice evil-force-normal-state (after evil-esc-flycheck-buffer activate)
|
||||
(my--evil-flycheck-buffer))
|
||||
|
||||
(push '("^\\*Flycheck.*\\*$" :regexp t :position bottom :height 0.25 :noselect t)
|
||||
popwin:special-display-config)))
|
||||
|
||||
(use-package flyspell :commands flyspell-mode)
|
||||
113
init/init-git.el
113
init/init-git.el
|
|
@ -1,113 +0,0 @@
|
|||
(provide 'init-git)
|
||||
|
||||
(use-package git-commit-mode ;
|
||||
:mode (("/COMMIT_EDITMSG\\'" . git-commit-mode)
|
||||
("/NOTES_EDITMSG\\'" . git-commit-mode)
|
||||
("/MERGE_MSG\\'" . git-commit-mode)
|
||||
("/TAG_EDITMSG\\'" . git-commit-mode)
|
||||
("/PULLREQ_EDITMSG\\'" . git-commit-mode)))
|
||||
|
||||
(use-package git-rebase-mode
|
||||
:mode ("/git-rebase-todo\\'" . git-rebase-mode))
|
||||
|
||||
(use-package gitconfig-mode
|
||||
:mode (("/\\.?git/?config\\'" . gitconfig-mode)
|
||||
("/\\.gitmodules\\'" . gitconfig-mode))
|
||||
:config (add-hook 'gitconfig-mode-hook 'flyspell-mode))
|
||||
|
||||
(use-package gitignore-mode
|
||||
:mode (("/\\.gitignore\\'" . gitignore-mode)
|
||||
("/\\.git/info/exclude\\'" . gitignore-mode)
|
||||
("/git/ignore\\'" . gitignore-mode)))
|
||||
;;
|
||||
(use-package git-gutter-fringe+
|
||||
:init (global-git-gutter+-mode +1)
|
||||
:config
|
||||
(progn
|
||||
(evil-ex-define-cmd "gstage" 'git-gutter+-stage-hunks)
|
||||
(evil-ex-define-cmd "grevert" 'git-gutter+-revert-hunks)
|
||||
(evil-ex-define-cmd "gdiff" 'git-gutter+-show-hunk)
|
||||
|
||||
(fringe-helper-define 'git-gutter-fr+-added nil
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X.......")
|
||||
|
||||
(fringe-helper-define 'git-gutter-fr+-deleted nil
|
||||
"X......."
|
||||
"XXXXXXXX"
|
||||
"X......."
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........"
|
||||
"........")
|
||||
|
||||
(fringe-helper-define 'git-gutter-fr+-modified nil
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X......."
|
||||
"X.......")))
|
||||
|
||||
(evil-set-initial-state 'git-commit-mode 'insert)
|
||||
(evil-set-initial-state 'git-rebase-mode 'insert)
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
(provide 'init-go)
|
||||
|
||||
;; (use-package go-mode
|
||||
;; :mode "\\.go\\'"
|
||||
;; :interpreter "go"
|
||||
;; :init
|
||||
;; (require 'go-autocomplete))
|
||||
|
|
@ -1,199 +0,0 @@
|
|||
(provide 'init-helm)
|
||||
|
||||
(use-package helm
|
||||
:config
|
||||
(progn ; helm settings
|
||||
(defvar helm-global-prompt ">>> ")
|
||||
|
||||
(setq helm-quick-update t
|
||||
helm-idle-delay 0.01
|
||||
helm-input-idle-delay 0.01
|
||||
helm-reuse-last-window-split-state t
|
||||
helm-buffers-fuzzy-matching nil
|
||||
helm-bookmark-show-location t)
|
||||
|
||||
(my--cleanup-buffers-add "^\\*[Hh]elm.*\\*$")
|
||||
|
||||
(evil-ex-define-cmd "a" 'helm-projectile-find-other-file)
|
||||
(evil-ex-define-cmd "proj[ect]" 'helm-projectile-switch-project)
|
||||
(evil-ex-define-cmd "ag" 'my:helm-ag-search)
|
||||
(evil-ex-define-cmd "ag[cw]d" 'my:helm-ag-search-cwd)
|
||||
(evil-ex-define-cmd "sw[oop]" 'my:helm-swoop)
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(use-package helm-ag
|
||||
:commands (my:helm-ag-search my:helm-ag-search-cwd helm-ag helm-do-ag my:helm-ag-search)
|
||||
:config
|
||||
(progn
|
||||
;; Ex-mode interface for `helm-ag'. If `bang', then `search' is interpreted as
|
||||
;; regexp.
|
||||
(evil-define-operator my:helm-ag-search (beg end &optional bang search pwd-p)
|
||||
:motion nil
|
||||
:move-point nil
|
||||
:type inclusive
|
||||
:repeat nil
|
||||
(interactive "<r><!><a>")
|
||||
(let* ((helm-ag-default-directory (my--project-root pwd-p))
|
||||
(header-name (format "Search in %s" helm-ag-default-directory))
|
||||
(input "")
|
||||
(helm-ag--last-input ""))
|
||||
(if search
|
||||
(progn
|
||||
(helm-attrset 'search-this-file nil helm-ag-source)
|
||||
(setq helm-ag--last-query
|
||||
(concat "ag " (unless bang "-Q") " --nogroup --nocolor -- '"
|
||||
(s-replace "'" "" search) "'")))
|
||||
(helm-ag-save-current-context)
|
||||
(if (and beg end)
|
||||
(setq input (buffer-substring-no-properties beg end))))
|
||||
(helm-attrset 'name header-name helm-ag-source)
|
||||
(helm :sources (if search (helm-ag--select-source) '(helm-source-do-ag))
|
||||
:buffer "*helm-ag*"
|
||||
:input input
|
||||
:prompt helm-global-prompt)))
|
||||
|
||||
;; Ex-mode interface for `helm-do-ag'. If `bang', then `search' is interpreted
|
||||
;; as regexp
|
||||
(evil-define-operator my:helm-ag-search-cwd (beg end &optional bang search)
|
||||
:motion nil
|
||||
:move-point nil
|
||||
:type inclusive
|
||||
:repeat nil
|
||||
(interactive "<r><!><a>")
|
||||
(my:helm-ag-search beg end search bang t))))
|
||||
|
||||
(use-package helm-css-scss ; https://github.com/ShingoFukuyama/helm-css-scss
|
||||
:commands (helm-css-scss
|
||||
helm-css-scss-multi
|
||||
helm-css-scss-insert-close-comment))
|
||||
|
||||
(use-package helm-swoop ; https://github.com/ShingoFukuyama/helm-swoop
|
||||
:commands (my:helm-swoop helm-swoop helm-multi-swoop)
|
||||
:config
|
||||
(progn
|
||||
(setq helm-swoop-use-line-number-face t
|
||||
helm-swoop-split-with-multiple-windows t
|
||||
helm-swoop-speed-or-color t
|
||||
helm-swoop-split-window-function 'popwin:popup-buffer)
|
||||
|
||||
;; Ex-mode interface for `helm-swoop', `helm-multi-swoop-all' (if `bang'), or
|
||||
;; `helm-css-scss' and `helm-css-scss-multi' (if `bang') if major-mode is
|
||||
;; `scss-mode'
|
||||
(evil-define-command my:helm-swoop (&optional search bang)
|
||||
:repeat nil
|
||||
(interactive "<a><!>")
|
||||
(if (eq major-mode 'scss-mode)
|
||||
(if bang (helm-css-scss-multi search) (helm-css-scss search))
|
||||
(if bang (helm-multi-swoop-all search) (helm-swoop :$query search))))))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(after "winner"
|
||||
;; Tell winner-mode to ignore helm buffers
|
||||
(dolist (bufname '("*helm recentf*"
|
||||
"*helm projectile*"
|
||||
"*helm imenu*"
|
||||
"*helm company*"
|
||||
"*helm buffers*"
|
||||
;; "*helm tags*"
|
||||
"*helm-ag*"
|
||||
"*Helm Swoop*"))
|
||||
(push bufname winner-boring-buffers)))
|
||||
|
||||
(after "company"
|
||||
(use-package helm-company
|
||||
:config
|
||||
(defun helm-company ()
|
||||
(interactive)
|
||||
(unless company-candidates
|
||||
(company-complete))
|
||||
(when company-point
|
||||
(helm :sources 'helm-source-company
|
||||
:buffer "*helm company*"
|
||||
:prompt helm-global-prompt
|
||||
:candidate-number-limit helm-company-candidate-number-limit)))))
|
||||
|
||||
(after "projectile"
|
||||
(use-package helm-projectile
|
||||
:config
|
||||
(setq projectile-switch-project-action 'helm-projectile))
|
||||
|
||||
;; Don't show the project name in the prompts; I already know.
|
||||
(defun projectile-prepend-project-name (string)
|
||||
(format helm-global-prompt string))
|
||||
|
||||
;; All this for a smaller prompt (it was redundant with helm headers)
|
||||
(defmacro helm-projectile-command (command source prompt)
|
||||
`(defun ,(intern (concat "helm-projectile-" command)) (&optional arg)
|
||||
(interactive "P")
|
||||
(if (projectile-project-p)
|
||||
(projectile-maybe-invalidate-cache arg))
|
||||
(let ((helm-ff-transformer-show-only-basename nil)
|
||||
;; for consistency, we should just let Projectile take care of ignored files
|
||||
(helm-boring-file-regexp-list nil))
|
||||
(helm :sources ,source
|
||||
:buffer "*helm projectile*"
|
||||
:prompt helm-global-prompt))))
|
||||
|
||||
(helm-projectile-command "switch-project" 'helm-source-projectile-projects helm-global-prompt)
|
||||
(helm-projectile-command "find-file" helm-source-projectile-files-and-dired-list helm-global-prompt)
|
||||
(helm-projectile-command "find-file-in-known-projects" 'helm-source-projectile-files-in-all-projects-list helm-global-prompt)
|
||||
(helm-projectile-command "find-file-dwim" 'helm-source-projectile-files-dwim-list helm-global-prompt)
|
||||
(helm-projectile-command "find-dir" helm-source-projectile-directories-and-dired-list helm-global-prompt)
|
||||
(helm-projectile-command "recentf" 'helm-source-projectile-recentf-list helm-global-prompt)
|
||||
(helm-projectile-command "switch-to-buffer" 'helm-source-projectile-buffers-list helm-global-prompt))
|
||||
|
||||
(progn ; helm hacks
|
||||
;; No persistent header
|
||||
(defadvice helm-display-mode-line (after undisplay-header activate)
|
||||
(setq header-line-format nil))
|
||||
|
||||
;; Reconfigured `helm-recentf' to use `helm', instead of `helm-other-buffer'
|
||||
(defun helm-recentf ()
|
||||
(interactive)
|
||||
(let ((helm-ff-transformer-show-only-basename nil))
|
||||
(helm :sources '(helm-source-recentf)
|
||||
:buffer "*helm recentf*"
|
||||
:prompt helm-global-prompt)))
|
||||
|
||||
;; Hide the mode-line in helm (<3 minimalism)
|
||||
(defun helm-display-mode-line (source &optional force)
|
||||
(set (make-local-variable 'helm-mode-line-string)
|
||||
(helm-interpret-value (or (and (listp source) ; Check if source is empty.
|
||||
(assoc-default 'mode-line source))
|
||||
(default-value 'helm-mode-line-string))
|
||||
source))
|
||||
(let ((follow (and (eq (cdr (assq 'follow source)) 1) "(HF) ")))
|
||||
(if helm-mode-line-string
|
||||
(setq mode-line-format nil)
|
||||
(setq mode-line-format (default-value 'mode-line-format)))
|
||||
(let* ((hlstr (helm-interpret-value
|
||||
(and (listp source)
|
||||
(assoc-default 'header-line source))
|
||||
source))
|
||||
(hlend (make-string (max 0 (- (window-width) (length hlstr))) ? )))
|
||||
(setq header-line-format
|
||||
(propertize (concat " " hlstr hlend) 'face 'helm-header))))
|
||||
(when force (force-mode-line-update))))
|
||||
|
||||
(progn ; popwin
|
||||
(push '("^\\*helm.*\\*$" :position bottom :regexp t :height 18)
|
||||
popwin:special-display-config))
|
||||
|
||||
(progn ; evil
|
||||
(evil-set-initial-state 'helm-mode 'emacs)
|
||||
|
||||
;; Ex-mode interface for `helm-recentf' and `helm-projectile-recentf'. If
|
||||
;; `bang', then `search' is interpreted as regexp
|
||||
(evil-ex-define-cmd "rec[ent]" 'my:helm-recentf)
|
||||
(evil-define-command my:helm-recentf (&optional bang)
|
||||
:repeat nil
|
||||
(interactive "<!>")
|
||||
(if bang (helm-recentf) (helm-projectile-recentf))))
|
||||
|
||||
(bind helm-map
|
||||
"C-w" 'evil-delete-backward-word
|
||||
"C-u" 'helm-delete-minibuffer-contents
|
||||
"C-r" 'evil-ex-paste-from-register ; Evil registers in helm! Glorious!
|
||||
[escape] 'helm-keyboard-quit)))
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
(provide 'init-ido)
|
||||
|
||||
;; ido remaps its keys every time it's invoked, this screws with
|
||||
;; custom mappings. So we've gotta neuter ido.
|
||||
;; (defun ido-init-completion-maps ())
|
||||
;; (setq ido-common-completion-map (make-sparse-keymap)
|
||||
;; ido-file-dir-completion-map (make-sparse-keymap)
|
||||
;; ido-file-completion-map (make-sparse-keymap)
|
||||
;; ido-buffer-completion-map (make-sparse-keymap))
|
||||
|
||||
;; (set-keymap-parent ido-common-completion-map minibuffer-local-map)
|
||||
;; (set-keymap-parent ido-file-dir-completion-map ido-common-completion-map)
|
||||
;; (set-keymap-parent ido-file-completion-map ido-file-dir-completion-map)
|
||||
;; (set-keymap-parent ido-buffer-completion-map ido-common-completion-map)
|
||||
|
||||
(require 'ido-ubiquitous)
|
||||
(require 'ido-vertical-mode)
|
||||
(require 'flx-ido)
|
||||
|
||||
(ido-mode 1)
|
||||
(ido-vertical-mode 1)
|
||||
(ido-everywhere 1)
|
||||
(ido-ubiquitous-mode 1)
|
||||
(flx-ido-mode 1)
|
||||
|
||||
(setq ido-use-faces nil
|
||||
ido-confirm-unique-completion t
|
||||
ido-case-fold t
|
||||
ido-enable-tramp-completion nil
|
||||
ido-enable-flex-matching t
|
||||
ido-create-new-buffer 'always
|
||||
ido-enable-tramp-completion t
|
||||
ido-enable-last-directory-history t
|
||||
ido-save-directory-list-file (concat my-tmp-dir "ido.last"))
|
||||
|
||||
(add-to-list 'ido-ignore-files "\\`.DS_Store$")
|
||||
(setq ido-ignore-buffers
|
||||
'("\\` " "^\\*ESS\\*" "^\\*Messages\\*" "^\\*Help\\*" "^\\*Buffer"
|
||||
"^\\*.*Completions\\*$" "^\\*Ediff" "^\\*tramp" "^\\*cvs-"
|
||||
"_region_" " output\\*$" "^TAGS$" "^\*Ido"))
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
(provide 'init-java)
|
||||
|
||||
(use-package eclim
|
||||
:commands (eclim-mode global-eclim-mode)
|
||||
:init
|
||||
(progn
|
||||
(setq eclim-eclipse-dirs '("/Applications/eclipse")
|
||||
eclim-executable "/Applications/eclipse/eclim")
|
||||
(add-hook 'java-mode-hook 'eclim-mode))
|
||||
:config
|
||||
(progn
|
||||
;; (use-package eclim-ant)
|
||||
;; (use-package eclim-maven)
|
||||
(use-package eclim-problems)
|
||||
(use-package eclim-project)
|
||||
(use-package eclimd)
|
||||
|
||||
(setq help-at-pt-display-when-idle t)
|
||||
(setq help-at-pt-timer-delay 0.1)
|
||||
(help-at-pt-set-timer)
|
||||
|
||||
(after "company"
|
||||
(use-package company-emacs-eclim
|
||||
:init (company-emacs-eclim-setup)))
|
||||
|
||||
(after "auto-complete"
|
||||
(add-hook! 'java-mode-hook
|
||||
(setq ac-sources '(ac-source-emacs-eclim
|
||||
ac-source-yasnippet
|
||||
ac-source-abbrev
|
||||
ac-source-dictionary
|
||||
ac-source-words-in-same-mode-buffers))))
|
||||
|
||||
(bind 'motion java-mode-map "gd" 'eclim-java-find-declaration)))
|
||||
|
||||
(use-package groovy-mode
|
||||
:mode "\\.gradle$"
|
||||
:config (after "auto-complete" (add-to-list 'ac-modes 'groovy-mode)))
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
(provide 'init-lua)
|
||||
|
||||
(use-package lua-mode
|
||||
:mode "\\.lua$"
|
||||
:interpreter "lua"
|
||||
:init
|
||||
(progn
|
||||
(define-minor-mode love-mode
|
||||
"Buffer local minor mode for Love2D"
|
||||
:init-value nil
|
||||
:lighter " <3"
|
||||
:keymap (make-sparse-keymap))
|
||||
(associate-minor-mode "[\\.-]love/.+\\.lua$" 'love-mode)
|
||||
|
||||
(defun my--build-love ()
|
||||
(shell-command (format "open -a love.app %s" (my--project-root))))
|
||||
|
||||
(add-hook! 'lua-mode-hook (setq my-run-code-interpreter "lua"))
|
||||
(add-hook! 'love-mode-hook (setq my-build-func 'my/build-love))))
|
||||
195
init/init-org.el
195
init/init-org.el
|
|
@ -1,195 +0,0 @@
|
|||
(provide 'init-org)
|
||||
|
||||
;; Defuns
|
||||
(defun my/org-insert-list-item ()
|
||||
"Force insertion of org item"
|
||||
(interactive)
|
||||
(if (not (org-in-item-p))
|
||||
(insert "\n- ")
|
||||
(org-insert-item)))
|
||||
|
||||
(defun my/org-eol-call (fun)
|
||||
"Go to end of line and call provided function"
|
||||
(end-of-line)
|
||||
(funcall fun)
|
||||
(evil-append nil))
|
||||
|
||||
(defun my/org-surround (delim)
|
||||
(insert delim) (save-excursion (insert delim)))
|
||||
|
||||
(defun set-buffer-file-format-to-opml ()
|
||||
(when (string-match "\.opml$" (buffer-file-name))
|
||||
(setq buffer-file-format '(opml))))
|
||||
|
||||
(defun opml-encode (begin end buffer)
|
||||
"Export Org mode buffer to OPML."
|
||||
(let ((org-export-show-temporary-export-buffer nil)
|
||||
(name "*OPML Export Buffer*"))
|
||||
(org-export-to-buffer 'opml name)
|
||||
(erase-buffer)
|
||||
(insert-buffer-substring (get-buffer name))
|
||||
(point-max)))
|
||||
|
||||
;;
|
||||
(require 'org)
|
||||
|
||||
(define-minor-mode evil-org-mode
|
||||
"Buffer local minor mode for evil-org"
|
||||
:init-value nil
|
||||
:lighter " EvilOrg"
|
||||
:keymap (make-sparse-keymap) ; defines evil-org-mode-map
|
||||
:group 'evil-org)
|
||||
|
||||
(add-hook 'org-mode-hook 'evil-org-mode)
|
||||
(add-hook 'org-mode-hook 'turn-on-auto-fill)
|
||||
|
||||
;; Reset evil to ensure evil-org-mode's maps work
|
||||
(add-hook! 'org-mode-hook (evil-mode nil) (evil-mode 1))
|
||||
|
||||
(shut-up (load-library "ox-opml"))
|
||||
|
||||
;; Remove occur highlights on ESC in normal mode
|
||||
(defadvice evil-force-normal-state (before evil-esc-org-remove-highlights activate)
|
||||
(org-remove-occur-highlights))
|
||||
|
||||
(setq org-export-backends '(ascii html latex md opml))
|
||||
(add-hook 'find-file-hooks 'set-buffer-file-format-to-opml)
|
||||
(add-to-list 'auto-mode-alist '("\\.opml$" . org-mode))
|
||||
(add-to-list 'format-alist '(opml "Outline Processor Markup Language"
|
||||
"<[?]xml version=\"1.0\"[^>]*[?]>[\n]?.*[\n]?.*[\n]?<opml version=\"[1|2].0\">"
|
||||
"~/.emacs.d/elisp/org-opml/opml2org.py" opml-encode t))
|
||||
|
||||
(setq org-directory "~/Dropbox/notes"
|
||||
org-default-notes-file "~/Dropbox/notes/notes.org"
|
||||
org-mobile-inbox-for-pull "~/Dropbox/notes/notes.org"
|
||||
org-mobile-directory "~/Dropbox/Apps/MobileOrg"
|
||||
org-agenda-files '("~/Dropbox/notes")
|
||||
org-src-tab-acts-natively t)
|
||||
|
||||
(setq org-completion-use-ido t
|
||||
org-hide-leading-stars t
|
||||
org-todo-keywords
|
||||
'((sequence "TODO(t)" "|" "DONE(d)")
|
||||
(sequence "DOING(s)" "PENDING(p)")
|
||||
(sequence "|" "CANCELLED(c)")))
|
||||
|
||||
(org-babel-do-load-languages 'org-babel-load-languages
|
||||
'((python . t)
|
||||
(ruby . t)
|
||||
(sh . t)
|
||||
(matlab . t)
|
||||
(latex . t)))
|
||||
|
||||
(setq org-tag-alist '(("@work" . ?b)
|
||||
("@home" . ?h)
|
||||
("@writing" . ?w)
|
||||
("@errands" . ?e)
|
||||
("@drawing" . ?d)
|
||||
("@coding" . ?c)
|
||||
("@phone" . ?p)
|
||||
("@reading" . ?r)
|
||||
("projects" . ?q)
|
||||
("easy" . ?0)
|
||||
("hard" . ?1)))
|
||||
|
||||
(setq org-capture-templates
|
||||
'(("t" "TODO" entry (file+headline "~/Dropbox/notes/gtd.org" "Inbox") "* TODO %? %u\n%i")
|
||||
("T" "TODO Someday" entry (file+headline "~/Dropbox/notes/gtd.org" "Someday") "* TODO %? %u :someday:\n%i")
|
||||
("c" "Changelog" entry (file+headline (concat (projectile-project-root) "/CHANGELOG.org") "Unsorted") "** %u %? :unsorted:\n%i" :prepend t)
|
||||
("i" "Invoice" entry (file+headline "~/Dropbox/notes/invoices.org" "Invoices") "** TODO %?\n%i" :prepend t)
|
||||
("n" "Note" entry (file+datetree org-default-notes-file) "** %?\n%i")
|
||||
("b" "Blog" entry (file+datetree "~/Dropbox/notes/blog.org") "** %i%?")
|
||||
("j" "Journal" entry (file+datetree "~/Dropbox/notes/journal.org") "** %?%^g\nAdded: %U\n%i")
|
||||
("a" "Trivia" entry (file "~/Dropbox/notes/trivia.org") "* %u %?\n%i" :prepend t)
|
||||
("s" "Writing Scraps" entry (file "~/Dropbox/notes/writing.org") "* %u %?\n%i" :prepend t)
|
||||
("v" "Vocab" entry (file "~/Dropbox/notes/vocab.org") "* %u %?\n%i" :prepend t)
|
||||
("e" "Excerpt" entry (file "~/Dropbox/notes/excerpts.org") "* %u %?\n%i" :prepend t)))
|
||||
|
||||
(setq org-agenda-custom-commands
|
||||
'(("x" agenda)
|
||||
("y" agenda*)
|
||||
("w" todo "WAITING")
|
||||
("W" todo-tree "WAITING")
|
||||
("to" todo)
|
||||
("tp" tags "+Projects")
|
||||
("tg" tags-todo "+gamedev")
|
||||
("tw" tags-tree "+webdev")))
|
||||
|
||||
|
||||
;; Keymaps
|
||||
(bind 'insert org-mode-map [remap my.inflate-space-maybe] 'self-insert-command)
|
||||
(bind org-mode-map (kbd "RET") nil
|
||||
(kbd "C-j") nil
|
||||
(kbd "C-k") nil)
|
||||
|
||||
(mapc (lambda (state)
|
||||
(evil-define-key state evil-org-mode-map
|
||||
(kbd "M-l") 'org-metaright
|
||||
(kbd "M-h") 'org-metaleft
|
||||
(kbd "M-k") 'org-metaup
|
||||
(kbd "M-j") 'org-metadown
|
||||
(kbd "M-L") 'org-shiftmetaright
|
||||
(kbd "M-H") 'org-shiftmetaleft
|
||||
(kbd "M-K") 'org-shiftmetaup
|
||||
(kbd "M-J") 'org-shiftmetadown
|
||||
(kbd "M-o") '(lambda () (interactive)
|
||||
(evil-org-eol-call
|
||||
'(lambda()
|
||||
(org-insert-heading)
|
||||
(org-metaright))))
|
||||
(kbd "M-t") '(lambda () (interactive)
|
||||
(evil-org-eol-call
|
||||
'(lambda()
|
||||
(org-insert-todo-heading nil)
|
||||
(org-metaright))))
|
||||
))
|
||||
'(normal insert))
|
||||
|
||||
;; Formatting shortcuts
|
||||
(bind 'insert evil-org-mode-map
|
||||
(kbd "s-b") (λ (my/org-surround "*")) ; bold
|
||||
(kbd "s-u") (λ (my/org-surround "_")) ; underline
|
||||
(kbd "s-i") (λ (my/org-surround "/")) ; italics
|
||||
(kbd "s-`") (λ (my/org-surround "+")) ; strikethrough
|
||||
|
||||
(kbd "<S-s-return>") (λ (evil-move-beginning-of-line) (org-insert-heading))
|
||||
(kbd "<s-return>") (λ (org-insert-heading-after-current)))
|
||||
|
||||
(bind '(normal visual) evil-org-mode-map
|
||||
",l" 'org-insert-link)
|
||||
|
||||
(bind 'visual evil-org-mode-map
|
||||
(kbd "s-b") "s*" ; bold
|
||||
(kbd "s-i") "s/") ; italics
|
||||
|
||||
(bind 'normal evil-org-mode-map
|
||||
",d" 'org-time-stamp
|
||||
",D" 'org-time-stamp-inactive
|
||||
",s" 'org-schedule
|
||||
",a" 'org-attach
|
||||
",A" 'org-attach-open
|
||||
",t" 'org-todo
|
||||
",T" 'org-show-todo-tree
|
||||
",/" 'org-sparse-tree
|
||||
",?" 'org-tags-view
|
||||
",+" 'org-align-all-tags
|
||||
",r" 'org-refile
|
||||
"gh" 'outline-up-heading
|
||||
"gj" 'org-forward-heading-same-level
|
||||
"gk" 'org-backward-heading-same-level
|
||||
"gl" 'outline-next-visible-heading
|
||||
"go" 'org-open-at-point
|
||||
"ga" 'org-agenda
|
||||
"gt" 'org-show-todo-tree
|
||||
"H" 'org-beginning-of-line
|
||||
"L" 'org-end-of-line
|
||||
"$" 'org-end-of-line
|
||||
"^" 'org-beginning-of-line
|
||||
"<" 'org-metaleft
|
||||
">" 'org-metaright
|
||||
"-" 'org-cycle-list-bullet
|
||||
(kbd ", SPC") 'org-archive-subtree
|
||||
(kbd "<S-s-return>") (λ (evil-move-beginning-of-line) (org-insert-heading) (evil-insert-state))
|
||||
(kbd "<s-return>") (λ (org-insert-heading-after-current) (evil-insert-state))
|
||||
(kbd "RET") (λ (if (org-entry-is-todo-p) (org-todo 'done)))
|
||||
(kbd "TAB") 'org-cycle)
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
;; Project nav+search tools (projectile, helm, ag)
|
||||
(provide 'init-project)
|
||||
|
||||
(use-package neotree
|
||||
:commands (neotree-show neotree-hide neotree-toggle)
|
||||
:config
|
||||
(progn (setq neo-create-file-auto-open t
|
||||
neo-smart-open t
|
||||
neo-persist-show nil)
|
||||
(add-hook! 'neotree-mode-hook
|
||||
(setq mode-line-format nil)
|
||||
(bind evil-motion-state-local-map
|
||||
(kbd "TAB") 'neotree-enter
|
||||
(kbd "RET") 'neotree-enter))))
|
||||
|
||||
(use-package perspective
|
||||
:init (persp-mode 1)
|
||||
:config
|
||||
(progn
|
||||
(defun my-kill-persp ()
|
||||
(interactive)
|
||||
(persp-kill (persp-name persp-curr)))
|
||||
|
||||
(evil-ex-define-cmd "k[ill]persp" 'my-kill-persp)))
|
||||
|
||||
(use-package dired
|
||||
:disabled t
|
||||
:init
|
||||
(progn (setq dired-recursive-deletes 'always
|
||||
dired-recursive-copies 'always
|
||||
dired-auto-revert-buffer t
|
||||
|
||||
;; if there is a dired buffer displayed in the next
|
||||
;; window, use its current subdir, instead of the
|
||||
;; current subdir of this dired buffer
|
||||
dired-dwim-target t)
|
||||
|
||||
(push '(dired-mode :position bottom :height 0.5 :stick t) popwin:special-display-config)
|
||||
|
||||
(add-hook! 'dired-mode-hook
|
||||
(use-package 'dired+ :config (toggle-diredp-find-file-reuse-dir 1)))))
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
(provide 'init-projectile)
|
||||
|
||||
(use-package projectile
|
||||
:pre-load
|
||||
(setq-default projectile-cache-file (concat my-tmp-dir "projectile.cache")
|
||||
projectile-known-projects-file (concat my-tmp-dir "projectile.projects")
|
||||
projectile-enable-caching t
|
||||
projectile-indexing-method 'alien)
|
||||
:init
|
||||
(projectile-global-mode +1)
|
||||
:config
|
||||
(progn
|
||||
(add-to-list 'projectile-globally-ignored-files "ido.last")
|
||||
(add-to-list 'projectile-globally-ignored-directories "assets")
|
||||
(add-to-list 'projectile-other-file-alist '("scss" "css"))
|
||||
(add-to-list 'projectile-other-file-alist '("css" "scss"))
|
||||
|
||||
;; For setting project-specific settings
|
||||
(defmacro my-project-settings (project-name &rest body)
|
||||
(declare (indent 1))
|
||||
`(progn
|
||||
(add-hook 'find-file-hook
|
||||
(lambda ()
|
||||
(when (string-match-p ,project-name (projectile-project-name))
|
||||
,@body)))))
|
||||
|
||||
(after "perspective"
|
||||
(defvar persp-modestring-dividers '("" " |" ","))
|
||||
(use-package persp-projectile))))
|
||||
|
|
@ -1,98 +0,0 @@
|
|||
(provide 'init-python)
|
||||
|
||||
(use-package python
|
||||
:mode ("\\.py\\'" . python-mode)
|
||||
:interpreter ("python" . python-mode)
|
||||
:init (setq python-indent-offset 4)
|
||||
:config
|
||||
(progn
|
||||
(setq python-environment-directory my-tmp-dir)
|
||||
(setq python-shell-interpreter "ipython")
|
||||
|
||||
;; Interferes with smartparens
|
||||
(bind python-mode-map (kbd "DEL") nil)
|
||||
|
||||
(use-package anaconda-mode
|
||||
:init
|
||||
(progn
|
||||
(add-hook 'python-mode-hook 'anaconda-mode)
|
||||
(add-hook 'python-mode-hook 'eldoc-mode)
|
||||
(add-hook! 'anaconda-mode-hook
|
||||
(process-buffer (python-shell-get-or-create-process python-shell-interpreter t nil))))
|
||||
:config
|
||||
(progn
|
||||
(bind 'motion anaconda-mode-map "gd" 'anaconda-mode-goto-definitions)
|
||||
(bind 'normal anaconda-nav-mode-map [escape] 'anaconda-nav-quit)
|
||||
|
||||
(push '("*anaconda-doc*" :position bottom :height 15 :noselect t) popwin:special-display-config)
|
||||
(push '("*anaconda-nav*" :position bottom :height 15 :stick t) popwin:special-display-config)
|
||||
(push '("^\\*Python.+\\*$" :regexp t :position bottom :height 20 :noselect t) popwin:special-display-config)
|
||||
|
||||
;; Delete the window on escape or C-g
|
||||
(defadvice anaconda-mode-doc-buffer (after anaconda-doc-buffer-escape-to-close activate)
|
||||
(with-current-buffer (get-buffer "*anaconda-doc*")
|
||||
(local-set-key [escape] 'anaconda-nav-quit)
|
||||
(local-set-key [?\C-g] 'anaconda-nav-quit)))
|
||||
|
||||
(after "emr"
|
||||
(emr-declare-command 'anaconda-mode-view-doc
|
||||
:title "view documentation"
|
||||
:modes 'python-mode
|
||||
:predicate (lambda () (and (anaconda-mode-running-p)
|
||||
(not (use-region-p))
|
||||
(not (sp-point-in-string-or-comment)))))
|
||||
(emr-declare-command 'anaconda-mode-goto-assignments
|
||||
:title "go to assignments"
|
||||
:modes 'python-mode
|
||||
:predicate (lambda () (and (anaconda-mode-running-p)
|
||||
(not (use-region-p))
|
||||
(not (sp-point-in-string-or-comment)))))
|
||||
|
||||
(emr-declare-command 'anaconda-mode-goto-definitions
|
||||
:title "go to definition"
|
||||
:modes 'python-mode
|
||||
:predicate (lambda () (and (anaconda-mode-running-p)
|
||||
(not (use-region-p))
|
||||
(not (sp-point-in-string-or-comment)))))
|
||||
|
||||
(emr-declare-command 'anaconda-mode-usages
|
||||
:title "show usages"
|
||||
:modes 'python-mode
|
||||
:predicate (lambda () (and (anaconda-mode-running-p)
|
||||
(not (use-region-p))
|
||||
(not (sp-point-in-string-or-comment))))))
|
||||
|
||||
(after "auto-complete"
|
||||
(use-package ac-anaconda
|
||||
:init (add-hook 'python-mode-hook 'ac-anaconda-setup)))
|
||||
|
||||
(after "company"
|
||||
(use-package company-anaconda
|
||||
:config (company--backend-on 'python-mode-hook 'company-anaconda)))))
|
||||
|
||||
(use-package jedi
|
||||
:disabled t
|
||||
:config
|
||||
(progn
|
||||
(unless (file-directory-p python-environment-directory)
|
||||
(jedi:install-server))
|
||||
(add-hook 'python-mode-hook 'jedi:ac-setup)
|
||||
|
||||
(bind 'motion python-mode-map "gd" 'jedi:goto-definition)))
|
||||
|
||||
(use-package nose
|
||||
:commands nose-mode
|
||||
:init
|
||||
(progn
|
||||
;; Reset nose keymap, we'll set new ones in my-keymaps.el
|
||||
(defvar nose-mode-map (make-sparse-keymap))
|
||||
(associate-minor-mode "/test_.+\\.py\\'" 'nose-mode))
|
||||
:config
|
||||
(bind 'normal nose-mode-map
|
||||
",tr" 'nosetests-again
|
||||
",ta" 'nosetests-all
|
||||
",ts" 'nosetests-one
|
||||
",tv" 'nosetests-module
|
||||
",tA" 'nosetests-pdb-all
|
||||
",tO" 'nosetests-pdb-one
|
||||
",tV" 'nosetests-pdb-module))))
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
(provide 'init-regex)
|
||||
|
||||
(use-package re-builder
|
||||
:defer t
|
||||
:config
|
||||
(progn
|
||||
(bind 'normal reb-mode-map
|
||||
[escape] 'reb-quit
|
||||
(kbd "C-g") 'reb-quit
|
||||
[backtab] 'reb-change-syntax)
|
||||
|
||||
(defun my--reb-cleanup ()
|
||||
(replace-regexp "^[ \n]*" "" nil (point-min) (point-max))
|
||||
(text-scale-set 1.5)
|
||||
(goto-char 2))
|
||||
(add-hook 'reb-mode-hook 'my--reb-cleanup)
|
||||
|
||||
(after "evil"
|
||||
(evil-set-initial-state 'reb-mode 'insert)
|
||||
(evil-ex-define-cmd "re[gex]" 're-builder))))
|
||||
|
||||
(use-package pcre2el
|
||||
:config
|
||||
(progn
|
||||
(bind 'normal rxt-help-mode-map [escape] 'kill-buffer-and-window)
|
||||
|
||||
(after "re-builder" (setq reb-re-syntax 'pcre))
|
||||
(after "popwin"
|
||||
(push '("* Regexp Explain *" :position top :height 0.35) popwin:special-display-config))))
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
(provide 'init-ruby)
|
||||
|
||||
(use-package enh-ruby-mode
|
||||
:mode (("\\.rb$" . enh-ruby-mode)
|
||||
("\\.ru$" . enh-ruby-mode)
|
||||
("\\.rake$" . enh-ruby-mode)
|
||||
("\\.gemspec$" . enh-ruby-mode)
|
||||
("\\.?pryrc$" . enh-ruby-mode)
|
||||
("Gemfile$" . enh-ruby-mode)
|
||||
("Capfile$" . enh-ruby-mode)
|
||||
("Vagrantfile$" . enh-ruby-mode)
|
||||
("Rakefile$" . enh-ruby-mode))
|
||||
:interpreter "ruby"
|
||||
:config
|
||||
(progn
|
||||
;;; Formatting
|
||||
(setq ruby-indent-level 2)
|
||||
(setq ruby-deep-indent-paren t)
|
||||
|
||||
(add-hook 'enh-ruby-mode-hook 'enable-tab-width-2)
|
||||
|
||||
(after "emr" (use-package ruby-refactor))
|
||||
|
||||
(define-minor-mode rake-mode
|
||||
"Buffer local minor mode for rake files"
|
||||
:lighter " Rake")
|
||||
|
||||
(use-package inf-ruby
|
||||
:commands (inf-ruby inf-ruby-console-auto)
|
||||
:config
|
||||
(progn
|
||||
(evil-set-initial-state 'inf-ruby-mode 'insert)
|
||||
(push '(inf-ruby-mode :position bottom :stick t) popwin:special-display-config)
|
||||
|
||||
(after "company"
|
||||
(use-package company-inf-ruby
|
||||
:config (company--backend-on 'inf-ruby-mode-hook 'company-inf-ruby)))))
|
||||
|
||||
(use-package rspec-mode
|
||||
:defer t
|
||||
:pre-load
|
||||
(progn
|
||||
(defvar rspec-mode-verifiable-map (make-sparse-keymap))
|
||||
(defvar evilmi-ruby-match-tags
|
||||
'((("unless" "if") ("elsif" "else") "end")
|
||||
("begin" ("rescue" "ensure") "end")
|
||||
("case" ("when" "else") "end")
|
||||
(("class" "def" "while" "do" "module" "for" "until") () "end")
|
||||
;; Rake
|
||||
(("task" "namespace") () "end"))))
|
||||
:init
|
||||
(progn
|
||||
(associate-minor-mode "\\(/spec_helper\\|_spec\\)\\.rb$" 'rspec-mode)
|
||||
(associate-minor-mode "/\\.rspec$" 'rspec-mode)
|
||||
(associate-minor-mode "/\\.rake$" 'rake-mode)
|
||||
(associate-mode "/\\.rspec$" 'text-mode))
|
||||
:config
|
||||
(bind 'normal
|
||||
",tr" 'rspec-rerun
|
||||
",ta" 'rspec-verify-all
|
||||
",ts" 'rspec-verify-single
|
||||
",tv" 'rspec-verify))
|
||||
|
||||
(use-package robe
|
||||
:config
|
||||
(progn
|
||||
(after "company"
|
||||
(use-package company-robe
|
||||
:config (company--backend-on 'enh-ruby-mode-hook 'company-robe)))
|
||||
|
||||
(add-hook! 'enh-ruby-mode-hook
|
||||
(robe-mode 1)
|
||||
(after "auto-complete" (ac-robe-setup))
|
||||
(unless robe-running (robe-start 1))
|
||||
(my--ruby-load-file buffer-file-name))
|
||||
|
||||
(defun my--ruby-load-file (&optional file)
|
||||
(let ((file (or file buffer-file-name)))
|
||||
(when (and (eq major-mode 'enh-ruby-mode)
|
||||
(bound-and-true-p robe-running)
|
||||
(file-exists-p buffer-file-name))
|
||||
(ruby-load-file file))))
|
||||
(add-hook 'after-save-hook 'my--ruby-load-file)))))
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
(provide 'init-sh)
|
||||
|
||||
(after "popwin"
|
||||
(push '("*ansi-term*" :position bottom :height 0.45 :stick t) popwin:special-display-config)
|
||||
(push '("*terminal*" :position bottom :height 0.45 :stick t) popwin:special-display-config)
|
||||
(push '("*Async Shell Command*" :position bottom) popwin:special-display-config))
|
||||
|
||||
(my--cleanup-buffers-add "^\\*Shell Command Output\\*$")
|
||||
(my--cleanup-buffers-add "^\\*Async Shell Command\\*$")
|
||||
|
||||
;; Make shell scrips executable on save. Good!
|
||||
(add-hook 'after-save-hook 'executable-make-buffer-file-executable-if-script-p)
|
||||
|
||||
;; Color in *Shell Command Output*
|
||||
(require 'ansi-color)
|
||||
(defadvice display-message-or-buffer (before ansi-color activate)
|
||||
"Process ANSI color codes in shell output."
|
||||
(let ((buf (ad-get-arg 0)))
|
||||
(and (bufferp buf)
|
||||
(string= (buffer-name buf) "*Shell Command Output*")
|
||||
(with-current-buffer buf
|
||||
(ansi-color-apply-on-region (point-min) (point-max))))))
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
(provide 'init-swift)
|
||||
|
||||
;; (use-package swift-mode)
|
||||
|
||||
;; TODO: Set up emacs task runners for fruitstrap
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
(provide 'init-text)
|
||||
|
||||
(add-hook 'text-mode-hook 'turn-on-auto-fill)
|
||||
(add-hook 'prog-mode-hook 'enable-comment-hard-wrap)
|
||||
|
||||
(use-package markdown-mode
|
||||
:mode (("\\.md$" . markdown-mode)
|
||||
("/README$" . markdown-mode))
|
||||
:pre-load
|
||||
(progn
|
||||
;; Implement strike-through formatting
|
||||
(defvar markdown-regex-del "\\(^\\|[^\\]\\)\\(\\(~\\{2\\}\\)\\([^ \n \\]\\|[^ \n ]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(\\3\\)\\)")
|
||||
(defun markdown-insert-del ()
|
||||
(interactive)
|
||||
(let ((delim "~~"))
|
||||
(if (markdown-use-region-p)
|
||||
;; Active region
|
||||
(let ((bounds (markdown-unwrap-things-in-region
|
||||
(region-beginning) (region-end)
|
||||
markdown-regex-del 2 4)))
|
||||
(markdown-wrap-or-insert delim delim nil (car bounds) (cdr bounds)))
|
||||
;; Bold markup removal, bold word at point, or empty markup insertion
|
||||
(if (thing-at-point-looking-at markdown-regex-del)
|
||||
(markdown-unwrap-thing-at-point nil 2 4)
|
||||
(markdown-wrap-or-insert delim delim 'word nil nil))))))
|
||||
:config
|
||||
(let ((map markdown-mode-map))
|
||||
(bind '(normal visual) map
|
||||
",i" 'markdown-insert-image
|
||||
",l" 'markdown-insert-link
|
||||
",L" 'markdown-insert-reference-link-dwim
|
||||
",b" 'markdown-preview)
|
||||
|
||||
(bind 'normal map
|
||||
"[p" 'markdown-promote
|
||||
"]p" 'markdown-demote)
|
||||
|
||||
(bind 'insert map
|
||||
(kbd "M--") 'markdown-insert-hr)
|
||||
|
||||
(bind map
|
||||
(kbd "<backspace>") nil
|
||||
(kbd "<M-left>") nil
|
||||
(kbd "<M-right>") nil
|
||||
|
||||
(kbd "s-*") 'markdown-insert-list-item
|
||||
(kbd "s-b") 'markdown-insert-bold
|
||||
(kbd "s-i") 'markdown-insert-italic
|
||||
(kbd "s-`") 'markdown-insert-del)))
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
(provide 'init-tmux)
|
||||
|
||||
(defun my--tmux-send (command)
|
||||
(shell-command (format "tmux send-keys %s" command)))
|
||||
|
||||
(after "evil"
|
||||
(evil-define-interactive-code "<tmux>"
|
||||
"Ex tmux argument (a mix between <sh> <f> and <fsh>)"
|
||||
:ex-arg shell
|
||||
(list (when (evil-ex-p) (evil-ex-file-arg))))
|
||||
|
||||
(evil-ex-define-cmd "t" 'ex:tmux-run)
|
||||
(evil-define-command ex:tmux-run (&optional command bang)
|
||||
"Sends input to tmux. Use `bang' to append to tmux"
|
||||
(interactive "<tmux><!>")
|
||||
(my--tmux-send (concat (unless bang "C-u ")
|
||||
(shell-quote-argument command)
|
||||
(unless bang " Enter")))
|
||||
(when (evil-ex-p)
|
||||
(message "[Tmux] %s" command)))
|
||||
|
||||
(evil-ex-define-cmd "tcd" 'ex:tmux-chdir)
|
||||
(evil-define-command ex:tmux-chdir (&optional path bang)
|
||||
"CDs in tmux using `my--project-root'"
|
||||
(interactive "<f><!>")
|
||||
(let ((dir (shell-quote-argument
|
||||
(if (and path (not (s-blank? path)))
|
||||
(if (file-directory-p path)
|
||||
(file-truename path)
|
||||
(error "Directory doesn't exist %s" path))
|
||||
(my--project-root bang)))))
|
||||
(my--tmux-send (format "C-u cd Space %s Enter" (shell-quote-argument dir)))
|
||||
(when (evil-ex-p)
|
||||
(message "[Tmux] cd %s" dir)))))
|
||||
|
||||
|
|
@ -1,124 +0,0 @@
|
|||
(provide 'init-webdev)
|
||||
|
||||
(use-package rainbow-mode
|
||||
:defer t
|
||||
:init (add-hook 'scss-mode-hook 'rainbow-mode))
|
||||
|
||||
(use-package scss-mode
|
||||
:mode "\\.scss$"
|
||||
:config
|
||||
(progn
|
||||
(add-hook 'scss-mode-hook 'enable-tab-width-2)
|
||||
(add-hook 'scss-mode-hook 'ac-css-mode-setup)
|
||||
|
||||
(setq-default css-indent-offset 2)
|
||||
(setq scss-compile-at-save nil)
|
||||
|
||||
(bind '(normal visual) scss-mode-map "gQ" 'web-beautify-css)))
|
||||
|
||||
;;; HTML/Markup
|
||||
(use-package haml-mode :mode "\\.haml$")
|
||||
|
||||
(use-package web-mode
|
||||
:mode (("\\.\\(p\\)?htm\\(l\\)?$" . web-mode)
|
||||
("\\.tpl\\(\\.php\\)?$" . web-mode)
|
||||
("\\.erb$" . web-mode)
|
||||
("wp-content/themes/.+/.+\\.php$" . web-mode))
|
||||
:config
|
||||
(progn
|
||||
(add-hook 'web-mode-hook 'enable-tab-width-2)
|
||||
|
||||
(setq web-mode-ac-sources-alist '(("css" . (ac-source-css-property)))
|
||||
web-mode-markup-indent-offset 2
|
||||
web-mode-code-indent-offset 2
|
||||
web-mode-css-indent-offset 2
|
||||
web-mode-style-padding 2
|
||||
web-mode-script-padding 2
|
||||
web-mode-block-padding 2)
|
||||
|
||||
(bind web-mode-map (kbd "s-/") 'web-mode-comment-or-uncomment)
|
||||
(bind 'normal web-mode-map
|
||||
"zf" 'web-mode-fold-or-unfold
|
||||
",t" 'web-mode-element-rename)
|
||||
(bind '(normal visual) web-mode-map
|
||||
"gQ" 'web-beautify-html
|
||||
"]a" 'web-mode-attribute-next
|
||||
"]t" 'web-mode-tag-next
|
||||
"[t" 'web-mode-tag-previous
|
||||
"]T" 'web-mode-element-child
|
||||
"[T" 'web-mode-element-parent)))
|
||||
|
||||
(use-package emmet-mode
|
||||
:defer t
|
||||
:init
|
||||
(progn
|
||||
(add-hook 'scss-mode-hook 'emmet-mode)
|
||||
(add-hook 'web-mode-hook 'emmet-mode)
|
||||
(add-hook 'html-mode-hook 'emmet-mode)
|
||||
(add-hook 'haml-mode-hook 'emmet-mode)
|
||||
(add-hook 'nxml-mode-hook 'emmet-mode))
|
||||
:config
|
||||
(progn
|
||||
(setq emmet-move-cursor-between-quotes t)
|
||||
|
||||
(bind 'insert emmet-mode-keymap
|
||||
(kbd "s-e") 'emmet-expand-yas
|
||||
(kbd "s-E") 'emmet-expand-line)))
|
||||
|
||||
(use-package php-mode
|
||||
:mode "\\.\\(php\\|inc\\)$"
|
||||
:config
|
||||
(progn
|
||||
(add-hook! 'php-mode-hook (setq my-run-code-interpreter "php"))
|
||||
(setq php-template-compatibility nil)))
|
||||
|
||||
(use-package js2-mode :mode "\\.js$"
|
||||
:config
|
||||
(progn
|
||||
(setq-default js2-show-parse-errors nil)
|
||||
(setq-default js2-global-externs '("module" "require" "buster" "sinon" "assert"
|
||||
"refute" "setTimeout" "clearTimeout"
|
||||
"setInterval" "clearInterval" "location"
|
||||
"__dirname" "console" "JSON" "jQuery" "$"
|
||||
;; Launchbar API
|
||||
"LaunchBar" "File" "Action" "HTTP" "include"))
|
||||
|
||||
(bind '(normal visual) js2-mode-map "gQ" 'web-beautify-js)
|
||||
|
||||
(use-package js2-refactor
|
||||
;; :config
|
||||
;; TODO Set up keymaps
|
||||
)
|
||||
|
||||
(use-package tern
|
||||
:commands tern-mode
|
||||
;; replace auto-complete with tern-ac-complete only in js-mode
|
||||
:init (add-hook! 'js2-mode-hook
|
||||
(tern-mode t)
|
||||
(tern-ac-setup)
|
||||
(setq my-run-code-interpreter "node"))
|
||||
:config
|
||||
(progn
|
||||
(after "auto-complete"
|
||||
(require 'tern-auto-complete)
|
||||
(setq tern-ac-on-dot nil)
|
||||
(bind 'insert js2-mode-map
|
||||
[remap auto-complete] 'tern-ac-complete)
|
||||
(bind 'motion js2-mode-map
|
||||
"gd" 'tern-find-definition))
|
||||
|
||||
(after "company-tern"
|
||||
(add-to-list 'company-backends 'company-tern)
|
||||
;; (setq company-tern-meta-as-single-line t)
|
||||
;; (setq company-tern-property-marker "")
|
||||
;; (setq company-tooltip-align-annotations t)
|
||||
)))))
|
||||
|
||||
|
||||
(use-package web-beautify
|
||||
:commands (web-beautify-js web-beautify-css web-beautify-html)
|
||||
:config
|
||||
(progn
|
||||
(add-hook! 'scss-mode-hook (setenv "jsbeautify_indent_size" "2"))
|
||||
(add-hook! 'web-mode-hook (setenv "jsbeautify_indent_size" "4"))
|
||||
(add-hook! 'js2-mode-hook (setenv "jsbeautify_indent_size" "4"))))
|
||||
|
|
@ -1,128 +0,0 @@
|
|||
(provide 'init-yasnippet)
|
||||
|
||||
(use-package yasnippet
|
||||
:mode (("emacs\\.d/.+/snippets/" . snippet-mode))
|
||||
:pre-load
|
||||
(defvar yas-minor-mode-map
|
||||
;; Fix yasnippet keymaps so they only work in insert mode
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(bind 'insert map [(tab)] 'yas-expand)
|
||||
(bind 'insert map (kbd "TAB") 'yas-expand)
|
||||
(bind 'visual map (kbd "<backtab>") 'yas-insert-snippet)
|
||||
map))
|
||||
:init
|
||||
(progn
|
||||
(add-hook 'snippet-mode-hook 'disable-final-newline)
|
||||
(add-hook 'snippet-mode-hook 'yas-minor-mode)
|
||||
(add-hook 'text-mode-hook 'yas-minor-mode)
|
||||
(add-hook 'prog-mode-hook 'yas-minor-mode)
|
||||
;; (add-hook 'markdown-mode-hook 'yas-minor-mode)
|
||||
(add-hook 'org-mode-hook 'yas-minor-mode))
|
||||
:config
|
||||
(progn
|
||||
(setq yas-verbosity 0)
|
||||
(setq yas-indent-line 'auto)
|
||||
(setq yas-also-auto-indent-first-line t)
|
||||
(setq yas-wrap-around-region nil)
|
||||
;; Only load personal snippets
|
||||
(setq yas-snippet-dirs `(,my-snippets-dir))
|
||||
(setq yas-prompt-functions '(yas-ido-prompt yas-no-prompt))
|
||||
|
||||
(push '(snippet-mode :position bottom :stick t) popwin:special-display-config)
|
||||
|
||||
(yas-reload-all)
|
||||
|
||||
(after "auto-complete"
|
||||
(defadvice ac-expand (before advice-for-ac-expand activate)
|
||||
(when (yas-expand) (ac-stop))))
|
||||
|
||||
(after "evil"
|
||||
;; Exit snippets on ESC in normal mode
|
||||
(defadvice evil-force-normal-state (before evil-esc-quit-yasnippet activate)
|
||||
(yas-exit-all-snippets))
|
||||
;; Once you're in normal mode, you're out
|
||||
(add-hook 'evil-normal-state-entry-hook 'yas-abort-snippet)
|
||||
|
||||
;; Fixes: evil's visual-line mode gobbles up the newline on the right.
|
||||
;; This prevents that by essentially doing (1- (region-end)).
|
||||
(defadvice yas-expand-snippet (around yas-expand-snippet-visual-line activate)
|
||||
(if (evil-visual-line-state-p)
|
||||
(ad-set-arg 2 (1- (ad-get-arg 2)))) ad-do-it)
|
||||
|
||||
;; Fixes: visual-line includes indentation before the selection. This
|
||||
;; strips it out.
|
||||
(add-hook! 'yas-before-expand-snippet-hook
|
||||
(if (evil-visual-line-state-p)
|
||||
(setq-local yas-selected-text
|
||||
(replace-regexp-in-string
|
||||
"\\(^ *\\|\n? $\\)" ""
|
||||
(buffer-substring-no-properties (region-beginning)
|
||||
(1- (region-end)))))))
|
||||
;; Previous hook causes yas-selected-text to persist between expansions.
|
||||
;; This little hack gets around it.
|
||||
(add-hook! 'yas-after-exit-snippet-hook
|
||||
(setq-local yas-selected-text nil))
|
||||
|
||||
(evil-ex-define-cmd "snip[pets]" 'ex:snippets)
|
||||
(evil-define-operator ex:snippets (beg end &optional name)
|
||||
:motion nil
|
||||
:move-point nil
|
||||
:type exclusive
|
||||
:repeat nil
|
||||
(interactive "<r><a>")
|
||||
(if (and beg end)
|
||||
(yas-insert-snippet)
|
||||
(if name
|
||||
(popwin:find-file (concat my-snippets-dir
|
||||
(symbol-name major-mode) "/" name))
|
||||
(yas-visit-snippet-file)))))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
;; Snippet helpers
|
||||
(defvaralias '% 'yas-selected-text)
|
||||
;; Shorthand defun for snippets: prepends a newline to `yas-selected-text'
|
||||
;; IF it contains more than one line.
|
||||
(defun !% ()
|
||||
(when %
|
||||
(if (> (s-count-lines %) 1)
|
||||
(concat "\n" %)
|
||||
(s-trim %))))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
;; Inter-field navigation
|
||||
(defun my/yas-goto-start-of-field ()
|
||||
(interactive)
|
||||
(let* ((snippet (car (yas--snippets-at-point)))
|
||||
(position (yas--field-start (yas--snippet-active-field snippet))))
|
||||
(if (= (point) position)
|
||||
(move-beginning-of-line 1)
|
||||
(goto-char position))))
|
||||
(defun my/yas-goto-end-of-field ()
|
||||
(interactive)
|
||||
(let* ((snippet (car (yas--snippets-at-point)))
|
||||
(position (yas--field-end (yas--snippet-active-field snippet))))
|
||||
(if (= (point) position)
|
||||
(move-end-of-line 1)
|
||||
(goto-char position))))
|
||||
|
||||
;; Prevents Yas from stepping on my toes when I use backspace
|
||||
(defun my/yas-clear-field (&optional field)
|
||||
(interactive)
|
||||
(let ((field (or field (and yas--active-field-overlay
|
||||
(overlay-buffer yas--active-field-overlay)
|
||||
(overlay-get yas--active-field-overlay 'yas--field)))))
|
||||
(cond ((and field
|
||||
(not (yas--field-modified-p field))
|
||||
(eq (point) (marker-position (yas--field-start field))))
|
||||
(yas--skip-and-clear field))
|
||||
(t (delete-char -1)))))
|
||||
|
||||
;; keybinds
|
||||
(bind yas-keymap
|
||||
"C-e" 'my/yas-goto-end-of-field
|
||||
"C-a" 'my/yas-goto-start-of-field
|
||||
"<s-right>" 'my/yas-goto-end-of-field
|
||||
"<s-left>" 'my/yas-goto-start-of-field
|
||||
"DEL" 'my/yas-clear-field)))
|
||||
|
|
@ -1,172 +0,0 @@
|
|||
(provide 'my-bindings)
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; Global keymaps ;;
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(bind (kbd "M-x") 'smex
|
||||
(kbd "M-X") 'smex-major-mode-commands
|
||||
(kbd "C-;") 'eval-expression
|
||||
(kbd "C-`") 'popwin:toggle-popup-window
|
||||
|
||||
(kbd "s-=") 'text-scale-increase
|
||||
(kbd "s--") 'text-scale-decrease
|
||||
(kbd "s-w") 'evil-window-delete
|
||||
(kbd "s-/") 'evilnc-comment-or-uncomment-lines)
|
||||
|
||||
;; Faster scrolling
|
||||
(bind 'motion my-mode-map
|
||||
(kbd "s-j") "6j"
|
||||
(kbd "s-k") "6k")
|
||||
|
||||
(bind 'normal my-mode-map
|
||||
(kbd "s-o") 'ido-find-file
|
||||
(kbd "s-d") 'dash-at-point)
|
||||
|
||||
(bind 'visual my-mode-map
|
||||
(kbd "s-r") 'my-run-code-region
|
||||
(kbd "s-R") 'my-send-region-to-repl)
|
||||
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; Local keymaps ;;
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(bind '(normal visual) my-mode-map
|
||||
"\\" 'evil-execute-in-god-state ; localleader
|
||||
";" 'evil-ex
|
||||
"X" 'evil-exchange
|
||||
|
||||
"g SPC" (λ (call-interactively
|
||||
(if (evil-visual-line-state-p)
|
||||
'evil-ace-jump-line-mode
|
||||
'evil-ace-jump-char-mode)))
|
||||
"g w" 'evil-ace-jump-word-mode ; overwrites evil-fill
|
||||
"g l" 'evil-ace-jump-line-mode
|
||||
"g s" 'evil-ace-jump-two-chars-mode
|
||||
"g t" 'ace-window
|
||||
"g T" (λ (ace-window 4))
|
||||
|
||||
"] e" 'next-error
|
||||
"[ e" 'previous-error
|
||||
"] g" 'git-gutter+-next-hunk
|
||||
"[ g" 'git-gutter+-previous-hunk
|
||||
|
||||
"] \\" 'er/expand-region
|
||||
"[ \\" 'er/contract-region)
|
||||
|
||||
(bind 'normal my-mode-map
|
||||
", a" 'helm-projectile-find-other-file
|
||||
", e" 'ido-find-file
|
||||
", E" 'my:init-files
|
||||
", f" 'helm-projectile-find-file-dwim
|
||||
", g" 'git-gutter+-show-hunk
|
||||
", h" 'helm-apropos
|
||||
", m" 'helm-recentf
|
||||
", M" 'helm-projectile-recentf ; recent PROJECT files
|
||||
", p" 'helm-projectile-switch-project
|
||||
", y" 'helm-show-kill-ring
|
||||
", ;" 'helm-semantic-or-imenu
|
||||
", ," 'helm-projectile-switch-to-buffer
|
||||
", <" 'helm-mini
|
||||
", ]" 'helm-etags-select
|
||||
", /" 'helm-projectile-find-file
|
||||
", ." 'helm-resume
|
||||
|
||||
;; behave like D and C; yank to end of line
|
||||
"Y" (λ (evil-yank (point) (point-at-eol)))
|
||||
|
||||
"z x" 'kill-this-buffer
|
||||
"Z X" 'bury-buffer
|
||||
|
||||
"] b" 'next-buffer
|
||||
"[ b" 'previous-buffer
|
||||
"] p" 'persp-next
|
||||
"[ p" 'persp-prev
|
||||
|
||||
;; winner-mode: window layout undo/redo (see init-core.el)
|
||||
"C-w u" 'winner-undo
|
||||
"C-w C-u" 'winner-undo
|
||||
"C-w C-r" 'winner-redo
|
||||
|
||||
;; Increment/decrement number under cursor
|
||||
"C-=" 'evil-numbers/inc-at-pt
|
||||
"C--" 'evil-numbers/dec-at-pt)
|
||||
|
||||
(bind 'visual my-mode-map
|
||||
", =" 'align-regexp
|
||||
|
||||
;; vnoremap < <gv
|
||||
"<" (λ (evil-shift-left (region-beginning) (region-end))
|
||||
(evil-normal-state)
|
||||
(evil-visual-restore))
|
||||
;; vnoremap > >gv
|
||||
">" (λ (evil-shift-right (region-beginning) (region-end))
|
||||
(evil-normal-state)
|
||||
(evil-visual-restore)))
|
||||
|
||||
(bind 'god my-mode-map
|
||||
;; <localleader>
|
||||
"\\" 'neotree-toggle
|
||||
":" 'linum-mode
|
||||
"=" 'toggle-transparency
|
||||
"e" 'evil-emacs-state
|
||||
|
||||
"]" 'next-buffer
|
||||
"[" 'previous-buffer
|
||||
|
||||
"o f" 'my-send-dir-to-finder
|
||||
"o u" 'my-send-to-transmit
|
||||
"o l" 'my-send-to-launchbar
|
||||
"o L" 'my-send-dir-to-launchbar
|
||||
|
||||
;; tmux: cd (default-directory)
|
||||
"o t" (λ (my:tmux-chdir nil t))
|
||||
;; tmux: cd [project root]
|
||||
"o T" 'my:tmux-chdir)
|
||||
|
||||
(bind 'emacs [escape] 'evil-normal-state)
|
||||
|
||||
(bind 'insert my-mode-map
|
||||
"<M-kp-delete>" (λ (evil-forward-word) (evil-delete-backward-word))
|
||||
|
||||
;; Newline magic
|
||||
"<backspace>" 'backward-delete-char-untabify
|
||||
"<S-backspace>" 'backward-delete-char
|
||||
"<C-return>" 'evil-ret-and-indent
|
||||
"<M-return>" (kbd "<return> DEL") ; newline and dedent
|
||||
|
||||
;; Textmate-esque indent shift left/right
|
||||
"s-[" (kbd "C-o m l C-o I DEL C-o ` l")
|
||||
"s-]" (λ (evil-shift-right (point-at-bol) (point-at-eol)))
|
||||
"<backtab>" (kbd "s-["))
|
||||
|
||||
;; Enable TAB to do matchit
|
||||
(bind '(normal visual) evil-matchit-mode-map [tab] 'evilmi-jump-items)
|
||||
|
||||
;; Rotate-text (see elisp/rotate-text.el)
|
||||
(bind 'normal my-mode-map "!" 'rotate-word-at-point)
|
||||
(bind 'visual my-mode-map "!" 'rotate-region)
|
||||
|
||||
;; Additional operators
|
||||
(bind 'motion my-mode-map "g x" 'my-scratch-buffer) ; send to scratch buffer
|
||||
|
||||
;; Easy escape from insert mode (more responsive than using key-chord-define)
|
||||
(bind 'insert "j" #'my--maybe-exit-insert-mode)
|
||||
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; Plugin/mode keymaps ;;
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
;; Peek at file from dired
|
||||
(bind dired-mode-map "o" (λ (popwin:find-file (dired-get-file-for-visit))))
|
||||
|
||||
;; Evil registers ;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(after "help-mode"
|
||||
(bind 'normal help-mode-map
|
||||
"]]" 'help-go-forward
|
||||
"[[" 'help-go-back))
|
||||
|
||||
(evil-make-overriding-map my-mode-map nil)
|
||||
|
|
@ -1,126 +0,0 @@
|
|||
(provide 'my-settings)
|
||||
|
||||
;;;; Modes 'n hooks ;;;;;;;;;;;;;;;;;
|
||||
(associate-mode "/LICENSE[^/]*$" 'text-mode)
|
||||
(associate-mode "zsh\\(env\\|rc\\)?$" 'sh-mode)
|
||||
(associate-mode "z\\(profile\\|login\\|logout\\)?$" 'sh-mode)
|
||||
(associate-mode "zsh/" 'sh-mode)
|
||||
(associate-mode "\\.applescript$" 'applescript-mode)
|
||||
(associate-mode "Cask$" 'emacs-lisp-mode)
|
||||
(associate-mode "\\.el\\.gz$" 'emacs-lisp-mode)
|
||||
(associate-mode "/Makefile$" 'makefile-gmake-mode)
|
||||
(associate-mode "\\.plist$" 'nxml-mode)
|
||||
|
||||
;; (setenv "SHELL" (s-trim (shell-command-to-string "which zsh")))
|
||||
(setenv "SHELL" "/usr/local/bin/zsh")
|
||||
(setenv "EMACS" "1")
|
||||
|
||||
;; show-paren faces
|
||||
(set-face-background 'show-paren-match nil)
|
||||
(set-face-foreground 'show-paren-match "orange")
|
||||
(set-face-attribute 'show-paren-match nil :weight 'extra-bold)
|
||||
|
||||
(set-register ?. "~/.dotfiles/")
|
||||
(set-register ?d "~/Dropbox/Projects/")
|
||||
(set-register ?@ "~/.emacs.d/init.el")
|
||||
(set-register ?% "~/.emacs.d/init.el")
|
||||
|
||||
(add-hook 'help-mode-hook 'visual-line-mode)
|
||||
|
||||
;; Performance checks
|
||||
(add-hook! 'find-file-hook
|
||||
;; If file is oversized...
|
||||
(when (> (buffer-size) (* 1024 1024))
|
||||
(setq buffer-read-only t)
|
||||
(buffer-disable-undo)
|
||||
(fundamental-mode)
|
||||
(visual-line-mode)))
|
||||
|
||||
|
||||
;;;; Keymap Fixes ;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; This section is dedicated to keymaps that "fix" certain keys so
|
||||
;; that they behave more like vim (or how I like it).
|
||||
|
||||
;; Restores "dumb" indentation to the tab key. This rustles a lot of
|
||||
;; peoples' jimmies, apparently, but it's how I like it.
|
||||
(bind 'insert (kbd "TAB") 'my.dumb-indent)
|
||||
;; Except for lisp
|
||||
(bind 'insert lisp-mode-map [remap my.dumb-indent] 'indent-for-tab-command)
|
||||
(bind 'insert emacs-lisp-mode-map [remap my.dumb-indent] 'indent-for-tab-command)
|
||||
|
||||
;; Highjacks backspace and space to:
|
||||
;; a) expand spaces between delimiters intelligently: (|) -> ( | )
|
||||
;; b) the reverse of A: ( | ) -> (|)
|
||||
;; c) allow backspace to delete indented blocks intelligently
|
||||
;; d) and not do any of this magic when inside a string
|
||||
(bind 'insert
|
||||
(kbd "SPC") 'my.inflate-space-maybe
|
||||
[remap backward-delete-char-untabify] 'my.deflate-space-maybe
|
||||
[remap newline] 'my.newline-and-indent
|
||||
|
||||
;; Smarter move-to-beginning-of-line
|
||||
[remap move-beginning-of-line] 'my.move-to-bol
|
||||
|
||||
;; Restore bash-esque keymaps in insert mode; C-w and C-a already exist
|
||||
"\C-e" 'my.move-to-eol
|
||||
"\C-u" 'my.backward-kill-to-bol-and-indent
|
||||
|
||||
;; Fixes delete
|
||||
(kbd "<kp-delete>") 'delete-char
|
||||
|
||||
;; Textmate-esque insert-line before/after
|
||||
(kbd "<s-return>") 'evil-open-below
|
||||
(kbd "<S-s-return>") 'evil-open-above)
|
||||
|
||||
;; Fix osx keymappings and then some
|
||||
(bind 'insert
|
||||
(kbd "<s-left>") 'my.move-to-bol
|
||||
(kbd "<s-right>") 'my.move-to-eol
|
||||
(kbd "<s-up>") 'beginning-of-buffer
|
||||
(kbd "<s-down>") 'end-of-buffer
|
||||
(kbd "<s-backspace>") 'my.backward-kill-to-bol-and-indent)
|
||||
|
||||
(add-hook! 'ido-setup-hook
|
||||
(bind ido-completion-map
|
||||
(kbd "<backspace>") 'ido-delete-backward-updir
|
||||
"\C-w" 'ido-delete-backward-word-updir))
|
||||
|
||||
;; Make ESC quit all the things
|
||||
(bind (list minibuffer-local-map
|
||||
minibuffer-local-ns-map
|
||||
minibuffer-local-completion-map
|
||||
minibuffer-local-must-match-map
|
||||
minibuffer-local-isearch-map) [escape] 'my--minibuffer-quit)
|
||||
(bind 'emacs [escape] 'my--minibuffer-quit)
|
||||
(bind 'god [escape] 'evil-god-state-bail)
|
||||
(bind 'normal evil-command-window-mode-map [escape] 'kill-buffer-and-window)
|
||||
(bind evil-ex-map [escape] 'my--minibuffer-quit)
|
||||
|
||||
(bind (list evil-ex-search-keymap minibuffer-local-map)
|
||||
"\C-w" 'evil-delete-backward-word)
|
||||
(bind minibuffer-local-map
|
||||
"\C-u" 'evil-delete-whole-line)
|
||||
;; Close help/compilation windows with escape
|
||||
|
||||
;; Redefine to get rid of that silly delete-other-windows nonsense
|
||||
(defun keyboard-escape-quit ()
|
||||
(interactive)
|
||||
(cond ((eq last-command 'mode-exited) nil)
|
||||
((region-active-p)
|
||||
(deactivate-mark))
|
||||
((> (minibuffer-depth) 0)
|
||||
(abort-recursive-edit))
|
||||
(current-prefix-arg
|
||||
nil)
|
||||
((> (recursion-depth) 0)
|
||||
(exit-recursive-edit))
|
||||
(buffer-quit-function
|
||||
(funcall buffer-quit-function))
|
||||
((string-match "^ \\*" (buffer-name (current-buffer)))
|
||||
(bury-buffer))))
|
||||
|
||||
(defun my-emacs-is-not-kill ()
|
||||
(interactive)
|
||||
(message "Gee, I dunno Brain..."))
|
||||
|
||||
(if is-mac (global-set-key (kbd "s-q") 'my-emacs-is-not-kill))
|
||||
Loading…
Add table
Add a link
Reference in a new issue