From a205065fa111a252b0893075bd250261db54e2f3 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Thu, 17 Jan 2019 21:38:22 -0800
Subject: Remove helper library

---
 emacs/.emacs.d/init.el | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'emacs/.emacs.d/init.el')

diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index cfa8b1c..8251a21 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -59,6 +59,8 @@
                '("oni" . "https://ryuslash.org/elpa/"))
   (package-initialize))
 
+;;; Highlight the line the cursor is on in the Packages menu for
+;;; better visibility.
 (add-hook 'package-menu-mode-hook 'hl-line-mode)
 
 (with-eval-after-load 'package (require 'oni-package-x))
@@ -71,20 +73,23 @@
 (require 'diminish)
 (require 'ivy)
 (require 'ivy-hydra)
-(require 'oni-helpers)
 (require 'projectile)
 (require 'shackle)
 
 ;;;; Settings
 
+;;; Put backup and auto save files in their own directories so they
+;;; don't clutter the rest of the filesystem.
 (setq backup-directory-alist
-      `((".*" . ,(oni:data-location "backup-files/"))))
+      `((".*" . ,(concat user-emacs-directory "data/backup-files"))))
 
-(add-to-list 'auto-save-file-name-transforms
-             `(".*" ,(oni:data-location "auto-save-files/") t) :append)
+(add-to-list
+ 'auto-save-file-name-transforms
+ `(".*" ,(concat user-emacs-directory "data/auto-save-files/") t)
+ :append)
 
 (setq auto-save-list-file-prefix
-      (oni:data-location "auto-save-list/.saves-"))
+      (concat user-emacs-directory "data/" "auto-save-list/.saves-"))
 
 (setq delete-old-versions t)
 (setq kept-new-versions 20)
@@ -150,7 +155,8 @@
 (diminish 'counsel-mode)
 
 (eval-when-compile (require 'bookmark))
-(setq bookmark-default-file (oni:data-location "bookmarks"))
+(setq bookmark-default-file
+      (concat user-emacs-directory "data/bookmarks"))
 
 (setq user-full-name "Tom Willemse"
       user-mail-address "tom@ryuslash.org")
@@ -199,7 +205,7 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified"
                 #'oni:with-diff-hl-p4-args))
 
 (setq projectile-known-projects-file
-      (oni:data-location "projectile-bookmarks.eld"))
+      (concat user-emacs-directory "data/projectile-bookmarks.eld"))
 
 (with-eval-after-load 'projectile
   (setq projectile-mode-line
@@ -212,7 +218,7 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified"
                 (format " P[%s]" name)))))))
 
 (setq projectile-cache-file
-      (oni:data-location "projectile.cache"))
+      (concat user-emacs-directory "data/projectile.cache"))
 
 (projectile-mode)
 
-- 
cgit v1.2.3-54-g00ecf