The ciiiircle of liiiife
This commit is contained in:
parent
0923903e93
commit
03c6c05677
29 changed files with 287 additions and 465 deletions
|
@ -29,6 +29,7 @@
|
|||
"M-t" 'helm-projectile-find-file
|
||||
"A-`" 'narf-switch-to-iterm
|
||||
"C-`" 'narf/popup-toggle
|
||||
"C-~" 'rtog/toggle-repl
|
||||
"<f9>" 'what-face
|
||||
|
||||
"M-w" 'evil-window-delete
|
||||
|
@ -202,7 +203,8 @@
|
|||
:m "gl" 'avy-goto-line
|
||||
:m "g]" 'smart-right
|
||||
:m "g[" 'smart-left
|
||||
:no "g@" 'narf/evil-macro-on-all-lines
|
||||
:v "@" 'narf/evil-macro-on-all-lines
|
||||
:n "g@" 'narf/evil-macro-on-all-lines
|
||||
|
||||
:v "." 'evil-repeat
|
||||
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
|
||||
(exmap "a" 'helm-projectile-find-other-file)
|
||||
(exmap "acomp[ile]" 'narf:compile-autoloads)
|
||||
(exmap "ag" 'narf:helm-search)
|
||||
(exmap "ag[cw]d" 'narf:helm-search-cwd)
|
||||
(exmap "agr" 'narf:helm-regex-search)
|
||||
(exmap "agr[cw]d" 'narf:helm-regex-search-cwd)
|
||||
(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:whitespace-align)
|
||||
(exmap "bcomp[ile]" 'narf:compile-el)
|
||||
(exmap "big" 'narf:toggle-big-mode)
|
||||
|
@ -44,6 +44,7 @@
|
|||
(exmap "fi[nd]" 'narf:helm-swoop)
|
||||
(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 "tcd" (λ (narf:send-to-tmux (format "cd '%s'" default-directory))))
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
# -*- mode: snippet -*-
|
||||
# group: file templates
|
||||
# contributor: Henrik Lissner
|
||||
# --
|
||||
#include "`(file-name-nondirectory (file-name-sans-extension (buffer-file-name)))`.h"
|
||||
|
||||
$0
|
|
@ -1,7 +0,0 @@
|
|||
# -*- mode: snippet -*-
|
||||
# group: file templates
|
||||
# contributor: Henrik Lissner
|
||||
# --
|
||||
#include "`(file-name-nondirectory (file-name-sans-extension (buffer-file-name)))`.h"
|
||||
|
||||
$0
|
|
@ -1,10 +0,0 @@
|
|||
# -*- mode: snippet -*-
|
||||
# group: file templates
|
||||
# contributor: Henrik Lissner
|
||||
# --
|
||||
#ifndef ${1:__`(upcase (f-base buffer-file-name))`_H_$(upcase yas-text)}
|
||||
#define $1
|
||||
|
||||
$0
|
||||
|
||||
#endif // $1
|
|
@ -1,6 +1,3 @@
|
|||
# -*- mode: snippet -*-
|
||||
# contributor: Henrik Lissner
|
||||
# --
|
||||
##
|
||||
# ${1:Project Title}
|
||||
#
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;; NARF Dark
|
||||
;; By Henrik Lissner <http://github.com/hlissner/emacs.d>
|
||||
|
||||
(deftheme narf-dark "A dark theme for narfy emacs, inspired by Molokai.")
|
||||
(deftheme narf-dark "A dark theme for narfy emacs, inspired by Molokai")
|
||||
|
||||
(custom-theme-set-variables 'narf-dark)
|
||||
|
||||
|
@ -40,7 +40,7 @@
|
|||
(search-rest-fg black)
|
||||
(highlight orange)
|
||||
(vertical-bar grey-2)
|
||||
(current-line "#232526")
|
||||
(current-line "#262829")
|
||||
(selection "#535556")
|
||||
(builtin orange)
|
||||
(comments grey-1)
|
||||
|
@ -49,7 +49,7 @@
|
|||
(functions cyan)
|
||||
(keywords magenta)
|
||||
(methods dark-cyan)
|
||||
(operators grey)
|
||||
(operators violet)
|
||||
(type cyan)
|
||||
(strings green)
|
||||
(variables orange)
|
||||
|
@ -78,40 +78,45 @@
|
|||
'narf-dark
|
||||
|
||||
;; Text
|
||||
`(default ((,c (:foreground ,fg :background ,bg))))
|
||||
`(fringe ((,c (:background ,bg :foreground ,grey-1))))
|
||||
`(cursor ((,c (:background ,white))))
|
||||
`(hl-line ((,c (:background ,current-line))))
|
||||
`(region ((,c (:background ,grey-2 :foreground ,white))))
|
||||
`(highlight ((,c (:foreground ,yellow :inverse-video t))))
|
||||
`(shadow ((,c (:foreground ,cyan))))
|
||||
;; `(secondary-selection ((,c (:background ,orange))))
|
||||
;; `(lazy-highlight ((,c (:background ,orange))))
|
||||
;; `(match ((,c (:background ,magenta))))
|
||||
`(default ((,c (:foreground ,fg :background ,bg))))
|
||||
`(fringe ((,c (:background ,bg :foreground ,grey-1))))
|
||||
`(cursor ((,c (:background ,white))))
|
||||
`(hl-line ((,c (:background ,current-line))))
|
||||
`(region ((,c (:background ,grey-2 :foreground ,white))))
|
||||
`(highlight ((,c (:foreground ,yellow :inverse-video t))))
|
||||
`(shadow ((,c (:foreground ,orange))))
|
||||
;; `(secondary-selection ((,c (:background ,orange))))
|
||||
;; `(lazy-highlight ((,c (:background ,orange))))
|
||||
;; `(match ((,c (:background ,magenta))))
|
||||
`(scroll-bar ((,c (:background ,green))))
|
||||
|
||||
`(error ((,c (:foreground ,red :bold t))))
|
||||
`(warning ((,c (:foreground ,yellow :bold t))))
|
||||
`(success ((,c (:foreground ,green :bold t))))
|
||||
`(error ((,c (:foreground ,red :bold t))))
|
||||
`(warning ((,c (:foreground ,yellow :bold t))))
|
||||
`(success ((,c (:foreground ,green :bold t))))
|
||||
|
||||
`(hs-face ((,c (:foreground ,comments :background ,black))))
|
||||
`(hs-fringe-face ((,c (:foreground ,grey :background ,current-line))))
|
||||
`(spaceline-flycheck-error ((,c (:bold t :foreground ,red))))
|
||||
`(spaceline-flycheck-warning ((,c (:bold t :foreground ,yellow))))
|
||||
`(spaceline-flycheck-info ((,c (:bold t :foreground ,green))))
|
||||
|
||||
`(font-lock-builtin-face ((,c (:foreground ,builtin))))
|
||||
`(font-lock-comment-face ((,c (:foreground ,comments))))
|
||||
`(hs-face ((,c (:foreground ,comments :background ,black))))
|
||||
`(hs-fringe-face ((,c (:foreground ,orange))))
|
||||
|
||||
`(font-lock-builtin-face ((,c (:foreground ,builtin))))
|
||||
`(font-lock-comment-face ((,c (:foreground ,comments))))
|
||||
`(font-lock-comment-delimiter-face ((,c (:foreground ,comments))))
|
||||
`(font-lock-doc-face ((,c (:foreground ,blue+2))))
|
||||
`(font-lock-doc-string-face ((,c (:foreground ,blue+2))))
|
||||
`(font-lock-constant-face ((,c (:foreground ,constants))))
|
||||
`(font-lock-function-name-face ((,c (:foreground ,functions))))
|
||||
`(font-lock-keyword-face ((,c (:foreground ,keywords))))
|
||||
;;`(font-lock-negation-char-face ((,class ())))
|
||||
;;`(font-lock-preprocessor-char-face ((,class ())))
|
||||
;;`(font-lock-regexp-grouping-backslash ((,class ())))
|
||||
;;`(font-lock-regexp-grouping-construct ((,class ())))
|
||||
`(font-lock-string-face ((,c (:foreground ,strings))))
|
||||
`(font-lock-type-face ((,c (:foreground ,type))))
|
||||
`(font-lock-variable-name-face ((,c (:foreground ,variables))))
|
||||
`(font-lock-warning-face ((,c (:foreground ,red))))
|
||||
`(font-lock-doc-face ((,c (:foreground ,blue+2))))
|
||||
`(font-lock-doc-string-face ((,c (:foreground ,blue+2))))
|
||||
`(font-lock-constant-face ((,c (:foreground ,constants))))
|
||||
`(font-lock-function-name-face ((,c (:foreground ,functions))))
|
||||
`(font-lock-keyword-face ((,c (:foreground ,keywords))))
|
||||
`(font-lock-string-face ((,c (:foreground ,strings))))
|
||||
`(font-lock-type-face ((,c (:foreground ,type))))
|
||||
`(font-lock-variable-name-face ((,c (:foreground ,variables))))
|
||||
`(font-lock-warning-face ((,c (:foreground ,red))))
|
||||
`(font-lock-negation-char-face ((,c (:foreground ,operators))))
|
||||
`(font-lock-preprocessor-char-face ((,c (:foreground ,operators))))
|
||||
`(font-lock-regexp-grouping-backslash ((,c (:foreground ,operators))))
|
||||
`(font-lock-regexp-grouping-construct ((,c (:foreground ,operators))))
|
||||
|
||||
`(bold ((,c (:weight bold :foreground ,white))))
|
||||
`(italic ((,c (:slant italic :foreground ,subtle))))
|
||||
|
@ -137,9 +142,8 @@
|
|||
`(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))))
|
||||
`(mode-line-iedit-face ((,c (:foreground ,black :background ,magenta))))
|
||||
`(mode-line-substitute-face ((,c (:foreground ,black :background ,yellow))))
|
||||
`(spaceline-highlight-face ((,c (:foreground ,black :background ,highlight :bold t))))
|
||||
`(mode-line-count-face ((,c (:foreground ,black :background ,magenta :bold t))))
|
||||
|
||||
;; Search
|
||||
`(isearch ((,c (:foreground ,search-fg :background ,search-bg))))
|
||||
|
@ -205,14 +209,22 @@
|
|||
`(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 ,bg :background ,red))))
|
||||
`(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 ,bg :foreground ,bg :height 0.1))))
|
||||
`(helm-source-header ((,c (:background ,current-line :foreground ,grey-1))))
|
||||
`(helm-selection ((,c (:background ,selection))))
|
||||
`(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))))
|
||||
|
||||
|
||||
;; Avy
|
||||
`(avy-lead-face-0 ((,c (:background ,orange :foreground ,black))))
|
||||
|
@ -252,22 +264,19 @@
|
|||
`(org-tag ((,c (:foreground ,grey-1))))
|
||||
;; `(org-ellipsis ((,c (:inherit hs-face))))
|
||||
|
||||
`(org-whitespace ((,c (:inherit fixed-pitch))))
|
||||
`(org-table ((,c (:inherit fixed-pitch :foreground ,cyan))))
|
||||
`(org-block ((,c (:inherit fixed-pitch :background ,current-line))))
|
||||
`(org-quote ((,c (:slant italic :foreground ,grey :background ,current-line))))
|
||||
`(org-block-background ((,c (:inherit fixed-pitch :background ,current-line))))
|
||||
`(org-document-info ((,c (:inherit fixed-pitch :foreground ,orange))))
|
||||
`(org-document-info-keyword ((,c (:inherit fixed-pitch :foreground ,grey-1))))
|
||||
`(org-meta-line ((,c (:inherit fixed-pitch :background ,current-line :foreground ,vsubtle))))
|
||||
`(org-block-begin-line ((,c (:inherit fixed-pitch :background ,current-line :foreground ,vsubtle))))
|
||||
`(org-block-end-line ((,c (:inherit org-block-begin-line))))
|
||||
|
||||
`(org-document-title ((,c (:foreground ,fg :height 1.30 :bold t))))
|
||||
`(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))))
|
||||
`(org-level-3 ((,c (:foreground ,grey))))
|
||||
`(org-level-4 ((,c (:foreground ,green))))
|
||||
`(org-level-2 ((,c (:foreground ,dark-cyan :bold t))))
|
||||
`(org-level-3 ((,c (:foreground ,cyan :bold t))))
|
||||
`(org-level-4 ((,c (:foreground ,green :bold t))))
|
||||
`(org-level-5 ((,c (:foreground ,cyan))))
|
||||
`(org-level-6 ((,c (:foreground ,blue+2))))
|
||||
;; `(org-level-7 ((,c ())))
|
||||
|
@ -277,19 +286,26 @@
|
|||
`(org-code ((,c (:inherit fixed-pitch :foreground ,orange))))
|
||||
`(org-verbatim ((,c (:inherit fixed-pitch :foreground ,green))))
|
||||
`(org-formula ((,c (:inherit fixed-pitch :foreground ,cyan))))
|
||||
`(org-list-dt ((,c (:foreground ,cyan :bold t))))
|
||||
`(org-footnote ((,c (:inherit fixed-pitch :foreground ,orange))))
|
||||
|
||||
`(org-link ((,c (:inherit variable-pitch :underline t :foreground ,yellow))))
|
||||
`(org-date ((,c (:foreground ,violet))))
|
||||
`(org-item-checkbox ((,c (:inherit variable-pitch))))
|
||||
`(org-item-checkbox-checked ((,c (:inherit org-headline-done))))
|
||||
`(org-todo ((,c (:inherit variable-pitch :foreground ,yellow))))
|
||||
`(org-todo-high ((,c (:inherit variable-pitch :foreground ,yellow))))
|
||||
`(org-todo-vhigh ((,c (:inherit variable-pitch :foreground ,magenta))))
|
||||
`(org-done ((,c (:inherit variable-pitch :foreground ,green))))
|
||||
`(org-headline-done ((,c (:inherit variable-pitch :foreground ,grey-.5 :strike-through t))))
|
||||
`(org-link ((,c (:underline t :foreground ,yellow :bold inherit))))
|
||||
`(org-date ((,c (:inherit fixed-pitch :foreground ,violet))))
|
||||
`(org-todo ((,c (:foreground ,yellow :bold inherit))))
|
||||
`(org-done ((,c (:foreground ,green :bold inherit))))
|
||||
`(org-headline-done ((,c (:foreground ,grey-.5 :strike-through t :bold nil))))
|
||||
`(org-special-keyword ((,c (:foreground ,magenta))))
|
||||
`(org-checkbox-statistics-todo ((,c (:inherit org-todo :bold t))))
|
||||
`(org-checkbox-statistics-done ((,c (:inherit org-done :bold t))))
|
||||
`(org-checkbox-statistics-todo ((,c (:inherit org-todo))))
|
||||
`(org-checkbox-statistics-done ((,c (:inherit org-done))))
|
||||
|
||||
;; NARF custom org faces
|
||||
`(org-headline-todo ((,c (:foreground ,dark-cyan :bold nil))))
|
||||
`(org-block ((,c (:inherit fixed-pitch :background ,current-line))))
|
||||
`(org-block-background ((,c (:inherit fixed-pitch :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-whitespace ((,c (:inherit fixed-pitch))))
|
||||
))
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue