diff options
| -rw-r--r-- | init.el | 15 | ||||
| -rw-r--r-- | lisp/ravi-init-appearance.el | 2 | ||||
| -rw-r--r-- | lisp/ravi-init-cpp.el | 5 | ||||
| -rw-r--r-- | lisp/ravi-init-files.el | 15 |
4 files changed, 22 insertions, 15 deletions
@@ -2,9 +2,20 @@ ;; Remember the initialization directory (setq ravi/init-dir (file-name-directory (or load-file-name (buffer-file-name)))) +(setq ravi/init-dir-is-local + (let* ((df (executable-find "df")) + (ret (call-process df nil nil nil "-l" (or load-file-name (buffer-file-name))))) + (eql ret 0))) (defun ravi/emacs-file (filename) - (expand-file-name filename ravi/init-dir) - ) + (expand-file-name filename ravi/init-dir)) +(setq ravi/past-directory + (ravi/emacs-file (if ravi/init-dir-is-local + "past" + (format "past-%s" (system-name))))) +(unless (file-accessible-directory-p ravi/past-directory) + (make-directory ravi/past-directory)) +(defun ravi/past-file (filename) + (expand-file-name filename ravi/past-directory)) ;; Initialize some customizations early on to avoid flicker (when window-system diff --git a/lisp/ravi-init-appearance.el b/lisp/ravi-init-appearance.el index bb97a80..730ea54 100644 --- a/lisp/ravi-init-appearance.el +++ b/lisp/ravi-init-appearance.el @@ -255,7 +255,7 @@ Delete all whitespace on a successive key press." (global-undo-tree-mode) (setq undo-tree-auto-save-history t) (setq undo-tree-history-directory-alist - `(("." . ,(expand-file-name "undotree/" (ravi/emacs-file "past")))))) + `(("." . ,(expand-file-name "undotree/" ravi/past-directory))))) :defer 5) (use-package which-key diff --git a/lisp/ravi-init-cpp.el b/lisp/ravi-init-cpp.el index 7437caa..10a782a 100644 --- a/lisp/ravi-init-cpp.el +++ b/lisp/ravi-init-cpp.el @@ -446,10 +446,7 @@ this to 3 makes header-protection define KIG_MISC_NEWTYPE_H for a file named :if (eq ravi/use-cpp-lsp-backend 'ravi/use-cpp-ccls) :config (setq ccls-executable (ravi/emacs-file "site-lisp/ccls/Release/ccls")) - (setq ccls-args `(,(concat "--log-file=" - (expand-file-name - (format "ccls-%s.log" (system-name)) - (ravi/emacs-file "past"))))) ; to do: use relative path + (setq ccls-args `(,(concat "--log-file=" (ravi/past-file "ccls.log")))) ; to do: use relative path ) (setq hide-ifdef-initially nil) diff --git a/lisp/ravi-init-files.el b/lisp/ravi-init-files.el index 8e4d0ca..d279176 100644 --- a/lisp/ravi-init-files.el +++ b/lisp/ravi-init-files.el @@ -24,7 +24,7 @@ ;;; Code: -(setq auto-save-list-file-prefix (ravi/emacs-file "past/auto-save-list/.saves-")) +(setq auto-save-list-file-prefix (ravi/past-file "auto-save-list/.saves-")) (setq delete-auto-save-files t) (setq dired-listing-switches "-Flag") (setq completion-ignored-extensions @@ -56,12 +56,12 @@ (require 'saveplace) (setq-default save-place t) -(setq save-place-file (ravi/emacs-file "past/places")) +(setq save-place-file (ravi/past-file "places")) (use-package recentf :init (progn - (setq recentf-save-file (ravi/emacs-file "past/recentf")) + (setq recentf-save-file (ravi/past-file "recentf")) (setq recentf-max-saved-items 100) ;; just 20 is too recent ) :config @@ -118,13 +118,13 @@ not exist, it is not added to the filecache." (progn (add-to-list 'tramp-remote-path 'tramp-own-remote-path) (setq tramp-use-ssh-controlmaster-options nil) - (setq tramp-persistency-file-name (ravi/emacs-file "past/tramp")))) + (setq tramp-persistency-file-name (ravi/past-file "tramp")))) ;; Write backup files to own directory -(make-directory (ravi/emacs-file "past/backups/") t) +(make-directory (ravi/past-file "backups/") t) (setq backup-by-copying t) (setq backup-directory-alist - `(("." . ,(ravi/emacs-file "past/backups/")) + `(("." . ,(ravi/past-file "backups/")) (,tramp-file-name-regexp nil))) ;; Make backups of files, even when they're in version control @@ -136,14 +136,13 @@ not exist, it is not added to the filecache." (progn (use-package pkg-info) (setq projectile-known-projects-file - (ravi/emacs-file "past/projectile-bookmarks.eld")) + (ravi/past-file "projectile-bookmarks.eld")) ) :bind-keymap ("C-c p" . projectile-command-map) :bind(("C-<f2>" . projectile-find-file-dwim)) :config (progn (projectile-global-mode) - (add-to-list 'projectile-globally-ignored-directories ".cquery_cached_index") (bind-key "C-<f2>" 'projectile-find-file-dwim) (if (and (boundp 'ravi/use-helm-instead-of-ido) ravi/use-helm-instead-of-ido) |