diff options
| -rw-r--r-- | init.el | 138 | ||||
| -rw-r--r-- | lisp/meow-binds.el | 84 | ||||
| -rw-r--r-- | lisp/quiet.el | 48 |
3 files changed, 136 insertions, 134 deletions
@@ -1,3 +1,6 @@ +;; Pick up config from lisp/ +(add-to-list 'load-path (expand-file-name "lisp" user-emacs-directory)) + ;; Always load newest byte code (setopt load-prefer-newer t) @@ -84,57 +87,6 @@ (set-face-attribute 'default nil :font "Iosevka" :height 124) (set-face-attribute 'fixed-pitch nil :family "Iosevka")) -(deftheme quiet "Simple white-on-black theme" - :background-mode 'dark - :kind 'color-scheme) - -(let ((quiet-bg "#181616") - (quiet-fg "#c5c9c5") - (quiet-fg-dim "#707070") - (quiet-const "#999999") - (quiet-error "#ff003f")) - - ;; M-x list-faces-display for face identifiers - ;; C-h f set-face-attribute for face modifications - (custom-theme-set-faces - 'quiet - `(default ((t (:background ,quiet-bg :foreground ,quiet-fg)))) - `(fringe ((t (:background ,quiet-bg :foreground ,quiet-fg)))) - `(cursor ((t (:background ,quiet-fg :inverse-video t)))) - `(vertical-border ((t (:foreground ,quiet-fg-dim)))) - `(minibuffer-prompt ((t (:foreground ,quiet-fg :weight bold)))) - `(mode-line ((t (:background ,quiet-fg :foreground ,quiet-bg :box ,quiet-fg)))) - `(mode-line-inactive ((t (:background ,quiet-fg-dim :foreground ,quiet-bg :box ,quiet-fg-dim)))) - - `(envrc-mode-line-none-face ((t (:foreground ,quiet-bg)))) - `(envrc-mode-line-on-face ((t (:foreground ,quiet-bg)))) - `(envrc-mode-line-error-face ((t (:foreground ,quiet-bg)))) - - `(font-lock-builtin-face ((t (:foreground ,quiet-fg)))) - `(font-lock-comment-face ((t (:foreground ,quiet-fg-dim :slant italic)))) - `(font-lock-constant-face ((t (:foreground ,quiet-const)))) - `(font-lock-function-call-face ((t (:foreground ,quiet-fg)))) - `(font-lock-function-name-face ((t (:foreground ,quiet-fg)))) - `(font-lock-keyword-face ((t (:foreground ,quiet-fg :weight bold)))) - `(font-lock-preprocessor-face ((t (:foreground ,quiet-fg)))) - `(font-lock-property-name-face ((t (:foreground ,quiet-fg)))) - `(font-lock-property-use-face ((t (:foreground ,quiet-fg)))) - `(font-lock-string-face ((t (:foreground ,quiet-const)))) - `(font-lock-type-face ((t (:foreground ,quiet-fg)))) - `(Font-lock-variable-name-face ((t (:foreground ,quiet-fg)))) - `(font-lock-variable-use-face ((t (:foreground ,quiet-fg)))) - - `(tuareg-font-lock-governing-face ((t (:foreground ,quiet-fg :weight bold)))) - - `(line-number ((t (:foreground "#585858")))) - `(show-paren-match ((t (:foreground "#ff00af" :weight bold)))) - `(show-paren-mismatch ((t (:background ,quiet-error)))) - `(highlight ((t (:background "#303030")))) - `(fill-column-indicator ((t (:height 1 :background ,quiet-fg-dim :foreground ,quiet-fg-dim)))) - `(region ((t (:background "#ffaf00" :foreground ,quiet-bg)))))) - -;; (enable-theme 'quiet) - (use-package mu4e :ensure nil :custom @@ -143,89 +95,6 @@ mu4e-confirm-quit nil ;; don't ask to quit mu4e-change-filenames-when-moving t)) -(defun meow-setup () - (setq meow-cheatsheet-layout meow-cheatsheet-layout-qwerty) - (meow-motion-define-key - '("j" . meow-next) - '("k" . meow-prev) - '("<escape>" . ignore)) - (meow-leader-define-key - ;; Use SPC (0-9) for digit arguments. - '("1" . meow-digit-argument) - '("2" . meow-digit-argument) - '("3" . meow-digit-argument) - '("4" . meow-digit-argument) - '("5" . meow-digit-argument) - '("6" . meow-digit-argument) - '("7" . meow-digit-argument) - '("8" . meow-digit-argument) - '("9" . meow-digit-argument) - '("0" . meow-digit-argument) - '("/" . meow-keypad-describe-key) - '("?" . meow-cheatsheet)) - (meow-normal-define-key - '("0" . meow-expand-0) - '("9" . meow-expand-9) - '("8" . meow-expand-8) - '("7" . meow-expand-7) - '("6" . meow-expand-6) - '("5" . meow-expand-5) - '("4" . meow-expand-4) - '("3" . meow-expand-3) - '("2" . meow-expand-2) - '("1" . meow-expand-1) - '("-" . negative-argument) - '(";" . meow-reverse) - '("," . meow-inner-of-thing) - '("." . meow-bounds-of-thing) - '("[" . meow-beginning-of-thing) - '("]" . meow-end-of-thing) - '("a" . meow-append) - '("A" . meow-open-below) - '("b" . meow-back-word) - '("B" . meow-back-symbol) - '("c" . meow-change) - '("d" . meow-delete) - '("D" . meow-backward-delete) - '("e" . meow-next-word) - '("E" . meow-next-symbol) - '("f" . meow-find) - '("g" . meow-cancel-selection) - '("G" . meow-grab) - '("h" . meow-left) - '("H" . meow-left-expand) - '("i" . meow-insert) - '("I" . meow-open-above) - '("j" . meow-next) - '("J" . meow-next-expand) - '("k" . meow-prev) - '("K" . meow-prev-expand) - '("l" . meow-right) - '("L" . meow-right-expand) - '("m" . meow-join) - '("n" . meow-search) - '("o" . meow-block) - '("O" . meow-to-block) - '("p" . meow-yank) - '("q" . meow-quit) - '("Q" . meow-goto-line) - '("r" . meow-replace) - '("R" . meow-swap-grab) - '("s" . meow-kill) - '("t" . meow-till) - '("u" . meow-undo) - '("U" . meow-undo-in-selection) - '("v" . meow-visit) - '("w" . meow-mark-word) - '("W" . meow-mark-symbol) - '("x" . meow-line) - '("X" . meow-goto-line) - '("y" . meow-save) - '("Y" . meow-sync-grab) - '("z" . meow-pop-selection) - '("'" . repeat) - '("<escape>" . ignore))) - (use-package ef-themes :ensure t :config @@ -234,6 +103,7 @@ (use-package meow :ensure t :config + (require 'meow-binds) (setq meow-use-clipboard t) (meow-setup) (meow-global-mode 1)) diff --git a/lisp/meow-binds.el b/lisp/meow-binds.el new file mode 100644 index 0000000..7bc555e --- /dev/null +++ b/lisp/meow-binds.el @@ -0,0 +1,84 @@ +(defun meow-setup () + (setq meow-cheatsheet-layout meow-cheatsheet-layout-qwerty) + (meow-motion-define-key + '("j" . meow-next) + '("k" . meow-prev) + '("<escape>" . ignore)) + (meow-leader-define-key + ;; Use SPC (0-9) for digit arguments. + '("1" . meow-digit-argument) + '("2" . meow-digit-argument) + '("3" . meow-digit-argument) + '("4" . meow-digit-argument) + '("5" . meow-digit-argument) + '("6" . meow-digit-argument) + '("7" . meow-digit-argument) + '("8" . meow-digit-argument) + '("9" . meow-digit-argument) + '("0" . meow-digit-argument) + '("/" . meow-keypad-describe-key) + '("?" . meow-cheatsheet)) + (meow-normal-define-key + '("0" . meow-expand-0) + '("9" . meow-expand-9) + '("8" . meow-expand-8) + '("7" . meow-expand-7) + '("6" . meow-expand-6) + '("5" . meow-expand-5) + '("4" . meow-expand-4) + '("3" . meow-expand-3) + '("2" . meow-expand-2) + '("1" . meow-expand-1) + '("-" . negative-argument) + '(";" . meow-reverse) + '("," . meow-inner-of-thing) + '("." . meow-bounds-of-thing) + '("[" . meow-beginning-of-thing) + '("]" . meow-end-of-thing) + '("a" . meow-append) + '("A" . meow-open-below) + '("b" . meow-back-word) + '("B" . meow-back-symbol) + '("c" . meow-change) + '("d" . meow-delete) + '("D" . meow-backward-delete) + '("e" . meow-next-word) + '("E" . meow-next-symbol) + '("f" . meow-find) + '("g" . meow-cancel-selection) + '("G" . meow-grab) + '("h" . meow-left) + '("H" . meow-left-expand) + '("i" . meow-insert) + '("I" . meow-open-above) + '("j" . meow-next) + '("J" . meow-next-expand) + '("k" . meow-prev) + '("K" . meow-prev-expand) + '("l" . meow-right) + '("L" . meow-right-expand) + '("m" . meow-join) + '("n" . meow-search) + '("o" . meow-block) + '("O" . meow-to-block) + '("p" . meow-yank) + '("q" . meow-quit) + '("Q" . meow-goto-line) + '("r" . meow-replace) + '("R" . meow-swap-grab) + '("s" . meow-kill) + '("t" . meow-till) + '("u" . meow-undo) + '("U" . meow-undo-in-selection) + '("v" . meow-visit) + '("w" . meow-mark-word) + '("W" . meow-mark-symbol) + '("x" . meow-line) + '("X" . meow-goto-line) + '("y" . meow-save) + '("Y" . meow-sync-grab) + '("z" . meow-pop-selection) + '("'" . repeat) + '("<escape>" . ignore))) + +(provide 'meow-binds) diff --git a/lisp/quiet.el b/lisp/quiet.el new file mode 100644 index 0000000..143b866 --- /dev/null +++ b/lisp/quiet.el @@ -0,0 +1,48 @@ +(deftheme quiet "Simple white-on-black theme" + :background-mode 'dark + :kind 'color-scheme) + +(let ((quiet-bg "#181616") + (quiet-fg "#c5c9c5") + (quiet-fg-dim "#707070") + (quiet-const "#999999") + (quiet-error "#ff003f")) + + ;; M-x list-faces-display for face identifiers + ;; C-h f set-face-attribute for face modifications + (custom-theme-set-faces + 'quiet + `(default ((t (:background ,quiet-bg :foreground ,quiet-fg)))) + `(fringe ((t (:background ,quiet-bg :foreground ,quiet-fg)))) + `(cursor ((t (:background ,quiet-fg :inverse-video t)))) + `(vertical-border ((t (:foreground ,quiet-fg-dim)))) + `(minibuffer-prompt ((t (:foreground ,quiet-fg :weight bold)))) + `(mode-line ((t (:background ,quiet-fg :foreground ,quiet-bg :box ,quiet-fg)))) + `(mode-line-inactive ((t (:background ,quiet-fg-dim :foreground ,quiet-bg :box ,quiet-fg-dim)))) + + `(envrc-mode-line-none-face ((t (:foreground ,quiet-bg)))) + `(envrc-mode-line-on-face ((t (:foreground ,quiet-bg)))) + `(envrc-mode-line-error-face ((t (:foreground ,quiet-bg)))) + + `(font-lock-builtin-face ((t (:foreground ,quiet-fg)))) + `(font-lock-comment-face ((t (:foreground ,quiet-fg-dim :slant italic)))) + `(font-lock-constant-face ((t (:foreground ,quiet-const)))) + `(font-lock-function-call-face ((t (:foreground ,quiet-fg)))) + `(font-lock-function-name-face ((t (:foreground ,quiet-fg)))) + `(font-lock-keyword-face ((t (:foreground ,quiet-fg :weight bold)))) + `(font-lock-preprocessor-face ((t (:foreground ,quiet-fg)))) + `(font-lock-property-name-face ((t (:foreground ,quiet-fg)))) + `(font-lock-property-use-face ((t (:foreground ,quiet-fg)))) + `(font-lock-string-face ((t (:foreground ,quiet-const)))) + `(font-lock-type-face ((t (:foreground ,quiet-fg)))) + `(Font-lock-variable-name-face ((t (:foreground ,quiet-fg)))) + `(font-lock-variable-use-face ((t (:foreground ,quiet-fg)))) + + `(tuareg-font-lock-governing-face ((t (:foreground ,quiet-fg :weight bold)))) + + `(line-number ((t (:foreground "#585858")))) + `(show-paren-match ((t (:foreground "#ff00af" :weight bold)))) + `(show-paren-mismatch ((t (:background ,quiet-error)))) + `(highlight ((t (:background "#303030")))) + `(fill-column-indicator ((t (:height 1 :background ,quiet-fg-dim :foreground ,quiet-fg-dim)))) + `(region ((t (:background "#ffaf00" :foreground ,quiet-bg)))))) |