diff --git a/bootstrap.el b/bootstrap.el index a6b23fda1..f66cde927 100644 --- a/bootstrap.el +++ b/bootstrap.el @@ -17,10 +17,11 @@ (defconst narf-private-dir (concat narf-emacs-dir "/private")) (defconst narf-packages-dir (concat narf-emacs-dir "/.cask/" emacs-version "/elpa")) (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") (concat narf-private-dir "/templates"))) ;; 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) emacs-major-version emacs-minor-version)) diff --git a/core/core-editor.el b/core/core-editor.el index 6baea5054..bfd486189 100644 --- a/core/core-editor.el +++ b/core/core-editor.el @@ -34,7 +34,7 @@ (require 'saveplace) (setq-default - save-place-file (concat narf-temp-dir "saveplace") + save-place-file (concat narf-temp-dir "/saveplace") save-place t) (when (>= emacs-major-version 25) (save-place-mode +1)) diff --git a/core/core-helm.el b/core/core-helm.el index c6d42070f..15523e908 100644 --- a/core/core-helm.el +++ b/core/core-helm.el @@ -6,8 +6,9 @@ (setq-default projectile-enable-caching t) (setq projectile-require-project-root nil - projectile-cache-file (concat narf-temp-dir "projectile.cache") - projectile-known-projects-file (concat narf-temp-dir "projectile.projects") + projectile-enable-caching t + projectile-cache-file (concat narf-temp-dir "/projectile.cache") + projectile-known-projects-file (concat narf-temp-dir "/projectile.projects") projectile-indexing-method 'alien projectile-project-root-files narf-project-root-files) diff --git a/core/core-project.el b/core/core-project.el index b3435b39f..4f9fab306 100644 --- a/core/core-project.el +++ b/core/core-project.el @@ -53,7 +53,7 @@ ido-enable-tramp-completion t ido-enable-last-directory-history t 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 (add-hook! ido-setup (require 'ido-vertical-mode) diff --git a/core/core.el b/core/core.el index ce44e9b32..9fb910e28 100644 --- a/core/core.el +++ b/core/core.el @@ -43,18 +43,18 @@ eval-expression-print-level nil 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) 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 create-lockfiles nil - backup-directory-alist `((".*" . ,(concat narf-temp-dir "backup/"))) + backup-directory-alist `((".*" . ,(concat narf-temp-dir "/backup/"))) ;; Remember undo history 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 (setq locale-coding-system 'utf-8) ; pretty @@ -81,8 +81,6 @@ ;; (autoload 'use-package "use-package" "" nil 'macro) -(require 'dash) - (unless (require 'autoloads nil t) (load (concat narf-emacs-dir "/scripts/generate-autoloads.el")) (require 'autoloads)) @@ -93,14 +91,14 @@ (setq use-package-verbose nil) ;; Make any folders needed - (dolist (file '("" "undo" "backup")) + (dolist (file '("" "/undo" "/backup")) (let ((path (concat narf-temp-dir file))) (unless (file-exists-p path) (make-directory path t))))) ;; Save history across sessions (require 'savehist) -(setq savehist-file (concat narf-temp-dir "savehist") +(setq savehist-file (concat narf-temp-dir "/savehist") savehist-save-minibuffer-history t savehist-additional-variables '(kill-ring search-ring regexp-search-ring)) @@ -118,7 +116,7 @@ (add-hook 'savehist-save-hook #'unpropertize-savehist) (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$" "emacs\\.d/private/cache/.+" "emacs\\.d/workgroups/.+$" "wg-default" "/company-statistics-cache.el$") @@ -134,7 +132,7 @@ persistent-soft-flush persistent-soft-location-readable 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 :commands (async-start diff --git a/modules/module-eshell.el b/modules/module-eshell.el index 72803ffe1..f4c7f118b 100644 --- a/modules/module-eshell.el +++ b/modules/module-eshell.el @@ -5,7 +5,7 @@ :defer t :init (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-buffer-shorthand t @@ -14,7 +14,7 @@ eshell-error-if-no-glob t ;; em-alias - eshell-aliases-file (concat narf-temp-dir ".eshell-aliases")) + eshell-aliases-file (concat narf-temp-dir "/.eshell-aliases")) ;; plan 9 smart shell (require 'em-smart) diff --git a/modules/module-php.el b/modules/module-php.el index f103f5ace..c2be8f112 100644 --- a/modules/module-php.el +++ b/modules/module-php.el @@ -8,7 +8,7 @@ (add-hook! php-mode 'flycheck-mode) (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 (require 'php-extras) (defun php-extras-company-setup ()) ;; company will set up itself diff --git a/modules/module-python.el b/modules/module-python.el index 83d34be51..a85763470 100644 --- a/modules/module-python.el +++ b/modules/module-python.el @@ -42,7 +42,7 @@ :functions (anaconda-mode-running-p) :init (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) :config