diff --git a/core/core-evil.el b/core/core-evil.el index bfd2230b6..c07b21129 100644 --- a/core/core-evil.el +++ b/core/core-evil.el @@ -66,7 +66,6 @@ (help-mode . normal) (message-mode . normal) (compilation-mode . normal) - (inferior-emacs-lisp-mode . emacs) (calendar-mode . emacs) (Man-mode . emacs) (grep-mode . emacs) diff --git a/core/core-popup.el b/core/core-popup.el index e01c69b91..c526b7fd8 100644 --- a/core/core-popup.el +++ b/core/core-popup.el @@ -16,6 +16,11 @@ ("^\\*CPU-Profiler-Report .+\\*$" :regexp t :position bottom :height 0.35) ("*Flycheck errors*" :position bottom :height 15 :stick t) ("*quickrun*" :position bottom :height 15 :stick t) + ("*minor-modes*" :position bottom :height 0.5 :stick t) + + ;; vcs + ("\\*git-gutter.+\\*" :regexp t :position bottom :height 30 :stick t) + ;; Helm ("^\\*[Hh]elm.*?\\*\\'" :regexp t :position bottom :height 0.2) ("*helm-mode-find-file-at-point*" :position bottom :height 10) diff --git a/core/core-quickrun.el b/core/core-quickrun.el index 1e53d6168..fa2d41b3e 100644 --- a/core/core-quickrun.el +++ b/core/core-quickrun.el @@ -10,9 +10,7 @@ helm-quickrun) :config (setq quickrun-focus-p t) - (add-hook! quickrun/mode 'linum-mode) - (add-hook! quickrun/mode 'yascroll-bar-mode) - + (add-hook! quickrun/mode '(linum-mode yascroll-bar-mode)) (add-to-list 'quickrun-file-alist '("\\.gvy$" . "groovy"))) (use-package repl-toggle diff --git a/core/core-ui.el b/core/core-ui.el index e23b7ff70..25c0c4ecf 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -8,27 +8,29 @@ ;; Multiple cursors across buffers cause a strange redraw delay for ;; some things, like auto-complete or evil-mode's cursor color ;; switching. - cursor-in-non-selected-windows nil - highlight-nonselected-windows nil + cursor-in-non-selected-windows nil + highlight-nonselected-windows nil - uniquify-buffer-name-style nil - visible-bell nil ; silence of the bells - use-dialog-box nil ; always avoid GUI - redisplay-dont-pause t - indicate-buffer-boundaries nil - indicate-empty-lines t - fringes-outside-margins t - hl-line-sticky-flag nil ; only highlight in one window + ;; Custom mode-line solves duplicate buffer names + uniquify-buffer-name-style nil + visible-bell nil ; silence of the bells + use-dialog-box nil ; always avoid GUI + redisplay-dont-pause t + indicate-buffer-boundaries nil + indicate-empty-lines t + fringes-outside-margins t + hl-line-sticky-flag nil ; only highlight in one window - jit-lock-defer-time nil - jit-lock-stealth-time 1 + jit-lock-defer-time nil + jit-lock-stealth-time 1 - split-width-threshold nil - split-height-threshold 30 + split-width-threshold nil + split-height-threshold 30 - resize-mini-windows 'grow-only + resize-mini-windows 'grow-only - fringe-indicator-alist (delq (assoc 'continuation fringe-indicator-alist) fringe-indicator-alist)) + fringe-indicator-alist (delq (assoc 'continuation fringe-indicator-alist) + fringe-indicator-alist)) (defvar narf-fringe-size 6) (if window-system @@ -45,8 +47,8 @@ (set-window-fringes (minibuffer-window) 0 0 nil) (defun narf|minibuffer-setup () - (make-local-variable 'face-remapping-alist) (set-window-fringes (selected-window) 0 0 nil) + (make-local-variable 'face-remapping-alist) (add-to-list 'face-remapping-alist '(default mode-line-inactive))) (add-hook! minibuffer-setup 'narf|minibuffer-setup)) (menu-bar-mode -1)) @@ -66,10 +68,8 @@ (defvar narf--hl-line-mode nil) (make-variable-buffer-local 'narf--hl-line-mode) -(defun narf|hl-line-on () - (when narf--hl-line-mode (hl-line-mode +1))) -(defun narf|hl-line-off () - (when narf--hl-line-mode (hl-line-mode -1))) +(defun narf|hl-line-on () (if narf--hl-line-mode (hl-line-mode +1))) +(defun narf|hl-line-off () (if narf--hl-line-mode (hl-line-mode -1))) (add-hook! hl-line-mode (if hl-line-mode (setq narf--hl-line-mode t))) (add-hook! evil-visual-state-entry 'narf|hl-line-off) diff --git a/core/core.el b/core/core.el index 35e2369a8..07d48637c 100644 --- a/core/core.el +++ b/core/core.el @@ -8,7 +8,7 @@ ;; narf:... An ex command ;; narf|... A hook ;; narf*... An advising function -;; narf.... Custom hooks +;; narf.... Custom prefix commands ;; ...! Macro ;; ;;; diff --git a/init.el b/init.el index 9b6880976..259856ae1 100644 --- a/init.el +++ b/init.el @@ -60,6 +60,7 @@ (IS-LINUX 'core-os-linux) (IS-WINDOWS 'core-os-win32)) + ;;; The heart of NARF core-popup ; taming stray windows core-ui ; draw me like one of your French editors core-evil ; come to the dark side, we have cookies @@ -74,6 +75,7 @@ core-quickrun ; run code, run. core-workgroups ; cure Emacs alzheimers + ;;; Extras module-cc ; c/c++/obj-c madness module-csharp ; unity, .NET, and mono shenanigans module-collab ; wonewy, I'm so wonewy~ diff --git a/modules/module-lisp.el b/modules/module-lisp.el index 907966f54..5277dc5dd 100644 --- a/modules/module-lisp.el +++ b/modules/module-lisp.el @@ -19,21 +19,7 @@ (add-to-list 'imenu-generic-expression '("Package" - "\\(^\\s-*(use-package +\\)\\(\\_<.+\\_>\\)" 2)) - - ;; Highlight extra NARF keywords - (let ((keywords '("add-hook!" - "map!" - "after!" - "λ" - "in!" - "define-company-backend!" - "define-text-object!" - "define-builder!" - ))) - (font-lock-add-keywords 'emacs-lisp-mode - `((,(concat "(\\s-*" (regexp-opt keywords 'paren) "\\_>") - 1 font-lock-keyword-face)) 'append))) + "\\(^\\s-*(use-package +\\)\\(\\_<.+\\_>\\)" 2))) (font-lock-add-keywords 'emacs-lisp-mode `(("\\(lambda\\)" (0 (narf/show-as ?λ))))) diff --git a/modules/module-writing.el b/modules/module-writing.el index 8b6b5b8bd..4d35c819b 100644 --- a/modules/module-writing.el +++ b/modules/module-writing.el @@ -2,7 +2,7 @@ (defvar biblio-directory (concat narf-dropbox-dir "docs/biblio/") "docstring") -(setq-default visual-fill-column-center-text t) +(setq-default visual-fill-column-center-text nil) (defun narf|refresh-visual-fill-col () (visual-fill-column-mode +1)) @@ -55,7 +55,6 @@ (add-hook! LaTeX-mode 'turn-on-auto-fill) (use-package reftex - :diminish reftex-mode :config (add-hook 'latex-mode-hook 'turn-on-reftex) (add-hook 'LaTeX-mode-hook 'turn-on-reftex)