Update global paths

This commit is contained in:
Henrik Lissner 2016-03-27 00:49:52 -04:00
parent 63f03bde2d
commit dedc0f5ee3
8 changed files with 19 additions and 19 deletions

View file

@ -17,10 +17,11 @@
(defconst narf-private-dir (concat narf-emacs-dir "/private")) (defconst narf-private-dir (concat narf-emacs-dir "/private"))
(defconst narf-packages-dir (concat narf-emacs-dir "/.cask/" emacs-version "/elpa")) (defconst narf-packages-dir (concat narf-emacs-dir "/.cask/" emacs-version "/elpa"))
(defconst narf-script-dir (concat narf-emacs-dir "/scripts")) (defconst narf-script-dir (concat narf-emacs-dir "/scripts"))
(defconst narf-ext-dir (concat narf-emacs-dir "/ext"))
(defconst narf-snippet-dirs (list (concat narf-private-dir "/snippets") (defconst narf-snippet-dirs (list (concat narf-private-dir "/snippets")
(concat narf-private-dir "/templates"))) (concat narf-private-dir "/templates")))
;; Hostname and emacs version-based elisp temp directories ;; Hostname and emacs version-based elisp temp directories
(defconst narf-temp-dir (format "%s/cache/%s/%s.%s/" (defconst narf-temp-dir (format "%s/cache/%s/%s.%s"
narf-private-dir (system-name) narf-private-dir (system-name)
emacs-major-version emacs-minor-version)) emacs-major-version emacs-minor-version))

View file

@ -34,7 +34,7 @@
(require 'saveplace) (require 'saveplace)
(setq-default (setq-default
save-place-file (concat narf-temp-dir "saveplace") save-place-file (concat narf-temp-dir "/saveplace")
save-place t) save-place t)
(when (>= emacs-major-version 25) (when (>= emacs-major-version 25)
(save-place-mode +1)) (save-place-mode +1))

View file

@ -6,8 +6,9 @@
(setq-default projectile-enable-caching t) (setq-default projectile-enable-caching t)
(setq projectile-require-project-root nil (setq projectile-require-project-root nil
projectile-cache-file (concat narf-temp-dir "projectile.cache") projectile-enable-caching t
projectile-known-projects-file (concat narf-temp-dir "projectile.projects") projectile-cache-file (concat narf-temp-dir "/projectile.cache")
projectile-known-projects-file (concat narf-temp-dir "/projectile.projects")
projectile-indexing-method 'alien projectile-indexing-method 'alien
projectile-project-root-files narf-project-root-files) projectile-project-root-files narf-project-root-files)

View file

