delete-window-or-previous-buffer and README.

Commit
23107dcf7571bdfa7bd6ebafa08d027752299eb2
Author
Blendoit <blendoit@gmail.com>
Author date
Committer
Blendoit <blendoit@gmail.com>
Committer date
Changed files
README.org
index f6f2278d..18581448 100644..100644
@@ -11,8 +11,6 @@
11 11
12 12 Use your package manager.
13 13
14 Removed: /Use Arch Linux. Dunaát make me say it twice./
15 Removed:
16 14 *** Windows
17 15
18 16 Head on over to https://www.gnu.org/savannah-checkouts/gnu/emacs/download.html
blendoit/init-blendoit.org
index cf10446c..c6be9139 100644..100644
@@ -37,13 +37,14 @@
37 37 (setq gc-cons-threshold 100000000)
38 38 #+END_SRC
39 39
40 Removed: ** Server start
40 Added: ** Emacs client
41 41
42 42 Makes opening emacs faster for following instances.
43 43
44 Removed: #+NAME: server-start
44 Added: #+NAME: emacs-client
45 45 #+BEGIN_SRC emacs-lisp
46 Removed: (server-start)
46 Added:
47 Added: ; (setq initial-buffer-choice (lambda () (get-buffer "*dashboard*")))
47 48 #+END_SRC
48 49
49 50 ** Profiling --- start
@@ -51,7 +52,7 @@
51 52 We start the profiler now , and will interrupt it in section [[Profiling ---
52 53 stop]]. We will then present profiling report in [[Profiling --- report]].
53 54
54 Removed: #+NAME: server-start
55 Added: #+NAME: profiler-start
55 56 #+BEGIN_SRC emacs-lisp
56 57 ; (profiler-start)
57 58 #+END_SRC
@@ -133,7 +134,14 @@
133 134 The following bindings lead to more natural exit behaviors.
134 135
135 136 #+BEGIN_SRC emacs-lisp
136 Removed: (global-set-key (kbd "C-w") 'kill-buffer-and-window)
137 Added: (defun delete-window-or-previous-buffer ()
138 Added: "Delete window; if sole window, previous buffer."
139 Added: (interactive)
140 Added: (if (> (length (window-list)) 2)
141 Added: (delete-window)
142 Added: (previous-buffer)))
143 Added:
144 Added: (global-set-key (kbd "C-w") 'delete-window-or-previous-buffer)
137 145 (global-set-key (kbd "C-q") 'save-buffers-kill-terminal)
138 146 #+END_SRC
139 147
@@ -173,11 +181,52 @@
173 181 (setq use-package-always-ensure t)
174 182 #+END_SRC
175 183
184 Added: ** Ivy
185 Added:
186 Added: Auto completion.
187 Added:
188 Added: #+BEGIN_SRC emacs-lisp
189 Added: (use-package ivy
190 Added: :config
191 Added: (setq ivy-use-virtual-buffers t
192 Added: ivy-count-format "%d/%d "
193 Added: enable-recursive-minibuffers t))
194 Added: (ivy-mode t)
195 Added: #+END_SRC
196 Added:
197 Added: ** Evil
198 Added:
199 Added: Forgive me, for I have sinned.
200 Added:
201 Added: #+BEGIN_SRC emacs-lisp
202 Added: (use-package evil)
203 Added: ;; (evil-mode 1)
204 Added: #+END_SRC
205 Added:
206 Added: *** Counsel
207 Added:
208 Added: Wonderful counsellor!
209 Added:
210 Added: #+BEGIN_SRC emacs-lisp
211 Added: (use-package counsel
212 Added: :bind ("M-x" . counsel-M-x)
213 Added: :config (counsel-mode t))
214 Added:
215 Added: (global-set-key (kbd "C-f") 'counsel-grep-or-swiper)
216 Added: #+END_SRC
217 Added:
218 Added: *** Swiper
219 Added:
220 Added: #+BEGIN_SRC emacs-lisp
221 Added: (use-package swiper
222 Added: :bind (("C-f" . counsel-grep-or-swiper)))
223 Added: #+END_SRC
224 Added:
176 225 ** Org
177 226
178 227 Phew, I can finally introduce Org mode! I am so *excited*.
179 228
180 Removed: Org mode replaces a word processor, a presentation creator, and a spreadsheet
229 Added: Org mode replaces aword processor, a presentation creator, and a spreadsheet
181 230 editor. IMHO, the spreadsheet ability captures more than 80% use cases wherein
182 231 one wishes to include a table in a text document destined for physical
183 232 publication. (It is clear that Excel spreadsheets are /not/ destined for physical
@@ -231,35 +280,41 @@
231 280 )
232 281 #+END_SRC
233 282
283 Added: Thank you Diego
284 Added: Zamboni![fn::https://zzamboni.org/post/beautifying-org-mode-in-emacs/]
234 285
235 Removed:
236 286 #+NAME: org-cosmetics
237 287 #+BEGIN_SRC emacs-lisp
288 Added: ;; (let* ((variable-tuple
289 Added: ;; (cond ((x-list-fonts "Dejavu Sans") '(:font "Dejavu Sans"))
290 Added: ;; ((x-family-fonts "Sans Serif") '(:family "Sans Serif"))
291 Added: ;; (nil (warn "Cannot find a Sans Serif Font. Install Source Sans Pro."))))
292 Added: ;; (base-font-color (face-foreground 'default nil 'default))
293 Added: ;; (headline `(:inherit default :weight bold)))
238 294
239 Removed: (let* ((variable-tuple
240 Removed: (cond ((x-list-fonts "Dejavu Serif") '(:font "Dejavu Serif"))
241 Removed: ((x-family-fonts "Sans Serif") '(:family "Sans Serif"))
242 Removed: (nil (warn "Cannot find a Sans Serif Font. Install Source Sans Pro."))))
243 Removed: (base-font-color (face-foreground 'default nil 'default))
244 Removed: (headline `(:inherit default :weight bold)))
295 Added: ;; (custom-theme-set-faces
296 Added: ;; 'user
297 Added: ;; `(org-level-8 ((t (,@headline ,@variable-tuple))))
298 Added: ;; `(org-level-7 ((t (,@headline ,@variable-tuple))))
299 Added: ;; `(org-level-6 ((t (,@headline ,@variable-tuple))))
300 Added: ;; `(org-level-5 ((t (,@headline ,@variable-tuple))))
301 Added: ;; `(org-level-4 ((t (,@headline ,@variable-tuple :height 1.1))))
302 Added: ;; `(org-level-3 ((t (,@headline ,@variable-tuple :height 1.25))))
303 Added: ;; `(org-level-2 ((t (,@headline ,@variable-tuple :height 1.5))))
304 Added: ;; `(org-level-1 ((t (,@headline ,@variable-tuple :height 1.75))))
305 Added: ;; `(org-document-title ((t (,@headline ,@variable-tuple :height 2.0 :underline nil))))))
245 306
246 Removed: (custom-theme-set-faces
247 Removed: 'user
248 Removed: `(org-level-8 ((t (,@headline ,@variable-tuple))))
249 Removed: `(org-level-7 ((t (,@headline ,@variable-tuple))))
250 Removed: `(org-level-6 ((t (,@headline ,@variable-tuple))))
251 Removed: `(org-level-5 ((t (,@headline ,@variable-tuple))))
252 Removed: `(org-level-4 ((t (,@headline ,@variable-tuple :height 1.1))))
253 Removed: `(org-level-3 ((t (,@headline ,@variable-tuple :height 1.25))))
254 Removed: `(org-level-2 ((t (,@headline ,@variable-tuple :height 1.5))))
255 Removed: `(org-level-1 ((t (,@headline ,@variable-tuple :height 1.75))))
256 Removed: `(org-document-title ((t (,@headline ,@variable-tuple :height 2.0 :underline nil))))))
307 Added: ;(custom-theme-set-faces
308 Added: ; 'user
309 Added: ; '(variable-pitch ((t (:family "Liberation Sans"))))
310 Added: ; '(fixed-pitch ((t ( :family "Hack")))))
257 311
258 Removed: ;(custom-theme-set-faces
259 Removed: ; 'user
260 Removed: ; '(variable-pitch ((t (:family "Liberation Sans"))))
261 Removed: ; '(fixed-pitch ((t ( :family "Hack")))))
312 Added: #+END_SRC
262 313
314 Added: *** Invisible edits
315 Added:
316 Added: #+BEGIN_SRC emacs-lisp
317 Added: (setq org-catch-invisible-edits t)
263 318 #+END_SRC
264 319
265 320 *** Agenda
@@ -347,18 +402,24 @@
347 402 (global-set-key (kbd "C-c e") 'blendoit-org-quick-export)
348 403 #+END_SRC
349 404
350 Removed: ** gnuplot
405 Added: ** undo tree
351 406
352 407 #+BEGIN_SRC emacs-lisp
353 Removed: (use-package gnuplot)
408 Added: (global-undo-tree-mode)
354 409 #+END_SRC
355 410
356 Removed: ** company
411 Added: ** dumb jump
357 412
358 Removed: # #+BEGIN_SRC emacs-lisp
359 Removed: # (use-package company)
360 Removed: # #+END_SRC
413 Added: #+BEGIN_SRC emacs-lisp
414 Added: (use-package dumb-jump)
415 Added: #+END_SRC
361 416
417 Added: ** gnuplot
418 Added:
419 Added: #+BEGIN_SRC emacs-lisp
420 Added: (use-package gnuplot)
421 Added: #+END_SRC
422 Added:
362 423 ** Ledger
363 424
364 425 #+BEGIN_SRC emacs-lisp
@@ -368,8 +429,7 @@
368 429 ("C-c C" . ledger-mode-clean-buffer))
369 430 #+END_SRC
370 431
371 Removed: ** TODO ibuffer-sidebar
372 Removed: SCHEDULED: <2020-07-21 Tue>
432 Added: ** ibuffer-sidebar
373 433
374 434 #+BEGIN_SRC emacs-lisp
375 435 (use-package ibuffer-sidebar)
@@ -399,52 +459,33 @@
399 459 )
400 460 #+END_SRC
401 461
402 Removed: ** Ivy
462 Added: ** Company
403 463
404 Removed: Auto completion.
405 Removed:
464 Added: #+NAME: company
406 465 #+BEGIN_SRC emacs-lisp
407 Removed: (use-package ivy
408 Removed: :config
409 Removed: (setq ivy-use-virtual-buffers t
410 Removed: ivy-count-format "%d/%d "
411 Removed: enable-recursive-minibuffers t))
412 Removed: (ivy-mode t)
466 Added: (add-hook 'after-init-hook 'global-company-mode)
413 467 #+END_SRC
414 468
415 Removed: *** Counsel
469 Added: ** Flycheck
416 470
417 Removed: Wonderful counsellor!
418 Removed:
471 Added: #+NAME: flycheck
419 472 #+BEGIN_SRC emacs-lisp
420 Removed: (use-package counsel
421 Removed: :bind ("M-x" . counsel-M-x)
422 Removed: :config (counsel-mode t))
423 Removed:
424 Removed: (global-set-key (kbd "C-f") 'counsel-grep-or-swiper)
473 Added: (use-package flycheck
474 Added: :init (global-flycheck-mode))
425 475 #+END_SRC
426 476
427 Removed: *** Swiper
477 Added: ** CSV
428 478
429 479 #+BEGIN_SRC emacs-lisp
430 Removed: (use-package swiper
431 Removed: :bind (("C-f" . counsel-grep-or-swiper)))
480 Added: (use-package csv-mode)
432 481 #+END_SRC
433 482
434 Removed: ** Company
483 Added: * JSON
435 484
436 Removed: #+NAME: company
437 Removed: #+BEGIN_SRC emacs-lisp
438 Removed: ;; (use-package company
439 Removed: ;; :config (add-hook 'after-init-hook 'global-company-mode))
440 Removed: #+END_SRC
485 Added: Oí, Jason!
441 486
442 Removed: ** Flycheck
443 Removed:
444 Removed: #+NAME: flycheck
445 487 #+BEGIN_SRC emacs-lisp
446 Removed: (use-package flycheck
447 Removed: :init (global-flycheck-mode))
488 Added: (use-package json-mode)
448 489 #+END_SRC
449 490
450 491 ** Magit
@@ -461,6 +502,17 @@
461 502 :config (pdf-loader-install))
462 503 #+END_SRC
463 504
505 Added: ** rainbow
506 Added:
507 Added: This highlights hexadecimal numbers which look like colors, in that same color.
508 Added:
509 Added: #+BEGIN_SRC emacs-lisp
510 Added: (use-package rainbow-mode
511 Added: :ensure t
512 Added: :init
513 Added: (add-hook 'prog-mode-hook 'rainbow-mode))
514 Added: #+END_SRC
515 Added:
464 516 ** Dashboard
465 517
466 518 We replace the standard welcome screen with our own.
@@ -481,10 +533,10 @@
481 533 This enables us to better manage our =.git= projects.
482 534
483 535 #+BEGIN_SRC emacs-lisp
484 Removed: (use-package projectile
485 Removed: :bind ("C-c p" . 'projectile-command-map)
486 Removed: :init (projectile-mode 1)
487 Removed: (setq projectile-completion-system 'ivy))
536 Added: (use-package projectile
537 Added: :bind ("C-c p" . 'projectile-command-map)
538 Added: :init (projectile-mode 1)
539 Added: (setq projectile-completion-system 'ivy))
488 540 #+END_SRC
489 541
490 542 * Cosmetics
@@ -517,34 +569,30 @@
517 569 #+BEGIN_SRC emacs-lisp
518 570 (use-package mixed-pitch
519 571 :hook ((org-mode . mixed-pitch-mode)
520 Removed: (Info-mode . mixed-pitch-mode)))
572 Added: (Info-mode . mixed-pitch-mode)))
521 573 #+END_SRC
522 574
523 575 ** Initial frame
524 576
525 577 These settings affect the first and subsequent frames spawned by Emacs.
526 578
527 Removed: #+BEGIN_SRC emacs-lisp
528 Removed: (if (display-graphic-p)
529 Removed: (progn
530 Removed: (setq initial-frame-alist
531 Removed: '(
532 Removed: (tool-bar-lines . 1)
533 Removed: (width . 80) ; chars
534 Removed: (height . 52) ; lines
535 Removed: (alpha . (90 . 50))))
536 Removed: (setq default-frame-alist
537 Removed: '(
538 Removed: (tool-bar-lines . 1)
539 Removed: (width . 80)
540 Removed: (height . 52)
541 Removed: (alpha . (90 . 50))))))
542 Removed: #+END_SRC
579 Added: Thank you Xah Lee![fn::http://ergoemacs.org/emacs/emacs_customize_default_window_size.html]
543 580
544 Removed: ** Scrollbars
545 Removed:
546 581 #+BEGIN_SRC emacs-lisp
547 Removed: (set-window-scroll-bars (minibuffer-window) nil nil)
582 Added: (if (display-graphic-p)
583 Added: (progn
584 Added: (setq initial-frame-alist
585 Added: '(
586 Added: (tool-bar-lines . 1)
587 Added: (width . 100) ; chars
588 Added: (height . 52) ; lines
589 Added: (alpha . (90 . 50))))
590 Added: (setq default-frame-alist
591 Added: '(
592 Added: (tool-bar-lines . 1)
593 Added: (width . 100)
594 Added: (height . 52)
595 Added: (alpha . (90 . 50))))))
548 596 #+END_SRC
549 597
550 598 ** Theme
@@ -568,24 +616,39 @@
568 616 These customizations enhance editor usability.
569 617
570 618 #+BEGIN_SRC emacs-lisp
571 Removed: (setq-default fill-column 79)
572 Removed: (defalias 'yes-or-no-p 'y-or-n-p)
619 Added: (setq-default fill-column 79)
620 Added: (defalias 'yes-or-no-p 'y-or-n-p)
573 621 #+END_SRC
574 622
623 Added: Disable minibuffer scroll bar.
624 Added:
625 Added: #+BEGIN_SRC emacs-lisp
626 Added: (set-window-scroll-bars (minibuffer-window) nil nil)
627 Added: ; (set-window-scroll-bars (ibuffer-sidebar-window) nil nil)
628 Added: #+END_SRC
629 Added:
575 630 This is just a better default.
576 631
577 632 #+BEGIN_SRC emacs-lisp
578 633 (setq c-default-style "linux"
579 Removed: c-basic-offset 4)
634 Added: c-basic-offset 4)
580 635 #+END_SRC
581 636
637 Added: ** auto fill
638 Added:
639 Added: Automatically break lines longer than =fill-column=.
640 Added:
641 Added: #+BEGIN_SRC emacs-lisp
642 Added: (add-hook 'org-mode-hook 'turn-on-auto-fill)
643 Added: #+END_SRC
644 Added:
582 645 ** Recent files
583 646
584 647 #+BEGIN_SRC emacs-lisp
585 Removed: (recentf-mode 1)
586 Removed: (setq recentf-max-menu-items 25)
587 Removed: (setq recentf-max-saved-items 25)
588 Removed: (run-at-time nil (* 1 60) 'recentf-save-list)
648 Added: (recentf-mode 1)
649 Added: (setq recentf-max-menu-items 25)
650 Added: (setq recentf-max-saved-items 25)
651 Added: (run-at-time nil (* 5 60) 'recentf-save-list)
589 652 #+END_SRC
590 653
591 654 ** Better parentheses
blendoit/init-blendoit.pdf
index 99b59325..ce4e071f 100644..100644

Binary files differ

fonts/Hermit-Regular.otf
index 00000000..feb19370 000000..100644

Binary files differ

init-custom.el
index 200eafe5..e597adc3 100644..100644
@@ -34,11 +34,6 @@
34 34 ("budget" "%(binary) -f %(ledger-file) budget --exchange USD"))))
35 35 '(line-number-mode nil)
36 36 '(mixed-pitch-variable-pitch-cursor (quote bar))
37 Removed: '(mode-line-format
38 Removed: (quote
39 Removed: ("%e" mode-line-front-space mode-line-mule-info mode-line-client mode-line-modified mode-line-remote mode-line-frame-identification mode-line-buffer-identification " "
40 Removed: (vc-mode vc-mode)
41 Removed: " " mode-line-misc-info mode-line-end-spaces)))
42 37 '(nrepl-message-colors
43 38 (quote
44 39 ("#CC9393" "#DFAF8F" "#F0DFAF" "#7F9F7F" "#BFEBBF" "#93E0E3" "#94BFF3" "#DC8CC3")))
@@ -106,7 +101,7 @@
106 101 '(org-time-stamp-custom-formats (quote ("%d %b, %Y (%a)" . "%d %b, %Y (%a), at %H:%M")))
107 102 '(package-selected-packages
108 103 (quote
109 Removed: (projectile minimap gnuplot ledger-mode company-mode wombat-theme wombar-theme which-key srefactor-lisp srefactor all-the-icons flycheck ibuffer-sidebar pdf-tools magit rainbow-delimiters smartparens mixed-pitch org-bullets use-package tabbar powerline ivy-hydra flatui-theme evil counsel company benchmark-init)))
104 Added: (linum-relative dumb-jump csv-mode rainbow-mode org-mouse projectile minimap gnuplot ledger-mode company-mode wombat-theme wombar-theme which-key srefactor-lisp srefactor all-the-icons flycheck ibuffer-sidebar pdf-tools magit rainbow-delimiters smartparens mixed-pitch org-bullets use-package tabbar powerline ivy-hydra flatui-theme evil counsel company benchmark-init)))
110 105 '(pdf-view-midnight-colors (quote ("#DCDCCC" . "#383838")))
111 106 '(save-place-mode t)
112 107 '(send-mail-function (quote smtpmail-send-it))
@@ -139,9 +134,10 @@
139 134 ;; If you edit it by hand, you could mess it up, so be careful.
140 135 ;; Your init file should contain only one such instance.
141 136 ;; If there is more than one, they won't work right.
142 Removed: '(default ((t (:family "Hack" :foundry "SRC" :slant normal :weight normal :height 142 :width normal))))
137 Added: '(default ((t (:family "Hermit" :foundry "UKWN" :slant normal :weight normal :height 122 :width normal))))
143 138 '(cursor ((t (:background "red"))))
144 Removed: '(fixed-pitch ((t (:height 0.8 :family "Hack"))))
139 Added: '(fixed-pitch ((t (:family "Hermit"))))
140 Added: '(highlight ((t (:background "#454545" :foreground "#ffffff" :underline nil))))
145 141 '(org-document-title ((t (:inherit default :weight bold :font "Liberation Sans" :height 2.0 :underline nil))))
146 142 '(org-level-1 ((t (:inherit default :weight bold :font "Liberation Sans" :height 1.75))))
147 143 '(org-level-2 ((t (:inherit default :weight bold :font "Liberation Sans" :height 1.5))))
@@ -151,4 +147,4 @@
151 147 '(org-level-6 ((t (:inherit default :weight bold :font "Liberation Sans"))))
152 148 '(org-level-7 ((t (:inherit default :weight bold :font "Liberation Sans"))))
153 149 '(org-level-8 ((t (:inherit default :weight bold :font "Liberation Sans"))))
154 Removed: '(variable-pitch ((t (:family "Dejavu Serif")))))
150 Added: '(variable-pitch ((t (:family "Dejavu Sans")))))