No NARF, only DOOM
This commit is contained in:
Henrik Lissner
parent
a984bf4f26
commit
ad225d2591
104 changed files with 1404 additions and 1409 deletions
|
|
@ -15,17 +15,17 @@
|
|||
;; debug
|
||||
"<f9>" 'what-face
|
||||
|
||||
"M-b" 'narf:build
|
||||
"M-t" 'narf:tab-create
|
||||
"M-T" 'narf/tab-display
|
||||
"M-b" 'doom:build
|
||||
"M-t" 'doom:tab-create
|
||||
"M-T" 'doom/tab-display
|
||||
"A-`" 'os-switch-to-term
|
||||
"C-`" 'narf/popup-toggle
|
||||
"C-~" 'narf:repl
|
||||
"C-`" 'doom/popup-toggle
|
||||
"C-~" 'doom:repl
|
||||
|
||||
"M-w" 'narf/close-window-or-tab
|
||||
"M-w" 'doom/close-window-or-tab
|
||||
"M-W" 'delete-frame
|
||||
"M-n" 'narf/new-buffer
|
||||
"M-N" 'narf/new-frame
|
||||
"M-n" 'doom/new-buffer
|
||||
"M-N" 'doom/new-frame
|
||||
|
||||
;; Simpler window navigation
|
||||
"C-j" 'evil-window-down
|
||||
|
|
@ -33,28 +33,28 @@
|
|||
"C-h" 'evil-window-left
|
||||
"C-l" 'evil-window-right
|
||||
|
||||
"A-j" 'narf/evil-window-resize-d
|
||||
"A-k" 'narf/evil-window-resize-u
|
||||
"A-h" 'narf/evil-window-resize-l
|
||||
"A-l" 'narf/evil-window-resize-r
|
||||
"A-j" 'doom/evil-window-resize-d
|
||||
"A-k" 'doom/evil-window-resize-u
|
||||
"A-h" 'doom/evil-window-resize-l
|
||||
"A-l" 'doom/evil-window-resize-r
|
||||
|
||||
"C-<escape>" 'evil-emacs-state
|
||||
:e "C-<escape>" 'evil-normal-state
|
||||
|
||||
:m "M-1" (λ! (narf:switch-to-tab 0))
|
||||
:m "M-2" (λ! (narf:switch-to-tab 1))
|
||||
:m "M-3" (λ! (narf:switch-to-tab 2))
|
||||
:m "M-4" (λ! (narf:switch-to-tab 3))
|
||||
:m "M-5" (λ! (narf:switch-to-tab 4))
|
||||
:m "M-6" (λ! (narf:switch-to-tab 5))
|
||||
:m "M-7" (λ! (narf:switch-to-tab 6))
|
||||
:m "M-8" (λ! (narf:switch-to-tab 7))
|
||||
:m "M-9" (λ! (narf:switch-to-tab 8))
|
||||
:m "M-1" (λ! (doom:switch-to-tab 0))
|
||||
:m "M-2" (λ! (doom:switch-to-tab 1))
|
||||
:m "M-3" (λ! (doom:switch-to-tab 2))
|
||||
:m "M-4" (λ! (doom:switch-to-tab 3))
|
||||
:m "M-5" (λ! (doom:switch-to-tab 4))
|
||||
:m "M-6" (λ! (doom:switch-to-tab 5))
|
||||
:m "M-7" (λ! (doom:switch-to-tab 6))
|
||||
:m "M-8" (λ! (doom:switch-to-tab 7))
|
||||
:m "M-9" (λ! (doom:switch-to-tab 8))
|
||||
|
||||
(:when IS-MAC
|
||||
"<A-left>" 'backward-word
|
||||
"<A-right>" 'forward-word
|
||||
"<M-backspace>" 'narf/backward-kill-to-bol-and-indent
|
||||
"<M-backspace>" 'doom/backward-kill-to-bol-and-indent
|
||||
"A-SPC" 'just-one-space
|
||||
"M-a" 'mark-whole-buffer
|
||||
"M-c" 'evil-yank
|
||||
|
|
@ -64,19 +64,19 @@
|
|||
"M-v" 'clipboard-yank
|
||||
"M-z" 'undo
|
||||
"M-Z" 'redo
|
||||
"C-M-f" 'narf:toggle-fullscreen
|
||||
"C-M-f" 'doom:toggle-fullscreen
|
||||
|
||||
:m "M-j" 'narf/multi-next-line
|
||||
:m "M-k" 'narf/multi-previous-line
|
||||
:m "M-j" 'doom/multi-next-line
|
||||
:m "M-k" 'doom/multi-previous-line
|
||||
|
||||
:n "M-r" 'narf:eval-buffer
|
||||
:v "M-r" 'narf:eval-region
|
||||
:n "M-r" 'doom:eval-buffer
|
||||
:v "M-r" 'doom:eval-region
|
||||
|
||||
:ni "<M-f1>" 'narf/dash-at-pt
|
||||
:ni "<M-f1>" 'doom/dash-at-pt
|
||||
|
||||
;; Textmate-esque indent shift left/right
|
||||
:i "M-]" 'narf/smart-indent
|
||||
:i "M-[" 'narf/dumb-dedent
|
||||
:i "M-]" 'doom/smart-indent
|
||||
:i "M-[" 'doom/dumb-dedent
|
||||
|
||||
;; Restore osx text objects
|
||||
:i "<A-backspace>" 'evil-delete-backward-word
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
|
||||
:m ";" 'evil-ex
|
||||
(:leader
|
||||
:nv "," 'narf/helm-buffers-dwim
|
||||
:nv "," 'doom/helm-buffers-dwim
|
||||
:nv "<" 'helm-buffers-list
|
||||
:nv "." 'helm-find-files
|
||||
:nv ">" 'helm-projectile-find-file-in-known-projects
|
||||
|
|
@ -100,32 +100,32 @@
|
|||
|
||||
:n "h" 'help-command
|
||||
:nv "p" 'helm-show-kill-ring
|
||||
:n "R" 'narf/reset-theme
|
||||
:n "e" 'narf/flycheck-errors
|
||||
:n "R" 'doom/reset-theme
|
||||
:n "e" 'doom/flycheck-errors
|
||||
:n "s" 'yas-visit-snippet-file
|
||||
:n "S" 'narf/yas-find-file
|
||||
:n "S" 'doom/yas-find-file
|
||||
:n "D" 'vc-annotate
|
||||
(:prefix "d"
|
||||
:n "." 'narf/vcs-show-hunk
|
||||
:n "." 'doom/vcs-show-hunk
|
||||
:n "/" 'vc-diff
|
||||
:n "s" 'narf/vcs-stage-hunk
|
||||
:n "r" 'narf/vcs-revert-hunk)
|
||||
:n "s" 'doom/vcs-stage-hunk
|
||||
:n "r" 'doom/vcs-revert-hunk)
|
||||
|
||||
:n "b" 'helm-bookmarks
|
||||
:nv "l" 'narf/nlinum-toggle
|
||||
:nv "l" 'doom/nlinum-toggle
|
||||
|
||||
:nv "qq" 'evil-save-and-quit
|
||||
:nv "QQ" 'narf/kill-all-buffers-do-not-remember
|
||||
:nv "QQ" 'doom/kill-all-buffers-do-not-remember
|
||||
|
||||
;; Quick access to my dotfiles and emacs.d
|
||||
:nv "E" 'narf/helm-find-in-emacsd
|
||||
:nv "\\" 'narf/helm-find-in-dotfiles
|
||||
:nv "E" 'doom/helm-find-in-emacsd
|
||||
:nv "\\" 'doom/helm-find-in-dotfiles
|
||||
|
||||
;; Tmux
|
||||
(:prefix "t"
|
||||
:n "." 'narf/tmux-cd-to-here
|
||||
:n "/" 'narf/tmux-cd-to-project
|
||||
:v "r" 'narf:tmux)
|
||||
:n "." 'doom/tmux-cd-to-here
|
||||
:n "/" 'doom/tmux-cd-to-project
|
||||
:v "r" 'doom:tmux)
|
||||
|
||||
;; Open with O/S
|
||||
:n "O" 'os-reveal
|
||||
|
|
@ -141,22 +141,22 @@
|
|||
:n "T" 'os-switch-to-term-and-cd)
|
||||
|
||||
;; Org notes
|
||||
:n "X" 'narf/org
|
||||
:n "X" 'doom/org
|
||||
(:prefix "x"
|
||||
:n "." 'narf/org-find-file
|
||||
:n "/" 'narf/org-find-file-in-notes
|
||||
:n "e" 'narf/org-find-exported-file))
|
||||
:n "." 'doom/org-find-file
|
||||
:n "/" 'doom/org-find-file-in-notes
|
||||
:n "e" 'doom/org-find-exported-file))
|
||||
|
||||
(:localleader
|
||||
:n "\\" 'narf/neotree
|
||||
:n "\\" 'doom/neotree
|
||||
:n "]" 'imenu-list-minor-mode
|
||||
:n "b" 'narf:build
|
||||
:n "R" 'narf:repl
|
||||
:v "R" 'narf:repl-eval
|
||||
:v "r" 'narf:eval-region
|
||||
:n "b" 'doom:build
|
||||
:n "R" 'doom:repl
|
||||
:v "R" 'doom:repl-eval
|
||||
:v "r" 'doom:eval-region
|
||||
(:prefix "r"
|
||||
:n "e" 'emr-show-refactor-menu
|
||||
:n "r" 'narf:eval-buffer))
|
||||
:n "r" 'doom:eval-buffer))
|
||||
|
||||
:nv "K" 'smart-up
|
||||
|
||||
|
|
@ -164,24 +164,24 @@
|
|||
:n "=" (λ! (save-excursion (call-interactively 'evil-indent)))
|
||||
:v "=" 'evil-indent
|
||||
|
||||
:n "zr" 'narf/evil-open-folds
|
||||
:n "zm" 'narf/evil-close-folds
|
||||
:n "zx" 'narf/kill-real-buffer
|
||||
:n "zr" 'doom/evil-open-folds
|
||||
:n "zm" 'doom/evil-close-folds
|
||||
:n "zx" 'doom/kill-real-buffer
|
||||
:n "ZX" 'bury-buffer
|
||||
|
||||
;; These are intentionally reversed
|
||||
:n "]b" 'narf/next-real-buffer
|
||||
:n "[b" 'narf/previous-real-buffer
|
||||
:n "]b" 'doom/next-real-buffer
|
||||
:n "[b" 'doom/previous-real-buffer
|
||||
|
||||
:m "]d" 'narf/vcs-next-hunk
|
||||
:m "[d" 'narf/vcs-prev-hunk
|
||||
:m "]e" 'narf/flycheck-next-error
|
||||
:m "[e" 'narf/flycheck-previous-error
|
||||
:m "]d" 'doom/vcs-next-hunk
|
||||
:m "[d" 'doom/vcs-prev-hunk
|
||||
:m "]e" 'doom/flycheck-next-error
|
||||
:m "[e" 'doom/flycheck-previous-error
|
||||
;; Switch tabs
|
||||
:n "]w" 'narf:switch-to-tab-right
|
||||
:n "[w" 'narf:switch-to-tab-left
|
||||
:m "gt" 'narf:switch-to-tab-right
|
||||
:m "gT" 'narf:switch-to-tab-left
|
||||
:n "]w" 'doom:switch-to-tab-right
|
||||
:n "[w" 'doom:switch-to-tab-left
|
||||
:m "gt" 'doom:switch-to-tab-right
|
||||
:m "gT" 'doom:switch-to-tab-left
|
||||
|
||||
;; Increment/decrement number under cursor
|
||||
:n "g=" 'evil-numbers/inc-at-pt
|
||||
|
|
@ -192,17 +192,17 @@
|
|||
(call-interactively 'find-file-at-point)
|
||||
(helm-mode 1))
|
||||
|
||||
:m "gD" 'narf/find-def
|
||||
:n "gp" 'narf/reselect-paste
|
||||
:m "gD" 'doom/find-def
|
||||
:n "gp" 'doom/reselect-paste
|
||||
:n "gc" 'evil-commentary
|
||||
:n "gx" 'evil-exchange
|
||||
:n "gr" 'narf:eval-region
|
||||
:n "gR" 'narf:eval-buffer
|
||||
:v "gR" 'narf:eval-region-and-replace
|
||||
:n "gr" 'doom:eval-region
|
||||
:n "gR" 'doom:eval-buffer
|
||||
:v "gR" 'doom:eval-region-and-replace
|
||||
:m "g]" 'smart-right
|
||||
:m "g[" 'smart-left
|
||||
:v "@" 'narf/evil-macro-on-all-lines
|
||||
:n "g@" 'narf/evil-macro-on-all-lines
|
||||
:v "@" 'doom/evil-macro-on-all-lines
|
||||
:n "g@" 'doom/evil-macro-on-all-lines
|
||||
|
||||
:v "." 'evil-repeat
|
||||
|
||||
|
|
@ -240,7 +240,7 @@
|
|||
|
||||
;; Textmate-esque newlines
|
||||
:i "<backspace>" 'backward-delete-char-untabify
|
||||
:i "<M-backspace>" 'narf/backward-kill-to-bol-and-indent
|
||||
:i "<M-backspace>" 'doom/backward-kill-to-bol-and-indent
|
||||
:i "<C-return>" 'evil-ret-and-indent
|
||||
|
||||
;; Emacsien motions for insert mode
|
||||
|
|
@ -256,20 +256,20 @@
|
|||
:n "!" 'rotate-text
|
||||
|
||||
(:map evil-window-map ; prefix "C-w"
|
||||
"u" 'narf/undo-window-change
|
||||
"u" 'doom/undo-window-change
|
||||
|
||||
;; Jump to new splits
|
||||
"s" 'narf/evil-window-split
|
||||
"v" 'narf/evil-window-vsplit
|
||||
"s" 'doom/evil-window-split
|
||||
"v" 'doom/evil-window-vsplit
|
||||
|
||||
;; Move window in one step
|
||||
"H" (λ! (narf/evil-window-move 'left))
|
||||
"J" (λ! (narf/evil-window-move 'down))
|
||||
"K" (λ! (narf/evil-window-move 'up))
|
||||
"L" (λ! (narf/evil-window-move 'right))
|
||||
"H" (λ! (doom/evil-window-move 'left))
|
||||
"J" (λ! (doom/evil-window-move 'down))
|
||||
"K" (λ! (doom/evil-window-move 'up))
|
||||
"L" (λ! (doom/evil-window-move 'right))
|
||||
|
||||
"C-u" 'narf/undo-window-change
|
||||
"C-r" 'narf/redo-window-change
|
||||
"C-u" 'doom/undo-window-change
|
||||
"C-r" 'doom/redo-window-change
|
||||
"C-h" 'evil-window-left
|
||||
"C-j" 'evil-window-down
|
||||
"C-k" 'evil-window-up
|
||||
|
|
@ -289,17 +289,17 @@
|
|||
|
||||
;; `yasnippet'
|
||||
:i [(tab)] 'yas-expand
|
||||
:v "<backtab>" 'narf/yas-insert-snippet
|
||||
:v "<backtab>" 'doom/yas-insert-snippet
|
||||
|
||||
;; `auto-yasnippet'
|
||||
:i "<C-tab>" 'aya-expand
|
||||
:nv "<C-tab>" 'aya-create
|
||||
|
||||
;; Vim omni-complete emulation
|
||||
:i "C-SPC" 'narf/company-complete
|
||||
:i "C-SPC" 'doom/company-complete
|
||||
(:prefix "C-x"
|
||||
:i "C-l" 'narf/company-whole-lines
|
||||
:i "C-k" 'narf/company-dict-or-keywords
|
||||
:i "C-l" 'doom/company-whole-lines
|
||||
:i "C-k" 'doom/company-dict-or-keywords
|
||||
:i "C-f" 'company-files
|
||||
:i "C-]" 'company-tags
|
||||
:i "s" 'company-ispell
|
||||
|
|
@ -320,7 +320,7 @@
|
|||
"C-S-s" 'company-search-candidates
|
||||
"C-s" 'company-filter-candidates
|
||||
"C-SPC" 'company-complete-common-or-cycle
|
||||
[tab] 'narf/company-complete-common-or-complete-full
|
||||
[tab] 'doom/company-complete-common-or-complete-full
|
||||
"<backtab>" 'company-select-previous
|
||||
[escape] (λ! (company-abort) (evil-normal-state 1))
|
||||
"<C-return>" 'helm-company)
|
||||
|
|
@ -331,7 +331,7 @@
|
|||
|
||||
(:after help-mode
|
||||
(:map help-map
|
||||
"e" 'narf/popup-messages)
|
||||
"e" 'doom/popup-messages)
|
||||
(:map help-mode-map
|
||||
:n "]]" 'help-go-forward
|
||||
:n "[[" 'help-go-back)))
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
;;; my-commands.el
|
||||
|
||||
(evil-define-operator narf:evil-ex-global (beg end pattern command &optional invert)
|
||||
(evil-define-operator doom:evil-ex-global (beg end pattern command &optional invert)
|
||||
"Rewritten :g[lobal] that will highlight buffer matches. Takes the same arguments."
|
||||
:motion mark-whole-buffer :move-point nil
|
||||
(interactive "<r><g//><!>")
|
||||
(evil-ex-global beg end pattern command invert))
|
||||
|
||||
(evil-define-operator narf:align (&optional beg end bang pattern)
|
||||
(evil-define-operator doom:align (&optional beg end bang pattern)
|
||||
"Ex interface to `align-regexp'. Accepts vim-style regexps."
|
||||
(interactive "<r><!><//>")
|
||||
(align-regexp
|
||||
|
|
@ -18,87 +18,87 @@
|
|||
1 1))
|
||||
|
||||
;;; Rewritten commands
|
||||
(ex! "g[lobal]" 'narf:evil-ex-global)
|
||||
(ex! "g[lobal]" 'doom:evil-ex-global)
|
||||
|
||||
;;; Custom commands
|
||||
;; Emacs utilities
|
||||
(ex! "echo" 'narf:echo)
|
||||
(ex! "echo" 'doom:echo)
|
||||
(ex! "minor" 'helm-describe-modes) ; list minor modes
|
||||
;; Quick mapping keys to commands, allows :nmap \m !make
|
||||
(ex! "imap" 'narf:imap)
|
||||
(ex! "mmap" 'narf:mmap)
|
||||
(ex! "nmap" 'narf:nmap)
|
||||
(ex! "omap" 'narf:omap)
|
||||
(ex! "vmap" 'narf:vmap)
|
||||
(ex! "imap" 'doom:imap)
|
||||
(ex! "mmap" 'doom:mmap)
|
||||
(ex! "nmap" 'doom:nmap)
|
||||
(ex! "omap" 'doom:omap)
|
||||
(ex! "vmap" 'doom:vmap)
|
||||
;; Editing
|
||||
(ex! "@" 'narf/evil-macro-on-all-lines)
|
||||
(ex! "al[ign]" 'narf:align)
|
||||
(ex! "htmle[nt]" 'narf/html-entities) ; encode/decode html entities
|
||||
(ex! "@" 'doom/evil-macro-on-all-lines)
|
||||
(ex! "al[ign]" 'doom:align)
|
||||
(ex! "htmle[nt]" 'doom/html-entities) ; encode/decode html entities
|
||||
(ex! "ie[dit]" 'evil-multiedit-ex-match)
|
||||
(ex! "na[rrow]" 'narf:narrow)
|
||||
(ex! "rec[ent]" 'narf:helm-recentf) ; show recent files
|
||||
(ex! "na[rrow]" 'doom:narrow)
|
||||
(ex! "rec[ent]" 'doom:helm-recentf) ; show recent files
|
||||
(ex! "ref[actor]" 'emr-show-refactor-menu)
|
||||
(ex! "reo[rient]" 'narf/window-reorient) ; scroll all windows to left
|
||||
(ex! "retab" 'narf:whitespace-retab)
|
||||
(ex! "settr[im]" 'narf:toggle-delete-trailing-whitespace)
|
||||
(ex! "snip[pets]" 'narf:yas-snippets) ; open snippet
|
||||
(ex! "tsnip[pets]" 'narf:yas-file-templates) ; open file template
|
||||
(ex! "wal[ign]" 'narf:whitespace-align) ; align by spaces
|
||||
(ex! "reo[rient]" 'doom/window-reorient) ; scroll all windows to left
|
||||
(ex! "retab" 'doom:whitespace-retab)
|
||||
(ex! "settr[im]" 'doom:toggle-delete-trailing-whitespace)
|
||||
(ex! "snip[pets]" 'doom:yas-snippets) ; open snippet
|
||||
(ex! "tsnip[pets]" 'doom:yas-file-templates) ; open file template
|
||||
(ex! "wal[ign]" 'doom:whitespace-align) ; align by spaces
|
||||
;; External resources
|
||||
(ex! "dash" 'narf:dash) ; look up in Dash.app
|
||||
(ex! "dash" 'doom:dash) ; look up in Dash.app
|
||||
(ex! "http" 'httpd-start) ; start http server
|
||||
(ex! "re[gex]" 'narf:regex) ; open re-builder
|
||||
(ex! "repl" 'narf:repl) ; invoke or send to repl
|
||||
(ex! "t[mux]" 'narf:tmux) ; send to tmux
|
||||
(ex! "tcd" 'narf:tmux-cd) ; cd to default-directory in tmux
|
||||
(ex! "x" 'narf:send-to-scratch-or-org)
|
||||
(ex! "re[gex]" 'doom:regex) ; open re-builder
|
||||
(ex! "repl" 'doom:repl) ; invoke or send to repl
|
||||
(ex! "t[mux]" 'doom:tmux) ; send to tmux
|
||||
(ex! "tcd" 'doom:tmux-cd) ; cd to default-directory in tmux
|
||||
(ex! "x" 'doom:send-to-scratch-or-org)
|
||||
;; GIT
|
||||
(ex! "ga[dd]" 'narf/vcs-stage-hunk)
|
||||
(ex! "gbr[owse]" 'narf:git-remote-browse) ; show file in github/gitlab
|
||||
(ex! "gre[vert]" 'narf/vcs-revert-hunk)
|
||||
(ex! "ga[dd]" 'doom/vcs-stage-hunk)
|
||||
(ex! "gbr[owse]" 'doom:git-remote-browse) ; show file in github/gitlab
|
||||
(ex! "gre[vert]" 'doom/vcs-revert-hunk)
|
||||
;; Dealing with buffers
|
||||
(ex! "k[ill]" 'narf/kill-real-buffer) ; Kill current buffer
|
||||
(ex! "k[ill]all" 'narf:kill-all-buffers) ; Kill buffers (bang = in project)
|
||||
(ex! "k[ill]b" 'narf:kill-buried-buffers) ; Kill buried buffers
|
||||
(ex! "k[ill]m" 'narf:kill-matching-buffers) ; kill buffers by regexp
|
||||
(ex! "k[ill]o" 'narf:kill-other-buffers) ; kill other buffers
|
||||
(ex! "k[ill]u" 'narf/kill-unreal-buffers) ; kill unreal buffers
|
||||
(ex! "l[ast]" 'narf/popup-last-buffer) ; pop up last popup
|
||||
(ex! "m[sg]" 'narf/popup-messages) ; open *messages* in popup
|
||||
(ex! "k[ill]" 'doom/kill-real-buffer) ; Kill current buffer
|
||||
(ex! "k[ill]all" 'doom:kill-all-buffers) ; Kill buffers (bang = in project)
|
||||
(ex! "k[ill]b" 'doom:kill-buried-buffers) ; Kill buried buffers
|
||||
(ex! "k[ill]m" 'doom:kill-matching-buffers) ; kill buffers by regexp
|
||||
(ex! "k[ill]o" 'doom:kill-other-buffers) ; kill other buffers
|
||||
(ex! "k[ill]u" 'doom/kill-unreal-buffers) ; kill unreal buffers
|
||||
(ex! "l[ast]" 'doom/popup-last-buffer) ; pop up last popup
|
||||
(ex! "m[sg]" 'doom/popup-messages) ; open *messages* in popup
|
||||
;; Project navigation
|
||||
(ex! "a" 'helm-projectile-find-other-file)
|
||||
(ex! "ag" 'narf:helm-ag-search)
|
||||
(ex! "ag[cw]d" 'narf:helm-ag-search-cwd)
|
||||
(ex! "cd" 'narf:cd)
|
||||
(ex! "se[arch]" 'narf:helm-swoop) ; in-file search
|
||||
(ex! "ag" 'doom:helm-ag-search)
|
||||
(ex! "ag[cw]d" 'doom:helm-ag-search-cwd)
|
||||
(ex! "cd" 'doom:cd)
|
||||
(ex! "se[arch]" 'doom:helm-swoop) ; in-file search
|
||||
;; Project tools
|
||||
(ex! "build" 'narf:build)
|
||||
(ex! "ma[ke]" 'narf:build)
|
||||
(ex! "build" 'doom:build)
|
||||
(ex! "ma[ke]" 'doom:build)
|
||||
;; File operations
|
||||
(ex! "mv" 'narf:file-move)
|
||||
(ex! "rm" 'narf:file-delete)
|
||||
(ex! "mv" 'doom:file-move)
|
||||
(ex! "rm" 'doom:file-delete)
|
||||
;; Presentation/demo
|
||||
(ex! "big" 'big-mode)
|
||||
(ex! "full[scr]" 'narf:toggle-fullscreen)
|
||||
(ex! "full[scr]" 'doom:toggle-fullscreen)
|
||||
;; Sessions/tabs
|
||||
(ex! "sl[oad]" 'narf:load-session)
|
||||
(ex! "ss[ave]" 'narf:save-session)
|
||||
(ex! "tabc[lose]" 'narf:kill-tab)
|
||||
(ex! "tabc[lose]o" 'narf:kill-other-tabs)
|
||||
(ex! "tabl[ast]" 'narf:switch-to-tab-last)
|
||||
(ex! "tabn[ew]" 'narf:tab-create)
|
||||
(ex! "tabn[ext]" 'narf:switch-to-tab-right)
|
||||
(ex! "tabp[rev]" 'narf:switch-to-tab-left)
|
||||
(ex! "tabr[ename]" 'narf:tab-rename)
|
||||
(ex! "tabs" 'narf/tab-display)
|
||||
(ex! "sl[oad]" 'doom:load-session)
|
||||
(ex! "ss[ave]" 'doom:save-session)
|
||||
(ex! "tabc[lose]" 'doom:kill-tab)
|
||||
(ex! "tabc[lose]o" 'doom:kill-other-tabs)
|
||||
(ex! "tabl[ast]" 'doom:switch-to-tab-last)
|
||||
(ex! "tabn[ew]" 'doom:tab-create)
|
||||
(ex! "tabn[ext]" 'doom:switch-to-tab-right)
|
||||
(ex! "tabp[rev]" 'doom:switch-to-tab-left)
|
||||
(ex! "tabr[ename]" 'doom:tab-rename)
|
||||
(ex! "tabs" 'doom/tab-display)
|
||||
;; Org-mode
|
||||
(ex! "att[ach]" 'narf:org-attach) ; attach file to org file
|
||||
(ex! "link" 'narf:org-link)
|
||||
(ex! "org" 'narf:org-helm-search) ; search org notes
|
||||
(ex! "att[ach]" 'doom:org-attach) ; attach file to org file
|
||||
(ex! "link" 'doom:org-link)
|
||||
(ex! "org" 'doom:org-helm-search) ; search org notes
|
||||
;; Plugins
|
||||
(ex! "er[rors]" 'narf/flycheck-errors)
|
||||
(ex! "er[rors]" 'doom/flycheck-errors)
|
||||
;; Debuggers
|
||||
(ex! "debug" 'narf:debug)
|
||||
(ex! "debug" 'doom:debug)
|
||||
|
||||
(provide 'my-commands)
|
||||
;;; my-commands.el ends here
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
class `(narf/php-class-name)`$1 {
|
||||
class `(doom/php-class-name)`$1 {
|
||||
|
||||
$0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,28 +1,7 @@
|
|||
;; NARF Dark
|
||||
;; DOOM Dark
|
||||
;; By Henrik Lissner <http://github.com/hlissner/emacs.d>
|
||||
|
||||
(require 'dash)
|
||||
|
||||
(deftheme narf-dark "A dark theme for narfy emacs, inspired by Molokai")
|
||||
|
||||
;; Color helper functions
|
||||
;; Shamelessly *borrowed* from solarized
|
||||
(defun --color-name-to-rgb (color &optional frame)
|
||||
(let ((valmax (float (car (color-values "#ffffff")))))
|
||||
(mapcar (lambda (x) (/ x valmax)) (color-values color frame))))
|
||||
|
||||
(defun --color-rgb-to-hex (red green blue)
|
||||
(format "#%02x%02x%02x"
|
||||
(* red 255) (* green 255) (* blue 255)))
|
||||
|
||||
(defun --color-blend (color1 color2 alpha)
|
||||
(apply '--color-rgb-to-hex
|
||||
(-zip-with '(lambda (it other)
|
||||
(+ (* alpha it) (* other (- 1 alpha))))
|
||||
(--color-name-to-rgb color1)
|
||||
(--color-name-to-rgb color2))))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
(deftheme doom-dark "A dark theme for hellish emacs, inspired by Molokai")
|
||||
|
||||
(let* ((c '((class color)))
|
||||
|
||||
|
|
@ -99,7 +78,7 @@
|
|||
(vc-deleted red))
|
||||
|
||||
(custom-theme-set-faces
|
||||
'narf-dark
|
||||
'doom-dark
|
||||
|
||||
;; Text
|
||||
`(default ((,c (:foreground ,fg :background ,bg))))
|
||||
|
|
@ -122,7 +101,7 @@
|
|||
`(flycheck-warning ((,c (:underline (:style wave :color ,yellow) :background ,grey-2))))
|
||||
`(flycheck-info ((,c (:underline (:style wave :color ,green) :background ,grey-2))))
|
||||
`(flyspell-incorrect ((,c (:underline (:style wave :color ,error-highlight)
|
||||
:inherit unspecified))))
|
||||
:inherit unspecified))))
|
||||
|
||||
`(hs-face ((,c (:foreground ,comments :background ,black))))
|
||||
`(hs-fringe-face ((,c (:foreground ,orange))))
|
||||
|
|
@ -160,7 +139,7 @@
|
|||
`(show-paren-match ((,c (:foreground ,magenta :inverse-video t))))
|
||||
|
||||
;; Modeline
|
||||
`(narf-minibuffer-active ((,c (:background ,active-minibuffer))))
|
||||
`(doom-minibuffer-active ((,c (:background ,active-minibuffer))))
|
||||
`(mode-line ((,c (:foreground ,modeline-fg :background ,modeline-bg))))
|
||||
`(mode-line-inactive ((,c (:foreground ,modeline-fg-inactive :background ,modeline-bg-inactive))))
|
||||
|
||||
|
|
@ -182,9 +161,9 @@
|
|||
`(isearch ((,c (:foreground ,search-fg :background ,search-bg))))
|
||||
`(isearch-lazy-highlight-face ((,c (:foreground ,search-rest-fg :background ,search-rest-bg))))
|
||||
|
||||
`(narf-todo-face ((,c (:foreground ,yellow))))
|
||||
`(narf-fixme-face ((,c (:foreground ,red))))
|
||||
`(narf-note-face ((,c (:foreground ,cyan))))
|
||||
`(doom-todo-face ((,c (:foreground ,yellow))))
|
||||
`(doom-fixme-face ((,c (:foreground ,red))))
|
||||
`(doom-note-face ((,c (:foreground ,cyan))))
|
||||
|
||||
`(evil-ex-substitute-replacement ((,c (:foreground ,magenta :background ,black :bold ,bold))))
|
||||
`(evil-search-highlight-persist-highlight-face ((,c (:background ,search-rest-bg))))
|
||||
|
|
@ -368,7 +347,7 @@
|
|||
`(org-checkbox-statistics-todo ((,c (:inherit org-todo))))
|
||||
`(org-checkbox-statistics-done ((,c (:inherit org-done))))
|
||||
|
||||
;; NARF custom org faces
|
||||
;; DOOM custom org faces
|
||||
`(org-headline-todo ((,c (:bold nil))))
|
||||
`(org-block ((,c (:background ,current-line))))
|
||||
`(org-block-background ((,c (:background ,current-line))))
|
||||
|
|
@ -379,36 +358,55 @@
|
|||
`(org-todo-checkbox ((,c (:inherit variable-pitch))))
|
||||
)
|
||||
|
||||
;; *****************************************************************************************
|
||||
;; *****************************************************************************************
|
||||
|
||||
(custom-theme-set-variables
|
||||
'narf-dark
|
||||
`(vc-annotate-color-map
|
||||
'((20 . ,green)
|
||||
(40 . ,(--color-blend yellow green (/ 1.0 3)))
|
||||
(60 . ,(--color-blend yellow green (/ 2.0 3)))
|
||||
(80 . ,yellow)
|
||||
(100 . ,(--color-blend orange yellow (/ 1.0 3)))
|
||||
(120 . ,(--color-blend orange yellow (/ 2.0 3)))
|
||||
(140 . ,orange)
|
||||
(160 . ,(--color-blend magenta orange (/ 1.0 3)))
|
||||
(180 . ,(--color-blend magenta orange (/ 2.0 3)))
|
||||
(200 . ,magenta)
|
||||
(220 . ,(--color-blend red magenta (/ 1.0 3)))
|
||||
(240 . ,(--color-blend red magenta (/ 2.0 3)))
|
||||
(260 . ,red)
|
||||
(280 . ,(--color-blend grey-2 red (/ 1.0 4)))
|
||||
(300 . ,(--color-blend grey-2 red (/ 2.0 4)))
|
||||
(320 . ,(--color-blend grey-2 red (/ 3.0 4)))
|
||||
(340 . ,grey-2)
|
||||
(360 . ,grey-2)))
|
||||
`(vc-annotate-very-old-color nil)
|
||||
`(vc-annotate-background ,black))
|
||||
)
|
||||
(after! vc-annotate
|
||||
(require 'dash)
|
||||
|
||||
;; Color helper functions
|
||||
;; Shamelessly *borrowed* from solarized
|
||||
(defun --color-name-to-rgb (color &optional frame)
|
||||
(let ((valmax (float (car (color-values "#ffffff")))))
|
||||
(mapcar (lambda (x) (/ x valmax)) (color-values color frame))))
|
||||
|
||||
(defun --color-rgb-to-hex (red green blue)
|
||||
(format "#%02x%02x%02x"
|
||||
(* red 255) (* green 255) (* blue 255)))
|
||||
|
||||
(defun --color-blend (color1 color2 alpha)
|
||||
(apply '--color-rgb-to-hex
|
||||
(-zip-with '(lambda (it other)
|
||||
(+ (* alpha it) (* other (- 1 alpha))))
|
||||
(--color-name-to-rgb color1)
|
||||
(--color-name-to-rgb color2))))
|
||||
|
||||
(custom-theme-set-variables
|
||||
'doom-dark
|
||||
`(vc-annotate-color-map
|
||||
'((20 . ,green)
|
||||
(40 . ,(--color-blend yellow green (/ 1.0 3)))
|
||||
(60 . ,(--color-blend yellow green (/ 2.0 3)))
|
||||
(80 . ,yellow)
|
||||
(100 . ,(--color-blend orange yellow (/ 1.0 3)))
|
||||
(120 . ,(--color-blend orange yellow (/ 2.0 3)))
|
||||
(140 . ,orange)
|
||||
(160 . ,(--color-blend magenta orange (/ 1.0 3)))
|
||||
(180 . ,(--color-blend magenta orange (/ 2.0 3)))
|
||||
(200 . ,magenta)
|
||||
(220 . ,(--color-blend red magenta (/ 1.0 3)))
|
||||
(240 . ,(--color-blend red magenta (/ 2.0 3)))
|
||||
(260 . ,red)
|
||||
(280 . ,(--color-blend grey-2 red (/ 1.0 4)))
|
||||
(300 . ,(--color-blend grey-2 red (/ 2.0 4)))
|
||||
(320 . ,(--color-blend grey-2 red (/ 3.0 4)))
|
||||
(340 . ,grey-2)
|
||||
(360 . ,grey-2)))
|
||||
`(vc-annotate-very-old-color nil)
|
||||
`(vc-annotate-background ,black))))
|
||||
|
||||
;; *****************************************************************************************
|
||||
|
||||
(provide-theme 'narf-dark)
|
||||
(provide-theme 'doom-dark)
|
||||
|
||||
;; Local Variables:
|
||||
;; no-byte-compile: t
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
;; NARF Dark
|
||||
;; DOOM Light
|
||||
;; By Henrik Lissner <http://github.com/hlissner/emacs.d>
|
||||
|
||||
(deftheme narf-light "A light theme for narfy emacs, inspired by Base 16")
|
||||
(deftheme doom-light "A light theme for hellish emacs, inspired by Base 16")
|
||||
|
||||
(let* ((c '((class color)))
|
||||
|
||||
|
|
@ -90,7 +90,7 @@
|
|||
(vc-deleted orange))
|
||||
|
||||
(custom-theme-set-faces
|
||||
'narf-light
|
||||
'doom-light
|
||||
|
||||
;; Text
|
||||
`(default ((,c (:foreground ,fg :background ,bg))))
|
||||
|
|
@ -169,9 +169,9 @@
|
|||
`(isearch ((,c (:foreground ,search-fg :background ,search-bg))))
|
||||
`(isearch-lazy-highlight-face ((,c (:foreground ,search-rest-fg :background ,search-rest-bg))))
|
||||
|
||||
`(narf-todo-face ((,c (:foreground ,yellow :bold t))))
|
||||
`(narf-fixme-face ((,c (:foreground ,red :bold t))))
|
||||
`(narf-note-face ((,c (:foreground ,cyan :bold t))))
|
||||
`(doom-todo-face ((,c (:foreground ,yellow :bold t))))
|
||||
`(doom-fixme-face ((,c (:foreground ,red :bold t))))
|
||||
`(doom-note-face ((,c (:foreground ,cyan :bold t))))
|
||||
|
||||
`(evil-ex-substitute-replacement ((,c (:foreground ,magenta :background ,black :bold t))))
|
||||
`(evil-search-highlight-persist-highlight-face ((,c (:background ,search-rest-bg))))
|
||||
|
|
@ -316,7 +316,7 @@
|
|||
`(org-checkbox-statistics-todo ((,c (:inherit org-todo))))
|
||||
`(org-checkbox-statistics-done ((,c (:inherit org-done))))
|
||||
|
||||
;; NARF custom org faces
|
||||
;; DOOM custom org faces
|
||||
`(org-headline-todo ((,c (:foreground ,dark-cyan :bold nil))))
|
||||
`(org-block ((,c (:background ,current-line))))
|
||||
`(org-block-background ((,c (:background ,current-line))))
|
||||
|
|
@ -331,7 +331,7 @@
|
|||
|
||||
;; *****************************************************************************************
|
||||
|
||||
(provide-theme 'narf-light)
|
||||
(provide-theme 'doom-light)
|
||||
|
||||
;; Local Variables:
|
||||
;; no-byte-compile: t
|
||||
|
|
@ -1,25 +1,25 @@
|
|||
;; NARF One Dark (inspired by Atom)
|
||||
;; DOOM One Dark (inspired by Atom)
|
||||
;; By Henrik Lissner <http://github.com/hlissner/emacs.d>
|
||||
|
||||
(deftheme narf-one "A dark theme for narfy emacs, inspired by Molokai")
|
||||
(deftheme doom-one "A dark theme for hellish emacs, inspired by Molokai")
|
||||
|
||||
(when (display-graphic-p)
|
||||
;; Brighten up code buffers; darken special and popup buffers
|
||||
(defface narf-default '((t (:inherit default)))
|
||||
(defface doom-default '((t (:inherit default)))
|
||||
"Face for source code windows")
|
||||
(defun narf|buffer-bg (&rest _)
|
||||
(defun doom|buffer-bg (&rest _)
|
||||
(set (make-local-variable 'face-remapping-alist)
|
||||
'((default narf-default)
|
||||
(linum narf-linum))))
|
||||
(add-hook 'find-file-hook 'narf|buffer-bg)
|
||||
'((default doom-default)
|
||||
(linum doom-linum))))
|
||||
(add-hook 'find-file-hook 'doom|buffer-bg)
|
||||
|
||||
;; Brighter minibuffer when active + no fringe in minibuffer
|
||||
(defface narf-minibuffer-active '((t (:inherit mode-line)))
|
||||
(defface doom-minibuffer-active '((t (:inherit mode-line)))
|
||||
"Face for active minibuffer")
|
||||
(add-hook! minibuffer-setup
|
||||
(set-window-fringes (minibuffer-window) 0 0 nil)
|
||||
(set (make-local-variable 'face-remapping-alist)
|
||||
'((default narf-minibuffer-active)))))
|
||||
'((default doom-minibuffer-active)))))
|
||||
|
||||
(let* ((c '((class color)))
|
||||
|
||||
|
|
@ -98,12 +98,12 @@
|
|||
(vc-deleted red))
|
||||
|
||||
(custom-theme-set-faces
|
||||
'narf-one
|
||||
'doom-one
|
||||
|
||||
;; Text
|
||||
`(default ((,c (:foreground ,fg :background ,bg-d))))
|
||||
`(narf-default ((,c (:inherit default :background ,bg))))
|
||||
`(fringe ((,c (:inherit narf-default :foreground ,comments))))
|
||||
`(doom-default ((,c (:inherit default :background ,bg))))
|
||||
`(fringe ((,c (:inherit doom-default :foreground ,comments))))
|
||||
`(cursor ((,c (:background ,white))))
|
||||
`(hl-line ((,c (:background ,current-line))))
|
||||
`(region ((,c (:background ,selection :foreground ,white))))
|
||||
|
|
@ -156,12 +156,12 @@
|
|||
`(vertical-border ((,c (:foreground ,vertical-bar :background ,vertical-bar))))
|
||||
|
||||
`(linum ((,c (:foreground ,linum-fg :background ,bg-d :bold nil))))
|
||||
`(narf-linum ((,c (:inherit linum :background ,bg))))
|
||||
`(doom-linum ((,c (:inherit linum :background ,bg))))
|
||||
`(linum-highlight-face ((,c (:inherit linum :foreground ,linum-hl-fg :background ,current-line))))
|
||||
`(show-paren-match ((,c (:foreground ,magenta :inverse-video t))))
|
||||
|
||||
;; Modeline
|
||||
`(narf-minibuffer-active ((,c (:background ,bg))))
|
||||
`(doom-minibuffer-active ((,c (:background ,bg))))
|
||||
`(mode-line ((,c (:foreground ,modeline-fg :background ,modeline-bg))))
|
||||
`(mode-line-inactive ((,c (:foreground ,modeline-fg-inactive :background ,modeline-bg-inactive))))
|
||||
|
||||
|
|
@ -183,9 +183,9 @@
|
|||
`(isearch ((,c (:foreground ,search-fg :background ,search-bg))))
|
||||
`(isearch-lazy-highlight-face ((,c (:foreground ,search-rest-fg :background ,search-rest-bg))))
|
||||
|
||||
`(narf-todo-face ((,c (:foreground ,yellow))))
|
||||
`(narf-fixme-face ((,c (:foreground ,red))))
|
||||
`(narf-note-face ((,c (:foreground ,cyan))))
|
||||
`(doom-todo-face ((,c (:foreground ,yellow))))
|
||||
`(doom-fixme-face ((,c (:foreground ,red))))
|
||||
`(doom-note-face ((,c (:foreground ,cyan))))
|
||||
|
||||
`(evil-ex-substitute-replacement ((,c (:foreground ,magenta :background ,black :bold ,bold))))
|
||||
`(evil-search-highlight-persist-highlight-face ((,c (:background ,search-rest-bg))))
|
||||
|
|
@ -364,7 +364,7 @@
|
|||
`(org-checkbox-statistics-todo ((,c (:inherit org-todo))))
|
||||
`(org-checkbox-statistics-done ((,c (:inherit org-done))))
|
||||
|
||||
;; NARF custom org faces
|
||||
;; DOOM custom org faces
|
||||
`(org-headline-todo ((,c (:bold nil))))
|
||||
`(org-block ((,c (:background ,current-line))))
|
||||
`(org-block-background ((,c (:background ,current-line))))
|
||||
|
|
@ -398,7 +398,7 @@
|
|||
(--color-name-to-rgb color2))))
|
||||
|
||||
(custom-theme-set-variables
|
||||
'narf-one
|
||||
'doom-one
|
||||
`(vc-annotate-color-map
|
||||
'((20 . ,green)
|
||||
(40 . ,(--color-blend yellow green (/ 1.0 3)))
|
||||
|
|
@ -423,7 +423,7 @@
|
|||
|
||||
;; *****************************************************************************************
|
||||
|
||||
(provide-theme 'narf-one)
|
||||
(provide-theme 'doom-one)
|
||||
|
||||
;; Local Variables:
|
||||
;; no-byte-compile: t
|
||||
Loading…
Add table
Add a link
Reference in a new issue