From c53a1c2e2e2f62b3933175aea9087dbe380a8bde Mon Sep 17 00:00:00 2001
From: Levi Olson <olson.levi@gmail.com>
Date: Wed, 4 Sep 2019 09:34:50 -0500
Subject: [PATCH] Deflating better-defaults into my own codebase

---
 init.el | 42 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/init.el b/init.el
index 7b96470..9f4e182 100644
--- a/init.el
+++ b/init.el
@@ -44,8 +44,31 @@
 (menu-bar-mode 0)
 (scroll-bar-mode 0)
 (tool-bar-mode 0)
-(global-linum-mode t)
+(horizontal-scroll-bar-mode 0)
+;; Revert to file on disk if it changes
 (global-auto-revert-mode t)
+;; Highlight the current line
+(global-hl-line-mode t)
+;; Show the column number after the line number (i.e. 50:57)
+(column-number-mode t)
+;; C-c <left>|<right> to undo|redo window changes like adding buffers.
+(winner-mode t)
+;; Show matching paren
+(show-paren-mode t)
+
+;; Indent w/spaces only
+(setq indent-tabs-mode nil)
+;; Prevent stale elisp bytecode
+(setq load-prefer-newer t)
+;; Add newline on save
+(setq require-final-newline t)
+
+;; C-c to copy in Linux can be pasted in emacs
+(setq select-enable-clipboard t)
+;; after mouse selection can be pasted in emacs
+(setq select-enable-primary t)
+;; Paste at current point, not mouse location when "middle-clicking"
+(setq mouse-yank-at-point t)
 
 (add-hook 'before-save-hook 'delete-trailing-whitespace)
 
@@ -182,14 +205,25 @@
   ("M-l"     . downcase-dwim)
   )
 
-(use-package better-defaults
-  :ensure t)
+;; https://github.com/hlissner/emacs-doom-themes
+(use-package doom-themes
+  :ensure t
+  :config
+  (load-theme 'doom-one t))
 
+;; https://github.com/belak/base16-emacs
 (use-package base16-theme
+  :disabled
   :ensure t
   :config
   (load-theme 'base16-onedark t))
 
+;; https://github.com/coldnew/linum-relative
+(use-package linum-relative
+  :ensure t
+  :config
+  (linum-relative-mode))
+
 ;; https://github.com/Fanael/rainbow-delimiters
 (use-package rainbow-delimiters
   :ensure t
@@ -436,7 +470,7 @@
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
    (quote
-    (org-bullets org-plus-contrib web-mode gitconfig-mode gitignore-mode rainbow-delimiters company company-mode projectile magit helm-ag helm-swoop yasnippet fic-mode which-key pdf-tools better-defaults use-package)))
+    (doom-themes linum-relative org-bullets org-plus-contrib web-mode gitconfig-mode gitignore-mode rainbow-delimiters company company-mode projectile magit helm-ag helm-swoop yasnippet fic-mode which-key pdf-tools better-defaults use-package)))
  '(safe-local-variable-values (quote ((whitespace-line-column . 120)))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.