From 6d01ebceb9e88975daf96f518c24a55c46b44729 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Wed, 23 Jan 2019 01:06:32 -0800 Subject: [PATCH] Move stuff to other config files --- emacs/.emacs.d/init.el | 49 ++++++++++-------------------------------- 1 file changed, 11 insertions(+), 38 deletions(-) diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 8251a21..439a29a 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -46,25 +46,19 @@ (require 'package) (eval-and-compile - ;; Add MELPA because it's the biggest package repository for Emacs. - (add-to-list 'package-archives - '("melpa" . "https://melpa.org/packages/")) - ;; Add the Org package archive to be able to install the bleeding - ;; edge Org mode. - (add-to-list 'package-archives - '("org" . "http://orgmode.org/elpa/")) - ;; Add my personal package archive so I can upload custom libraries - ;; and stuff there. - (add-to-list 'package-archives - '("oni" . "https://ryuslash.org/elpa/")) + ;; ;; Add MELPA because it's the biggest package repository for Emacs. + ;; (add-to-list 'package-archives + ;; '("melpa" . "https://melpa.org/packages/")) + ;; ;; Add the Org package archive to be able to install the bleeding + ;; ;; edge Org mode. + ;; (add-to-list 'package-archives + ;; '("org" . "http://orgmode.org/elpa/")) + ;; ;; Add my personal package archive so I can upload custom libraries + ;; ;; and stuff there. + ;; (add-to-list 'package-archives + ;; '("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)) - ;;;; Dependencies (require 'counsel) @@ -78,19 +72,6 @@ ;;;; 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 - `((".*" . ,(concat user-emacs-directory "data/backup-files")))) - -(add-to-list - 'auto-save-file-name-transforms - `(".*" ,(concat user-emacs-directory "data/auto-save-files/") t) - :append) - -(setq auto-save-list-file-prefix - (concat user-emacs-directory "data/" "auto-save-list/.saves-")) - (setq delete-old-versions t) (setq kept-new-versions 20) (setq kept-old-versions 20) @@ -155,8 +136,6 @@ (diminish 'counsel-mode) (eval-when-compile (require 'bookmark)) -(setq bookmark-default-file - (concat user-emacs-directory "data/bookmarks")) (setq user-full-name "Tom Willemse" user-mail-address "tom@ryuslash.org") @@ -204,9 +183,6 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified" (add-function :around (symbol-function 'diff-hl-changes-buffer) #'oni:with-diff-hl-p4-args)) -(setq projectile-known-projects-file - (concat user-emacs-directory "data/projectile-bookmarks.eld")) - (with-eval-after-load 'projectile (setq projectile-mode-line '(:eval @@ -217,9 +193,6 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified" "" (format " P[%s]" name))))))) -(setq projectile-cache-file - (concat user-emacs-directory "data/projectile.cache")) - (projectile-mode) (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)