ryuslash/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Move stuff to other config files"

Browse source 
This reverts commit 6d01ebceb9.
This commit is contained in:
Tom Willemse 2019-01-28 01:14:43 -08:00
parent 85c7e13a83
commit 79ff6f3749
1 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
emacs/.emacs.d/init.el
View file

@ -46,19 +46,25 @@
(require 'package) (require 'package)
(eval-and-compile (eval-and-compile
;; ;; Add MELPA because it's the biggest package repository for Emacs. ;; Add MELPA because it's the biggest package repository for Emacs.
;; (add-to-list 'package-archives (add-to-list 'package-archives
;; '("melpa" . "https://melpa.org/packages/")) '("melpa" . "https://melpa.org/packages/"))
;; ;; Add the Org package archive to be able to install the bleeding ;; Add the Org package archive to be able to install the bleeding
;; ;; edge Org mode. ;; edge Org mode.
;; (add-to-list 'package-archives (add-to-list 'package-archives
;; '("org" . "http://orgmode.org/elpa/")) '("org" . "http://orgmode.org/elpa/"))
;; ;; Add my personal package archive so I can upload custom libraries ;; Add my personal package archive so I can upload custom libraries
;; ;; and stuff there. ;; and stuff there.
;; (add-to-list 'package-archives (add-to-list 'package-archives
;; '("oni" . "https://ryuslash.org/elpa/")) '("oni" . "https://ryuslash.org/elpa/"))
(package-initialize)) (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 ;;;; Dependencies
(require 'counsel) (require 'counsel)
@ -72,6 +78,19 @@
;;;; Settings ;;;; 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 delete-old-versions t)
(setq kept-new-versions 20) (setq kept-new-versions 20)
(setq kept-old-versions 20) (setq kept-old-versions 20)
@ -119,6 +138,8 @@
(diminish 'counsel-mode) (diminish 'counsel-mode)
(eval-when-compile (require 'bookmark)) (eval-when-compile (require 'bookmark))
(setq bookmark-default-file
(concat user-emacs-directory "data/bookmarks"))
(setq user-full-name "Tom Willemse" (setq user-full-name "Tom Willemse"
user-mail-address "tom@ryuslash.org") user-mail-address "tom@ryuslash.org")
@ -166,6 +187,9 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified"
(add-function :around (symbol-function 'diff-hl-changes-buffer) (add-function :around (symbol-function 'diff-hl-changes-buffer)
#'oni:with-diff-hl-p4-args)) #'oni:with-diff-hl-p4-args))
(setq projectile-known-projects-file
(concat user-emacs-directory "data/projectile-bookmarks.eld"))
(with-eval-after-load 'projectile (with-eval-after-load 'projectile
(setq projectile-mode-line (setq projectile-mode-line
'(:eval '(:eval
@ -176,6 +200,9 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified"
"" ""
(format " P[%s]" name))))))) (format " P[%s]" name)))))))
(setq projectile-cache-file
(concat user-emacs-directory "data/projectile.cache"))
(projectile-mode) (projectile-mode)
(define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map) (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)