@ -53,7 +53,7 @@
ido-enable-tramp-completion t ido-enable-tramp-completion t
ido-enable-last-directory-history t ido-enable-last-directory-history t
ido-cr+-max-items 10000 ido-cr+-max-items 10000
ido-save-directory-list-file (concat narf-temp-dir "ido.last")) ido-save-directory-list-file (concat narf-temp-dir "/ido.last"))
:config :config
(add-hook! ido-setup (add-hook! ido-setup
(require 'ido-vertical-mode) (require 'ido-vertical-mode)

View file

@ -43,18 +43,18 @@
eval-expression-print-level nil eval-expression-print-level nil
bookmark-save-flag t bookmark-save-flag t
bookmark-default-file (concat narf-temp-dir "bookmarks") bookmark-default-file (concat narf-temp-dir "/bookmarks")
;; Disable all backups (that's what git/dropbox are for) ;; Disable all backups (that's what git/dropbox are for)
auto-save-default nil auto-save-default nil
auto-save-list-file-name (concat narf-temp-dir "autosave") auto-save-list-file-name (concat narf-temp-dir "/autosave")
make-backup-files nil make-backup-files nil
create-lockfiles nil create-lockfiles nil
backup-directory-alist `((".*" . ,(concat narf-temp-dir "backup/"))) backup-directory-alist `((".*" . ,(concat narf-temp-dir "/backup/")))
;; Remember undo history ;; Remember undo history
undo-tree-auto-save-history nil undo-tree-auto-save-history nil
undo-tree-history-directory-alist `(("." . ,(concat narf-temp-dir "undo/")))) undo-tree-history-directory-alist `(("." . ,(concat narf-temp-dir "/undo/"))))
;; UTF-8 please ;; UTF-8 please
(setq locale-coding-system 'utf-8) ; pretty (setq locale-coding-system 'utf-8) ; pretty
@ -81,8 +81,6 @@
;; ;;
(autoload 'use-package "use-package" "" nil 'macro) (autoload 'use-package "use-package" "" nil 'macro)
(require 'dash)
(unless (require 'autoloads nil t) (unless (require 'autoloads nil t)
(load (concat narf-emacs-dir "/scripts/generate-autoloads.el")) (load (concat narf-emacs-dir "/scripts/generate-autoloads.el"))
(require 'autoloads)) (require 'autoloads))
@ -93,14 +91,14 @@
(setq use-package-verbose nil) (setq use-package-verbose nil)
;; Make any folders needed ;; Make any folders needed
(dolist (file '("" "undo" "backup")) (dolist (file '("" "/undo" "/backup"))
(let ((path (concat narf-temp-dir file))) (let ((path (concat narf-temp-dir file)))
(unless (file-exists-p path) (unless (file-exists-p path)
(make-directory path t))))) (make-directory path t)))))
;; Save history across sessions ;; Save history across sessions
(require 'savehist) (require 'savehist)
(setq savehist-file (concat narf-temp-dir "savehist") (setq savehist-file (concat narf-temp-dir "/savehist")
savehist-save-minibuffer-history t savehist-save-minibuffer-history t
savehist-additional-variables savehist-additional-variables
'(kill-ring search-ring regexp-search-ring)) '(kill-ring search-ring regexp-search-ring))
@ -118,7 +116,7 @@
(add-hook 'savehist-save-hook #'unpropertize-savehist) (add-hook 'savehist-save-hook #'unpropertize-savehist)
(require 'recentf) (require 'recentf)
(setq recentf-save-file (concat narf-temp-dir "recentf") (setq recentf-save-file (concat narf-temp-dir "/recentf")
recentf-exclude '("/tmp/" "/ssh:" "\\.?ido\\.last$" "\\.revive$" "/TAGS$" recentf-exclude '("/tmp/" "/ssh:" "\\.?ido\\.last$" "\\.revive$" "/TAGS$"
"emacs\\.d/private/cache/.+" "emacs\\.d/workgroups/.+$" "wg-default" "emacs\\.d/private/cache/.+" "emacs\\.d/workgroups/.+$" "wg-default"
"/company-statistics-cache.el$") "/company-statistics-cache.el$")
@ -134,7 +132,7 @@
persistent-soft-flush persistent-soft-flush
persistent-soft-location-readable persistent-soft-location-readable
persistent-soft-location-destroy) persistent-soft-location-destroy)
:init (defvar pcache-directory (concat narf-temp-dir "pcache/"))) :init (defvar pcache-directory (concat narf-temp-dir "/pcache/")))
(use-package async (use-package async
:commands (async-start :commands (async-start

View file

@ -5,7 +5,7 @@
:defer t :defer t
:init :init
(evil-set-initial-state 'eshell-mode 'normal) (evil-set-initial-state 'eshell-mode 'normal)
(setq eshell-directory-name (concat narf-temp-dir "eshell") (setq eshell-directory-name (concat narf-temp-dir "/eshell")
eshell-scroll-to-bottom-on-input 'all eshell-scroll-to-bottom-on-input 'all
eshell-buffer-shorthand t eshell-buffer-shorthand t
@ -14,7 +14,7 @@
eshell-error-if-no-glob t eshell-error-if-no-glob t
;; em-alias ;; em-alias
eshell-aliases-file (concat narf-temp-dir ".eshell-aliases")) eshell-aliases-file (concat narf-temp-dir "/.eshell-aliases"))
;; plan 9 smart shell ;; plan 9 smart shell
(require 'em-smart) (require 'em-smart)

View file

@ -8,7 +8,7 @@
(add-hook! php-mode 'flycheck-mode) (add-hook! php-mode 'flycheck-mode)
(setq php-template-compatibility nil (setq php-template-compatibility nil
php-extras-eldoc-functions-file (concat narf-temp-dir "php-extras-eldoc-functions")) php-extras-eldoc-functions-file (concat narf-temp-dir "/php-extras-eldoc-functions"))
:config :config
(require 'php-extras) (require 'php-extras)
(defun php-extras-company-setup ()) ;; company will set up itself (defun php-extras-company-setup ()) ;; company will set up itself

View file

@ -42,7 +42,7 @@
:functions (anaconda-mode-running-p) :functions (anaconda-mode-running-p)
:init :init
(add-hook! python-mode '(anaconda-mode anaconda-eldoc-mode eldoc-mode)) (add-hook! python-mode '(anaconda-mode anaconda-eldoc-mode eldoc-mode))
(setq anaconda-mode-installation-directory (concat narf-temp-dir "anaconda/") (setq anaconda-mode-installation-directory (concat narf-temp-dir "/anaconda/")
anaconda-mode-eldoc-as-single-line t) anaconda-mode-eldoc-as-single-line t)
:config :config