NARF v0.7.0
vcs: + +git-gutter to conf-modes; -git-gutter from evil-insert-state-exit + switch github-browse-file for browse-at-remote + fix <leader>ob; add <leader>d[./sr] vc bindings + vc-annotate bindings and initial state Workgroups2 integration: + don't mess with buffers (speeds up emacs a lot!) + unicode numbers in display + single display function + remember workgroup uid instead (and smarter :tabrename) + clean up after wg update Org-mode + give highlight precedence to links in org-mode + enable encryption + config clean up + use different font for org + exclude attachments in recentf + redo latex and inline-image config + add narf/org-open-notes + update file templates for org CRM Mode-line + polish mode-line + decouple from spaceline-segments.el + refactor narf|spaceline-env-update + add macro-recording and buffer-size indicators to mode-line + python: '2>&1' in env-command + flycheck fringe indicator: change to arrow Aesthetics + update narf-dark-theme + add narf-minibuffer-active face + change writing indicator in writing-mode Misc + fix whitespace in display-startup-echo-area-message + reset fonts for more unicode characters + custom imenu entries + helm-imenu fontification + enable yascroll-bar in REPLs + reorganize my-commands.el + force quit iedit on ESC in normal mode + update snippets submodule + remove ido init (helm handles it all) [EXPERIMENTAL] + back to Terminus(TTF) font + popwin: update config for git-gutter and vc-diff windows + highlight :g[lobal] and :al[ign] matches + decouple narf/get-buffers+narf/get-all-buffers from wg-mess-with-buffer-list + fix narf/helm-buffers-dwim (add interactive form)
This commit is contained in:
Henrik Lissner
parent
8943bbc79f
commit
aa26332d00
29 changed files with 691 additions and 421 deletions
|
|
@ -29,6 +29,7 @@
|
|||
|
||||
"M-b" 'narf:build
|
||||
"M-t" 'narf:workgroup-new
|
||||
"M-T" 'narf/workgroup-display
|
||||
"A-`" 'narf-switch-to-iterm
|
||||
"C-`" 'popwin:messages
|
||||
"C-~" 'rtog/toggle-repl
|
||||
|
|
@ -117,7 +118,12 @@
|
|||
:n "e" 'narf/flycheck-errors
|
||||
:n "s" 'yas-visit-snippet-file
|
||||
:n "S" 'narf/yas-find-file
|
||||
:n "d" 'narf/vcs-show-hunk
|
||||
:n "D" 'vc-annotate
|
||||
(:prefix "d"
|
||||
:n "." 'narf/vcs-show-hunk
|
||||
:n "/" 'vc-diff
|
||||
:n "s" 'narf/vcs-stage-hunk
|
||||
:n "r" 'narf/vcs-revert-hunk)
|
||||
|
||||
:n "b" 'helm-bookmarks
|
||||
:n "w" 'narf/workgroup-display
|
||||
|
|
@ -147,7 +153,7 @@
|
|||
(:prefix "o"
|
||||
:n "o" 'os-open-in-default-program
|
||||
:n "p" 'os-reveal-project
|
||||
:n "b" 'os-open-in-chrome
|
||||
:n "b" 'os-open-in-browser
|
||||
:n "u" 'os-upload
|
||||
:n "U" 'os-upload-folder
|
||||
:n "l" 'os-send-to-launchbar
|
||||
|
|
|
|||
|
|
@ -1,64 +1,72 @@
|
|||
;;; my-commands.el
|
||||
|
||||
(defalias 'exmap 'evil-ex-define-cmd)
|
||||
(defalias 'exmap! 'evil-ex-define-cmd-local)
|
||||
|
||||
(exmap "a" 'helm-projectile-find-other-file)
|
||||
;; Emacs utilities
|
||||
(exmap "acomp[ile]" 'narf:compile-autoloads)
|
||||
(exmap "ag" 'narf:helm-ag-search)
|
||||
(exmap "ag[cw]d" 'narf:helm-ag-search-cwd)
|
||||
(exmap "agr" 'narf:helm-ag-regex-search)
|
||||
(exmap "agr[cw]d" 'narf:helm-ag-regex-search-cwd)
|
||||
(exmap "al[ign]" 'narf:align)
|
||||
(exmap "wal[ign]" 'narf:whitespace-align)
|
||||
(exmap "bcomp[ile]" 'narf:compile-el)
|
||||
(exmap "big" 'narf:toggle-big-mode)
|
||||
(exmap "cap[ture]" 'helm-org-capture-templates)
|
||||
(exmap "cd" 'narf:cd)
|
||||
(exmap "dash" 'dash-at-point)
|
||||
(exmap "echo" 'narf:echo)
|
||||
|
||||
;; Editing
|
||||
(exmap "@" 'narf/evil-macro-on-all-lines)
|
||||
(exmap "al[ign]" 'narf:align)
|
||||
(exmap "en[ew]" 'narf:file-create)
|
||||
(exmap "fi[nd]" 'narf:helm-swoop)
|
||||
(exmap "full[scr]" 'narf:toggle-fullscreen)
|
||||
(exmap "fullw[rite]" 'narf:toggle-write-mode)
|
||||
(exmap "na[rrow]" 'narf:narrow) ; Narrow buffer to selection
|
||||
(exmap "ref[actor]" 'emr-show-refactor-menu)
|
||||
(exmap "retab" 'narf:whitespace-retab)
|
||||
(exmap "settr[im]" 'narf:toggle-delete-trailing-whitespace)
|
||||
(exmap "snip[pets]" 'narf:yas-snippets) ; snip[!]
|
||||
(exmap "tsnip[pets]" 'narf:yas-file-templates) ; tsnip[!]
|
||||
(exmap "wal[ign]" 'narf:whitespace-align)
|
||||
(exmap "rec[ent]" 'narf:helm-recentf)
|
||||
|
||||
;; External resources
|
||||
(exmap "dash" 'dash-at-point)
|
||||
(exmap "http" 'httpd-start)
|
||||
(exmap "ini" 'narf:ido-find-file-in-emacsd)
|
||||
(exmap "re[gex]" 'narf:regex)
|
||||
(exmap "repl" 'narf:repl)
|
||||
(exmap "t[mux]" 'narf:send-to-tmux)
|
||||
(exmap "t[mux]s" 'narf/tmux-split-window)
|
||||
(exmap "t[mux]v" (λ (narf/tmux-split-window t)))
|
||||
(exmap "t[mux]w" 'narf/tmux-new-window)
|
||||
(exmap "tcd" 'narf:tmux-cd)
|
||||
(exmap "x" 'narf:scratch-buffer)
|
||||
;; GIT
|
||||
(exmap "git[hub]" 'narf:github-browse-file)
|
||||
|
||||
;; Dealing with buffers
|
||||
(exmap "k[ill]" 'kill-this-buffer) ; Kill current buffer
|
||||
(exmap "k[ill]all" 'narf:kill-all-buffers) ; Kill all buffers (bang = in project)
|
||||
(exmap "k[ill]buried" 'narf:kill-buried-buffers) ; Kill all buried buffers (bang = in project)
|
||||
(exmap "k[ill]o" 'narf:kill-unreal-buffers)
|
||||
(exmap "l[ast]" 'narf:popup-last-buffer)
|
||||
(exmap "m[sg]" 'narf:popup-messages)
|
||||
|
||||
;; Project navigation
|
||||
(exmap "a" 'helm-projectile-find-other-file)
|
||||
(exmap "ag" 'narf:helm-ag-search)
|
||||
(exmap "ag[cw]d" 'narf:helm-ag-search-cwd)
|
||||
(exmap "agr" 'narf:helm-ag-regex-search)
|
||||
(exmap "agr[cw]d" 'narf:helm-ag-regex-search-cwd)
|
||||
(exmap "cd" 'narf:cd)
|
||||
(exmap "fi[nd]" 'narf:helm-swoop)
|
||||
;; Project tools
|
||||
(exmap "ma[ke]" 'narf:build)
|
||||
;; File operations
|
||||
(exmap "mv" 'narf:file-move)
|
||||
(exmap "na[rrow]" 'narf:narrow) ; Narrow buffer to selection
|
||||
(exmap "org" 'narf/helm-org)
|
||||
(exmap "repl" 'narf:repl)
|
||||
(exmap "proj[ect]" 'helm-projectile-switch-project)
|
||||
(exmap "rec[ent]" 'narf:helm-recentf)
|
||||
(exmap "re[gex]" 'narf:regex)
|
||||
(exmap "ref[actor]" 'emr-show-refactor-menu)
|
||||
(exmap "retab" 'narf:whitespace-retab)
|
||||
(exmap "rm" 'narf:file-delete) ; rm[!]
|
||||
(exmap "settr[im]" 'narf:toggle-delete-trailing-whitespace)
|
||||
(exmap "snip[pets]" 'narf:yas-snippets) ; snip[!]
|
||||
(exmap "tsnip[pets]" 'narf:yas-file-templates) ; tsnip[!]
|
||||
(exmap "x" 'narf:scratch-buffer)
|
||||
(exmap "@" 'narf/evil-macro-on-all-lines)
|
||||
|
||||
(exmap "t[mux]" 'narf:send-to-tmux)
|
||||
(exmap "t[mux]w" 'narf/tmux-new-window)
|
||||
(exmap "t[mux]s" 'narf/tmux-split-window)
|
||||
(exmap "t[mux]v" (λ (narf/tmux-split-window t)))
|
||||
(exmap "tcd" 'narf:tmux-cd)
|
||||
;; Presentation/demo
|
||||
(exmap "big" 'narf:toggle-big-mode)
|
||||
(exmap "full[scr]" 'narf:toggle-fullscreen)
|
||||
(exmap "fullw[rite]" 'narf:toggle-write-mode)
|
||||
|
||||
;; Org-mode
|
||||
(exmap "cap[ture]" 'helm-org-capture-templates)
|
||||
(exmap "org" 'narf/helm-org)
|
||||
(exmap "cont[act]" 'narf:org-crm-contact)
|
||||
(exmap "proj[ect]" 'narf:org-crm-project)
|
||||
(exmap "invo[ice]" 'narf:org-crm-invoice)
|
||||
|
||||
;; GIT
|
||||
(exmap "bl[ame]" 'narf:github-browse-file)
|
||||
|
||||
;; Plugins
|
||||
(after! flycheck
|
||||
(exmap "er[rors]" (λ (flycheck-buffer) (flycheck-list-errors))))
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 26750d3e73761e7b418f3038236c46359cc05735
|
||||
Subproject commit de19d3918bbdccb00fa2dc900b80cd3c47c502b4
|
||||
|
|
@ -1,12 +1,11 @@
|
|||
#+TITLE:${1:Contact Name}${2: 🏢}
|
||||
#+begin_src yaml
|
||||
created: `(format-time-string "%Y-%m-%d")`
|
||||
#+TITLE:${1:Contact Name}
|
||||
#+DATE: `(format-time-string "%Y-%m-%d")`
|
||||
#+EMAIL: ${2:email@address.com}
|
||||
#+ADDRESS: $3
|
||||
#+CITY: $4
|
||||
#+COUNTRY: $5
|
||||
|
||||
email: ${3:email@address.com}
|
||||
address: $4
|
||||
city: $5
|
||||
country: $6
|
||||
#+end_src
|
||||
${0:...}
|
||||
|
||||
* Associates
|
||||
+ Associate's name :: associates@email.com
|
||||
|
|
|
|||
|
|
@ -1,18 +1,21 @@
|
|||
#+TITLE:${1:1234-5678}
|
||||
#+begin_src yaml
|
||||
created: `(format-time-string "%Y-%m-%d")`
|
||||
issued: `(format-time-string "%Y-%m-%d")`
|
||||
currency: ${2:CAD|USD|GBP|DKK}
|
||||
contact: ${3:email address}
|
||||
#+DATE: `(format-time-string "%Y-%m-%d")`
|
||||
#+ISSUED: ${2:`(format-time-string "%Y-%m-%d")`}
|
||||
#+PAID: ${3:`(format-time-string "%Y-%m-%d")`}
|
||||
#+CURRENCY: ${4:CAD|USD|DKK|GBP}
|
||||
#+CONTACT: ${5:Contact ID}
|
||||
#+PROJECT: ${6:Project ID}
|
||||
|
||||
items:
|
||||
- title: "$4"
|
||||
body: "$5"
|
||||
qty: ${6:1}
|
||||
amount: ${7:1200.00}
|
||||
| *Description* | *qty* | *rate* | *total* |
|
||||
|----------------------------------------------+-----+--------+-------|
|
||||
| $0 [1] | | | |
|
||||
|----------------------------------------------+-----+--------+-------|
|
||||
| | | | |
|
||||
#+TBLFM: $4=$2+$3::@>$4=vsum(@2..@-1)
|
||||
|
||||
comments: "$0"
|
||||
#+end_src
|
||||
[1] ...
|
||||
|
||||
* Comments
|
||||
...
|
||||
* Notes
|
||||
* Attachments [0/0]
|
||||
** Attachments [0/0]
|
||||
|
|
@ -1,8 +1,6 @@
|
|||
#+TITLE:${1:Project Name}
|
||||
#+begin_src yaml
|
||||
created: `(format-time-string "%Y-%m-%d")`
|
||||
contact: ${2:Contact id}
|
||||
#+end_src
|
||||
#+DATE: `(format-time-string "%Y-%m-%d")`
|
||||
#+CONTACT: ${2:Contact name/id}
|
||||
|
||||
${3:Summary of project.}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,30 @@
|
|||
|
||||
(custom-theme-set-variables 'narf-dark)
|
||||
|
||||
;; 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))))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(let* ((c '((class color)))
|
||||
|
||||
;; Global bold flag
|
||||
(bold t)
|
||||
|
||||
(bg "#1E2021")
|
||||
(fg "#D6D6D4")
|
||||
(subtle "#aab6c7")
|
||||
|
|
@ -57,10 +79,11 @@
|
|||
(error-highlight red)
|
||||
|
||||
(linum-bg current-line)
|
||||
(linum-fg grey-1)
|
||||
(linum-fg "#383840")
|
||||
(linum-hl-fg orange)
|
||||
(linum-hl-bg current-line)
|
||||
|
||||
(active-minibuffer "#404046")
|
||||
(modeline-fg white)
|
||||
(modeline-fg-2 orange)
|
||||
(modeline-fg-3 orange)
|
||||
|
|
@ -90,13 +113,15 @@
|
|||
;; `(match ((,c (:background ,magenta))))
|
||||
`(minibuffer-prompt ((,c (:foreground ,orange))))
|
||||
|
||||
`(error ((,c (:foreground ,red :bold t))))
|
||||
`(warning ((,c (:foreground ,yellow :bold t))))
|
||||
`(success ((,c (:foreground ,green :bold t))))
|
||||
`(error ((,c (:foreground ,red ))))
|
||||
`(warning ((,c (:foreground ,yellow))))
|
||||
`(success ((,c (:foreground ,green ))))
|
||||
|
||||
`(spaceline-flycheck-error ((,c (:bold t :foreground ,red))))
|
||||
`(spaceline-flycheck-warning ((,c (:bold t :foreground ,yellow))))
|
||||
`(spaceline-flycheck-info ((,c (:bold t :foreground ,green))))
|
||||
`(spaceline-flycheck-error ((,c (:underline nil :foreground ,black :background ,red))))
|
||||
`(spaceline-flycheck-warning ((,c (:underline nil :foreground ,black :background ,yellow))))
|
||||
`(spaceline-flycheck-info ((,c (:underline nil :foreground ,black :background ,green))))
|
||||
`(flyspell-incorrect ((,c (:underline (:style wave :color ,error-highlight)
|
||||
:inherit unspecified))))
|
||||
|
||||
`(hs-face ((,c (:foreground ,comments :background ,black))))
|
||||
`(hs-fringe-face ((,c (:foreground ,orange))))
|
||||
|
|
@ -129,47 +154,50 @@
|
|||
|
||||
`(vertical-border ((,c (:foreground ,vertical-bar :background ,vertical-bar))))
|
||||
|
||||
;; `(linum ((,c (:foreground ,linum-fg :bold nil :height 0.9))))
|
||||
`(linum ((,c (:foreground ,linum-fg :bold nil :height 0.8))))
|
||||
`(linum-highlight-face ((,c (:inherit linum :bold t :foreground ,linum-hl-fg))))
|
||||
`(show-paren-match ((,c (:foreground ,magenta :bold t :inverse-video t))))
|
||||
;; `(linum ((,c (:foreground ,linum-fg :bold nil :height 0.8))))
|
||||
`(linum ((,c (:foreground ,linum-fg :bold nil))))
|
||||
`(linum-highlight-face ((,c (:inherit linum :foreground ,linum-hl-fg))))
|
||||
`(show-paren-match ((,c (:foreground ,magenta :bold ,bold :inverse-video t))))
|
||||
|
||||
;; Modeline
|
||||
`(mode-line ((,c (:foreground ,modeline-fg :background ,modeline-bg))))
|
||||
`(mode-line-inactive ((,c (:foreground ,modeline-fg-inactive :background ,modeline-bg-inactive))))
|
||||
`(mode-line-is-modified ((,c (:foreground ,magenta :bold t))))
|
||||
`(narf-minibuffer-active ((,c (:background ,active-minibuffer))))
|
||||
`(mode-line ((,c (:foreground ,modeline-fg :background ,modeline-bg
|
||||
:box (:line-width 2 :color ,modeline-bg)))))
|
||||
`(mode-line-inactive ((,c (:foreground ,modeline-fg-inactive :background ,modeline-bg-inactive
|
||||
:box (:line-width 2 :color ,modeline-bg-inactive)))))
|
||||
|
||||
`(mode-line-is-modified ((,c (:foreground ,magenta))))
|
||||
`(mode-line-buffer-file ((,c (:foreground ,modeline-fg))))
|
||||
`(powerline-active1 ((,c (:foreground ,modeline-fg-2 :background ,modeline-bg-2))))
|
||||
`(powerline-active2 ((,c (:foreground ,modeline-fg-3 :background ,modeline-bg-3))))
|
||||
`(powerline-inactive1 ((,c (:foreground ,modeline-fg-inactive))))
|
||||
`(powerline-inactive2 ((,c (:foreground ,modeline-fg-inactive))))
|
||||
`(spaceline-highlight-face ((,c (:foreground ,black :background ,highlight :bold t))))
|
||||
`(mode-line-count-face ((,c (:foreground ,black :background ,magenta :bold t))))
|
||||
`(spaceline-highlight-face ((,c (:foreground ,black :background ,highlight :bold ,bold))))
|
||||
`(mode-line-count-face ((,c (:foreground ,black :background ,magenta :bold ,bold))))
|
||||
|
||||
;; Search
|
||||
`(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))))
|
||||
`(narf-todo-face ((,c (:foreground ,yellow))))
|
||||
`(narf-fixme-face ((,c (:foreground ,red))))
|
||||
`(narf-note-face ((,c (:foreground ,cyan))))
|
||||
|
||||
`(evil-ex-substitute-replacement ((,c (:foreground ,magenta :background ,black :bold t))))
|
||||
`(evil-ex-substitute-replacement ((,c (:foreground ,magenta :background ,black :bold ,bold))))
|
||||
`(evil-search-highlight-persist-highlight-face ((,c (:background ,search-rest-bg))))
|
||||
|
||||
|
||||
;; plugin-specific
|
||||
;; *****************************************************************************************
|
||||
|
||||
`(yascroll:thumb-fringe ((,c (:background ,grey-1 :foreground ,grey-1))))
|
||||
|
||||
`(reb-match-0 ((,c (:foreground ,orange :inverse-video t))))
|
||||
`(reb-match-1 ((,c (:foreground ,magenta :inverse-video t))))
|
||||
`(reb-match-2 ((,c (:foreground ,green :inverse-video t))))
|
||||
`(reb-match-3 ((,c (:foreground ,yellow :inverse-video t))))
|
||||
`(reb-match-0 ((,c (:foreground ,orange :inverse-video t))))
|
||||
`(reb-match-1 ((,c (:foreground ,magenta :inverse-video t))))
|
||||
`(reb-match-2 ((,c (:foreground ,green :inverse-video t))))
|
||||
`(reb-match-3 ((,c (:foreground ,yellow :inverse-video t))))
|
||||
|
||||
;; workgroups2
|
||||
`(wg-current-workgroup-face ((,c (:foreground ,black :background ,orange))))
|
||||
`(wg-current-workgroup-face ((,c (:foreground ,black :background ,orange))))
|
||||
`(wg-other-workgroup-face ((,c (:foreground ,grey-.5 :background ,current-line))))
|
||||
|
||||
;; neotree
|
||||
|
|
@ -204,32 +232,32 @@
|
|||
`(diff-hl-change ((,c (:foreground ,vc-modified))))
|
||||
`(diff-hl-delete ((,c (:foreground ,vc-deleted))))
|
||||
`(diff-hl-insert ((,c (:foreground ,vc-added))))
|
||||
`(git-gutter:modified ((,c (:foreground ,vc-modified))))
|
||||
`(git-gutter:added ((,c (:foreground ,vc-added))))
|
||||
`(git-gutter:deleted ((,c (:foreground ,vc-deleted))))
|
||||
`(git-gutter+-modified ((,c (:foreground ,vc-modified :background nil))))
|
||||
`(git-gutter+-added ((,c (:foreground ,vc-added :background nil))))
|
||||
`(git-gutter+-deleted ((,c (:foreground ,vc-deleted :background nil))))
|
||||
|
||||
;; Rainbow delimiters
|
||||
`(rainbow-delimiters-depth-1-face ((,c (:foreground ,magenta :bold t))))
|
||||
`(rainbow-delimiters-depth-1-face ((,c (:foreground ,magenta))))
|
||||
`(rainbow-delimiters-depth-2-face ((,c (:foreground ,orange))))
|
||||
`(rainbow-delimiters-depth-3-face ((,c (:foreground ,yellow))))
|
||||
`(rainbow-delimiters-depth-4-face ((,c (:foreground ,green))))
|
||||
`(rainbow-delimiters-depth-5-face ((,c (:foreground ,cyan))))
|
||||
`(rainbow-delimiters-unmatched-face ((,c (:foreground ,red :inverse-video t))))
|
||||
|
||||
`(flyspell-incorrect ((,c (:underline (:style wave :color ,error-highlight) :inherit unspecified))))
|
||||
|
||||
;; Helm
|
||||
`(helm-source-header ((,c (:background ,current-line :foreground ,grey-1))))
|
||||
`(helm-selection ((,c (:background ,selection))))
|
||||
`(helm-match ((,c (:foreground ,magenta))))
|
||||
`(helm-source-header ((,c (:background ,current-line :foreground ,grey-1))))
|
||||
`(helm-swoop-target-line-face ((,c (:foreground ,highlight :inverse-video t))))
|
||||
`(helm-match ((,c (:foreground ,magenta))))
|
||||
|
||||
`(helm-ff-file ((,c (:foreground ,grey))))
|
||||
`(helm-ff-prefix ((,c (:foreground ,magenta))))
|
||||
`(helm-ff-dotted-directory ((,c (:foreground ,grey-1))))
|
||||
`(helm-ff-directory ((,c (:foreground ,orange :bold t))))
|
||||
`(helm-ff-executable ((,c (:foreground ,white :slant italic))))
|
||||
|
||||
`(helm-ff-file ((,c (:foreground ,grey))))
|
||||
`(helm-ff-prefix ((,c (:foreground ,magenta))))
|
||||
`(helm-ff-dotted-directory ((,c (:foreground ,grey-1))))
|
||||
`(helm-ff-directory ((,c (:foreground ,orange))))
|
||||
`(helm-ff-executable ((,c (:foreground ,white :slant italic))))
|
||||
|
||||
;; Avy
|
||||
`(avy-lead-face-0 ((,c (:background ,orange :foreground ,black))))
|
||||
|
|
@ -241,11 +269,11 @@
|
|||
;; *****************************************************************************************
|
||||
;; js2-mode
|
||||
`(js2-function-param ((,c (:foreground ,variables))))
|
||||
`(js2-jsdoc-tag ((,c (:foreground ,comments :bold t))))
|
||||
`(js2-jsdoc-tag ((,c (:foreground ,comments))))
|
||||
|
||||
;; markdown-mode
|
||||
`(markdown-header-face ((,c (:foreground ,orange :bold t))))
|
||||
`(markdown-header-delimiter-face ((,c (:foreground ,orange :bold t))))
|
||||
`(markdown-header-face ((,c (:foreground ,orange :bold ,bold))))
|
||||
`(markdown-header-delimiter-face ((,c (:foreground ,orange :bold ,bold))))
|
||||
`(markdown-blockquote-face ((,c (:foreground ,blue+2))))
|
||||
`(markdown-markup-face ((,c (:foreground ,cyan))))
|
||||
`(markdown-inline-face ((,c (:foreground ,cyan))))
|
||||
|
|
@ -276,13 +304,13 @@
|
|||
`(org-meta-line ((,c (:foreground ,vsubtle))))
|
||||
`(org-block-begin-line ((,c (:background ,current-line :foreground ,vsubtle))))
|
||||
`(org-block-end-line ((,c (:inherit org-block-begin-line))))
|
||||
`(org-archived ((,c (:foreground ,grey-.5))))
|
||||
`(org-archived ((,c (:foreground ,grey-.5))))
|
||||
|
||||
`(org-document-title ((,c (:foreground ,cyan :height 1.30 :bold t))))
|
||||
`(org-level-1 ((,c (:foreground ,orange :bold t))))
|
||||
`(org-level-2 ((,c (:foreground ,dark-cyan :bold t))))
|
||||
`(org-level-3 ((,c (:foreground ,violet :bold t))))
|
||||
`(org-level-4 ((,c (:foreground ,green :bold t))))
|
||||
`(org-document-title ((,c (:inherit variable-pitch :foreground ,cyan :height 1.30 :bold ,bold))))
|
||||
`(org-level-1 ((,c (:foreground ,orange :bold ,bold))))
|
||||
`(org-level-2 ((,c (:foreground ,dark-cyan :bold ,bold))))
|
||||
`(org-level-3 ((,c (:foreground ,violet :bold ,bold))))
|
||||
`(org-level-4 ((,c (:foreground ,green :bold ,bold))))
|
||||
`(org-level-5 ((,c (:foreground ,yellow))))
|
||||
`(org-level-6 ((,c (:foreground ,blue+2))))
|
||||
;;`(org-level-7 ((,c ())))
|
||||
|
|
@ -292,7 +320,7 @@
|
|||
`(org-code ((,c (:foreground ,orange))))
|
||||
`(org-verbatim ((,c (:foreground ,green))))
|
||||
`(org-formula ((,c (:foreground ,cyan))))
|
||||
`(org-list-dt ((,c (:foreground ,cyan :bold t))))
|
||||
`(org-list-dt ((,c (:foreground ,cyan :bold ,bold))))
|
||||
`(org-footnote ((,c (:foreground ,orange))))
|
||||
|
||||
`(org-link ((,c (:underline t :foreground ,yellow :bold inherit))))
|
||||
|
|
@ -310,12 +338,37 @@
|
|||
`(org-block-background ((,c (:background ,current-line))))
|
||||
`(org-todo-high ((,c (:foreground ,orange :bold inherit))))
|
||||
`(org-todo-vhigh ((,c (:foreground ,magenta :bold inherit))))
|
||||
`(org-list-bullet ((,c (:foreground ,orange :bold t))))
|
||||
`(org-list-bullet ((,c (:foreground ,orange :bold ,bold))))
|
||||
`(org-whitespace ((,c (:inherit fixed-pitch))))
|
||||
`(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))
|
||||
)
|
||||
|
||||
;; *****************************************************************************************
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue