From 04f26cd3ea8e2ace2ad3a6b0bfc20bdcbffd6f36 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Sun, 11 Jun 2023 23:55:07 -0400 Subject: [PATCH] Move custom emacs files to XDG_DATA_DIR, format init.el --- dot_config/emacs/init.el | 362 +++++++++--------- .../snippets/latex-mode/math-doc.yasnippet | 0 .../custom/themes/everforest-theme/LICENSE | 0 .../custom/themes/everforest-theme/README.md | 0 .../themes/everforest-theme/dark_light.png | Bin .../themes/everforest-theme/dot_git/HEAD | 0 .../everforest-theme/dot_git/branches/.keep | 0 .../themes/everforest-theme/dot_git/config | 0 .../everforest-theme/dot_git/description | 0 .../hooks/executable_applypatch-msg.sample | 0 .../hooks/executable_commit-msg.sample | 0 .../executable_fsmonitor-watchman.sample | 0 .../hooks/executable_post-update.sample | 0 .../hooks/executable_pre-applypatch.sample | 0 .../hooks/executable_pre-commit.sample | 0 .../hooks/executable_pre-merge-commit.sample | 0 .../dot_git/hooks/executable_pre-push.sample | 0 .../hooks/executable_pre-rebase.sample | 0 .../hooks/executable_pre-receive.sample | 0 .../executable_prepare-commit-msg.sample | 0 .../hooks/executable_push-to-checkout.sample | 0 .../dot_git/hooks/executable_update.sample | 0 .../themes/everforest-theme/dot_git/index | Bin .../everforest-theme/dot_git/info/exclude | 0 .../themes/everforest-theme/dot_git/logs/HEAD | 0 .../dot_git/logs/refs/heads/master | 0 .../dot_git/logs/refs/remotes/origin/HEAD | 0 .../dot_git/objects/info/.keep | 0 ...5ef24fdd562ed157eed440157fdc9aac8f72f3.idx | Bin ...ef24fdd562ed157eed440157fdc9aac8f72f3.pack | Bin .../everforest-theme/dot_git/packed-refs | 0 .../dot_git/refs/heads/master | 0 .../dot_git/refs/remotes/origin/HEAD | 0 .../everforest-theme/dot_git/refs/tags/.keep | 0 .../everforest-hard-dark-theme.el | 0 .../everforest-hard-light-theme.el | 0 .../themes/everforest-theme/everforest.el | 0 37 files changed, 176 insertions(+), 186 deletions(-) rename {dot_cache => dot_local/share}/emacs/custom/snippets/latex-mode/math-doc.yasnippet (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/LICENSE (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/README.md (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dark_light.png (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/HEAD (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/branches/.keep (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/config (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/description (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_applypatch-msg.sample (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_commit-msg.sample (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_fsmonitor-watchman.sample (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_post-update.sample (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-applypatch.sample (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-commit.sample (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-merge-commit.sample (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-push.sample (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-rebase.sample (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-receive.sample (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_prepare-commit-msg.sample (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_push-to-checkout.sample (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_update.sample (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/index (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/info/exclude (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/logs/HEAD (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/logs/refs/heads/master (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/logs/refs/remotes/origin/HEAD (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/objects/info/.keep (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/objects/pack/readonly_pack-bc5ef24fdd562ed157eed440157fdc9aac8f72f3.idx (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/objects/pack/readonly_pack-bc5ef24fdd562ed157eed440157fdc9aac8f72f3.pack (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/packed-refs (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/refs/heads/master (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/refs/remotes/origin/HEAD (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/dot_git/refs/tags/.keep (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/everforest-hard-dark-theme.el (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/everforest-hard-light-theme.el (100%) rename {dot_cache => dot_local/share}/emacs/custom/themes/everforest-theme/everforest.el (100%) diff --git a/dot_config/emacs/init.el b/dot_config/emacs/init.el index 618dae5..7308739 100644 --- a/dot_config/emacs/init.el +++ b/dot_config/emacs/init.el @@ -1,29 +1,36 @@ -; Disable package.el early so it won't start loading packages before init is loaded +;;; init.el --- GNU Emacs Initialization File + +;;; OPTIONS: + +;; Disable package.el (interferes with straight.el) (setq package-enable-at-startup nil) -;; No thanks -(setq inhibit-startup-message t) ; Disable startup message -(scroll-bar-mode -1) ; Disable visible scrollbar -(tool-bar-mode -1) ; Disable the toolbar -(tooltip-mode -1) ; Disable tooltips -(set-fringe-mode 10) ; Add come extra space to the left/right sides -(menu-bar-mode -1) ; Disable the menu bar -(setq-default custom-file null-device) ; Write customizations not in this file to the null device (AKA stop littering in my init.el) -(setq confirm-kill-processes nil) ; Stop asking about running processes on exit +;; Disable startup message +(setq inhibit-startup-message t) + +;; Don't ask about running processes on exit +(setq confirm-kill-processes nil) ;; Visible bell (setq visible-bell t) -; Font - Does nothing if mixed-pitch package is used -;(set-face-attribute 'default nil :font "ibm plex mono light" :height 100) +;; Write external customizations to /dev/null +(setq-default custom-file null-device) -;; Make ESC quit prompts -(global-set-key (kbd "") 'keyboard-escape-quit) +;; Disable some GUI options +(menu-bar-mode -1) +(scroll-bar-mode -1) +(tool-bar-mode -1) +(tooltip-mode -1) -;; paren/bracket pairs -(show-paren-mode t) -(setq-default show-paren-style 'parenthesis) -(electric-pair-mode 1) +;; Fringe width +(set-fringe-mode 10) + +;; Disable suspend-frame shortcut +(define-key global-map "\C-z" nil) + +;; Font (does nothing if mixed-pitch is used) +;; (set-face-attribute 'default nil :font "ibm plex mono light" :height 100) ;; Profile emacs startup (add-hook 'emacs-startup-hook @@ -34,27 +41,32 @@ (time-subtract after-init-time before-init-time))) gcs-done))) -;; Change the user-emacs-directory to keep ~/.emacs.d clean -(setq user-emacs-directory (expand-file-name "~/.cache/emacs/") +;; ESC behaves like C-g +(global-set-key (kbd "") 'keyboard-escape-quit) + +;; Parenthesis/bracket pairs +(show-paren-mode t) +(setq-default show-paren-style 'parenthesis) +(electric-pair-mode 1) + +;; Relocate emacs-user-directory to $XDG_DATA_HOME +(setq user-emacs-directory (expand-file-name "~/.local/share/emacs/") url-history-file (expand-file-name "url/history" user-emacs-directory)) -;; Store autosaves in cache dir instead of littering all over the filesystem +;; Store autosaves in $XDG_CACHE_HOME (setq auto-save-file-name-transforms `((".*" "~/.cache/emacs/autosave/" t))) -;; No annoying Windows errors +;; Default encoding (set-default-coding-systems 'utf-8) -;; Disable suspend-frame shortcut -(define-key global-map "\C-z" nil) - ;; More reasonable keybinds for resizing windows (global-set-key (kbd "S-C-") 'shrink-window-horizontally) (global-set-key (kbd "S-C-") 'enlarge-window-horizontally) (global-set-key (kbd "S-C-") 'shrink-window) (global-set-key (kbd "S-C-") 'enlarge-window) -;; scrolling +;; Scrolling (setq mouse-wheel-scroll-amount '(4 ((shift) . 1))) ; 1: lines to scroll, 2: while holding shift (setq mouse-wheel-progressive-speed nil) ; acceleration (setq mouse-wheel-follow-mouse 't) ; scroll window under cursor @@ -77,10 +89,12 @@ conf-mode-hook)) (add-hook mode (lambda () (display-line-numbers-mode 1)))) -;; Show vertical line at column 80 in prog-mode +;; Line width indicator (setq-default fill-column 80) (add-hook 'prog-mode-hook #'display-fill-column-indicator-mode) +;;; PACKAGE MANAGEMENT: + ;; Install and load straight.el (defvar bootstrap-version) (let ((bootstrap-file @@ -95,77 +109,15 @@ (eval-print-last-sexp))) (load bootstrap-file nil 'nomessage)) -;;;;;;;;;;;;;; Not needed when using straight.el ;;;;;;;;;;;;;; -;; Initialize package sources -;(require 'package) -;(setq package-archives '(("melpa" . "https://melpa.org/packages/") -; ("org" . "https://orgmode.org/elpa/") -; ("elpa" . "https://elpa.gnu.org/packages/"))) - -;(package-initialize) -;(unless package-archive-contents -; (package-refresh-contents)) - -;; Initialize use-package on non-Linux platforms -;(unless (package-installed-p 'use-package) -; (package-install 'use-package)) - -;(require 'use-package) -;(setq use-package-always-ensure t) -;;;;;;;;;;;;;; - -;; Install use-package +;; use-package (straight-use-package 'use-package) -;; Make use-package use straight.el +;; use-package/straight integration (use-package straight - :custom (straight-use-package-by-default t)) + :custom (straight-use-package-by-default t)) -;; Theme - -(setq custom-safe-themes t) - -;; (use-package everforest -;; :straight (:type git :repo "https://git.sr.ht/~theorytoe/everforest-theme")) - -(add-to-list 'custom-theme-load-path - (expand-file-name "custom/themes/everforest-theme" user-emacs-directory)) - -(load-theme 'everforest-hard-dark t) - -;; Help distinguish work buffers from others like sidebars and terminal -;; (use-package solaire-mode -;; :init -;; (solaire-global-mode t)) - -;; Icons -(use-package all-the-icons) - -;; Modeline - -(use-package minions - :hook (doom-modeline-mode . minions-mode) - (simple-modeline-mode . minions-mode)) - -(use-package doom-modeline - :init (doom-modeline-mode) - :custom - (doom-modeline-height 32) - ;(doom-modeline-bar-width .75) - (doom-modeline-window-width-limit fill-column) - (doom-modeline-lsp t) - (doom-modeline-minor-modes t) - (doom-modeline-persp-name nil) - (doom-modeline-buffer-file-name-style 'truncate-upto-project) - (doom-modeline-major-mode-icon t) - (doom-modeline-major-mode-color-icon t) - (doom-modeline-enable-word-count t) - (doom-modeline-env-version t) - (doom-modeline-env-load-string "...")) - -;; Don't remind me about some minor modes -(use-package diminish) +;;; PACKAGES: ;; Automatically set paths to the new user-emacs-directory (use-package no-littering) @@ -175,7 +127,7 @@ :hook ((text-mode . ws-butler-mode) (prog-mode . ws-butler-mode))) -;; Overview of keybindings available based on prefix keys +;; Keybindings overview by prefix key (use-package which-key :init (which-key-mode) :config @@ -368,7 +320,6 @@ (use-package consult-yasnippet) ;; Alternate completion style - (use-package orderless :init ;; Configure a custom style dispatcher (see the Consult wiki) @@ -379,7 +330,6 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Contextual actions - (use-package marginalia :config (marginalia-mode)) @@ -403,9 +353,8 @@ :hook (embark-collect-mode . consult-preview-at-point-mode)) -;; Org-mode +;;; ORG-MODE: -; No line numbers in org-mode (dolist (mode '(org-mode-hook)) (add-hook mode (lambda () (display-line-numbers-mode 0)))) @@ -418,6 +367,54 @@ (use-package org-appear :hook (org-mode . org-appear-mode)) +(use-package org-superstar + :hook + (org-mode . org-superstar-mode) + :config + (setq org-superstar-special-todo-items t)) + +;;; APPEARANCE: + +;; Theme +(setq custom-safe-themes t) + +(add-to-list 'custom-theme-load-path + (expand-file-name "custom/themes/everforest-theme" user-emacs-directory)) + +(load-theme 'everforest-hard-dark t) + +;; (use-package everforest +;; :straight (:type git :repo "https://git.sr.ht/~theorytoe/everforest-theme")) + + +;; Better distinction between work buffers and others +;; (use-package solaire-mode +;; :init +;; (solaire-global-mode t)) + + +;; Modeline +(use-package minions + :hook (doom-modeline-mode . minions-mode) + (simple-modeline-mode . minions-mode)) + +(use-package doom-modeline + :init (doom-modeline-mode) + :custom + (doom-modeline-height 32) + ;(doom-modeline-bar-width .75) + (doom-modeline-window-width-limit fill-column) + (doom-modeline-lsp t) + (doom-modeline-minor-modes t) + (doom-modeline-persp-name nil) + (doom-modeline-buffer-file-name-style 'truncate-upto-project) + (doom-modeline-major-mode-icon t) + (doom-modeline-major-mode-color-icon t) + (doom-modeline-enable-word-count t) + (doom-modeline-env-version t) + (doom-modeline-env-load-string "...")) + +;; Font (use-package mixed-pitch ;:hook ;(org-mode . mixed-pitch-mode) @@ -427,14 +424,76 @@ (set-face-attribute 'variable-pitch nil :font "DejaVu Sans" :height 100)) ;(add-hook 'mixed-pitch-mode-hook #'solaire-mode-reset) -(use-package org-superstar - :hook - (org-mode . org-superstar-mode) +;; Icons +(use-package all-the-icons) + +;; Hide some minor modes +(use-package diminish) + +;;; PROJECT MANAGEMENT: + +;; Git +(use-package magit + :bind ("C-M-;" . magit-status) + :commands (magit-status magit-get-current-branch) + :custom + (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1)) + +;; Treemacs +(use-package treemacs + :bind + (:map global-map + ("M-0" . treemacs-select-window) + ("C-x t 1" . treemacs-delete-other-windows) + ("C-x t t" . treemacs) + ("C-x t B" . treemacs-bookmark) + ("C-x t C-t" . treemacs-find-file) + ("C-x t M-t" . treemacs-find-tag))) + +(use-package lsp-treemacs :config - (setq org-superstar-special-todo-items t)) + (lsp-treemacs-sync-mode 1)) + +;;; UTILITIES: + +;; Text completion +(use-package company + :config + (global-company-mode 1) + (setq company-global-modes '(not gud-mode)) + (setq company-global-modes '(not comint-mode)) + :custom + (company-idle-delay 0) + (company-minimum-prefix-length 1) + (company-tooltip-align-annotations t) + :bind + (:map company-active-map + ("RET" . nil) + ("[return]" . nil) + ("TAB" . company-complete-selection) + ("" . company-complete-selection) + ("C-n" . company-select-next) + ("C-p" . company-select-previous))) + +;; Templating +(use-package yasnippet + :bind + ("C-c y s" . yas-insert-snippet) + ("C-c y v" . yas-visit-snippet-file) + :config + (yas-reload-all) + (add-to-list 'yas-snippet-dirs + (expand-file-name "custom/snippets" user-emacs-directory)) + :hook + (prog-mode . yas-minor-mode) + (tex-mode . yas-minor-mode) + (latex-mode . yas-minor-mode)) + +(use-package yasnippet-snippets) + +;;; LANGUAGE SUPPORT: ;; LSP - (use-package lsp-mode :init (setq lsp-keymap-prefix "C-c l") @@ -490,29 +549,7 @@ (setq lsp-ui-peek-peek-height 25) (lsp-ui-doc-show)) - -;; Text completion - -(use-package company - :config - (global-company-mode 1) - (setq company-global-modes '(not gud-mode)) - (setq company-global-modes '(not comint-mode)) - :custom - (company-idle-delay 0) - (company-minimum-prefix-length 1) - (company-tooltip-align-annotations t) - :bind - (:map company-active-map - ("RET" . nil) - ("[return]" . nil) - ("TAB" . company-complete-selection) - ("" . company-complete-selection) - ("C-n" . company-select-next) - ("C-p" . company-select-previous))) - ;; Debugging - (use-package dap-mode :after lsp-mode :commands dap-debug @@ -544,52 +581,29 @@ (use-package realgud-lldb) -;; Treemacs -(use-package treemacs - :bind - (:map global-map - ("M-0" . treemacs-select-window) - ("C-x t 1" . treemacs-delete-other-windows) - ("C-x t t" . treemacs) - ("C-x t B" . treemacs-bookmark) - ("C-x t C-t" . treemacs-find-file) - ("C-x t M-t" . treemacs-find-tag))) - -(use-package lsp-treemacs - :config - (lsp-treemacs-sync-mode 1)) - ;; Syntax checking (use-package flycheck :hook (lsp-mode . flycheck-mode) :config (setq flycheck-python-flake8-executable "flake8")) -;; Git -(use-package magit - :bind ("C-M-;" . magit-status) - :commands (magit-status magit-get-current-branch) - :custom - (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1)) - -;;; Languages/Tools - -;; Highlighting/Formatting - +;; Format on save (use-package apheleia :init (apheleia-global-mode +1)) +(use-package reformatter ;; required for zig fmt + :after zig-mode) + +;; Syntax parsing/highlighting (use native tree-sitter on emacs 29+) (use-package tree-sitter :config (global-tree-sitter-mode) (add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode)) -(use-package tree-sitter-langs - :after tree-sitter) +(use-package tree-sitter-langs) ;; C/C++ - (setq dap-lldb-debug-program '("/usr/bin/lldb-vscode")) (setq-default c-default-style "k&r") (setq-default c-basic-offset 2) @@ -599,18 +613,16 @@ ;; (lambda () (require 'ccls) (lsp)))) (use-package modern-cpp-font-lock - :hook - (c++-mode . modern-c++-font-lock-mode)) + :hook + (c++-mode . modern-c++-font-lock-mode)) ;; Golang +(use-package go-mode + :config + (add-hook 'before-save-hook #'lsp-organize-imports)) -;; (use-package go-mode -;; :config -;; (add-hook 'before-save-hook #'lsp-organize-imports)) - -;; JavaScript/TypeScript, HTML, CSS - +;; JavaScript/TypeScript, Web (setq css-indent-level 2) (setq css-indent-offset 2) (setq js-indent-level 2) @@ -677,20 +689,16 @@ :bind ("C-c C-n" . jsdoc)) ;; LaTeX - ;(use-package lsp-latex) ;'(setq lsp-tex-server 'digestif) ;; OpenGL / GLSL - (use-package glsl-mode) ;; Protocol Buffers - -;; (use-package protobuf-mode) +(use-package protobuf-mode) ;; Python - (setq dap-python-debugger 'debugpy) (use-package lsp-pyright @@ -717,7 +725,6 @@ (conda-env-activate-for-buffer))))) ;; Rust - (use-package rustic :ensure :bind (:map rustic-mode-map @@ -732,7 +739,7 @@ ("C-c C-c e" . lsp-rust-analyzer-expand-macro) ("C-c C-c d" . dap-hydra) ("C-c C-c h" . lsp-ui-doc-glance))) - :config + ;; :config ;; uncomment for less flashiness ;; (setq lsp-eldoc-hook nil) ;; (setq lsp-enable-symbol-highlighting nil) @@ -751,11 +758,9 @@ ;; (add-hook 'before-save-hook 'lsp-format-buffer nil t)) ;; TOML config files - (use-package toml-mode) ;; Zig - (use-package zig-mode :config (add-to-list 'lsp-language-id-configuration '(zig-mode . "zig")) @@ -765,19 +770,4 @@ :major-modes '(zig-mode) :server-id 'zls))) -;; Templating -(use-package yasnippet - :bind - ("C-c y s" . yas-insert-snippet) - ("C-c y v" . yas-visit-snippet-file) - :config - (yas-reload-all) - (add-to-list 'yas-snippet-dirs - (expand-file-name "custom/snippets" user-emacs-directory)) - :hook - (prog-mode . yas-minor-mode) - (tex-mode . yas-minor-mode) - (latex-mode . yas-minor-mode)) - -(use-package yasnippet-snippets) ;;; End init.el diff --git a/dot_cache/emacs/custom/snippets/latex-mode/math-doc.yasnippet b/dot_local/share/emacs/custom/snippets/latex-mode/math-doc.yasnippet similarity index 100% rename from dot_cache/emacs/custom/snippets/latex-mode/math-doc.yasnippet rename to dot_local/share/emacs/custom/snippets/latex-mode/math-doc.yasnippet diff --git a/dot_cache/emacs/custom/themes/everforest-theme/LICENSE b/dot_local/share/emacs/custom/themes/everforest-theme/LICENSE similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/LICENSE rename to dot_local/share/emacs/custom/themes/everforest-theme/LICENSE diff --git a/dot_cache/emacs/custom/themes/everforest-theme/README.md b/dot_local/share/emacs/custom/themes/everforest-theme/README.md similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/README.md rename to dot_local/share/emacs/custom/themes/everforest-theme/README.md diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dark_light.png b/dot_local/share/emacs/custom/themes/everforest-theme/dark_light.png similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dark_light.png rename to dot_local/share/emacs/custom/themes/everforest-theme/dark_light.png diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/HEAD b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/HEAD similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/HEAD rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/HEAD diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/branches/.keep b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/branches/.keep similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/branches/.keep rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/branches/.keep diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/config b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/config similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/config rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/config diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/description b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/description similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/description rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/description diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_applypatch-msg.sample b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_applypatch-msg.sample similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_applypatch-msg.sample rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_applypatch-msg.sample diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_commit-msg.sample b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_commit-msg.sample similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_commit-msg.sample rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_commit-msg.sample diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_fsmonitor-watchman.sample b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_fsmonitor-watchman.sample similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_fsmonitor-watchman.sample rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_fsmonitor-watchman.sample diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_post-update.sample b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_post-update.sample similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_post-update.sample rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_post-update.sample diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-applypatch.sample b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-applypatch.sample similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-applypatch.sample rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-applypatch.sample diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-commit.sample b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-commit.sample similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-commit.sample rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-commit.sample diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-merge-commit.sample b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-merge-commit.sample similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-merge-commit.sample rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-merge-commit.sample diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-push.sample b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-push.sample similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-push.sample rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-push.sample diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-rebase.sample b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-rebase.sample similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-rebase.sample rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-rebase.sample diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-receive.sample b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-receive.sample similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-receive.sample rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_pre-receive.sample diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_prepare-commit-msg.sample b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_prepare-commit-msg.sample similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_prepare-commit-msg.sample rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_prepare-commit-msg.sample diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_push-to-checkout.sample b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_push-to-checkout.sample similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_push-to-checkout.sample rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_push-to-checkout.sample diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_update.sample b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_update.sample similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_update.sample rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/hooks/executable_update.sample diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/index b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/index similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/index rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/index diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/info/exclude b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/info/exclude similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/info/exclude rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/info/exclude diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/logs/HEAD b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/logs/HEAD similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/logs/HEAD rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/logs/HEAD diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/logs/refs/heads/master b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/logs/refs/heads/master similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/logs/refs/heads/master rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/logs/refs/heads/master diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/logs/refs/remotes/origin/HEAD b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/logs/refs/remotes/origin/HEAD similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/logs/refs/remotes/origin/HEAD rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/logs/refs/remotes/origin/HEAD diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/objects/info/.keep b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/objects/info/.keep similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/objects/info/.keep rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/objects/info/.keep diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/objects/pack/readonly_pack-bc5ef24fdd562ed157eed440157fdc9aac8f72f3.idx b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/objects/pack/readonly_pack-bc5ef24fdd562ed157eed440157fdc9aac8f72f3.idx similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/objects/pack/readonly_pack-bc5ef24fdd562ed157eed440157fdc9aac8f72f3.idx rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/objects/pack/readonly_pack-bc5ef24fdd562ed157eed440157fdc9aac8f72f3.idx diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/objects/pack/readonly_pack-bc5ef24fdd562ed157eed440157fdc9aac8f72f3.pack b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/objects/pack/readonly_pack-bc5ef24fdd562ed157eed440157fdc9aac8f72f3.pack similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/objects/pack/readonly_pack-bc5ef24fdd562ed157eed440157fdc9aac8f72f3.pack rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/objects/pack/readonly_pack-bc5ef24fdd562ed157eed440157fdc9aac8f72f3.pack diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/packed-refs b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/packed-refs similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/packed-refs rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/packed-refs diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/refs/heads/master b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/refs/heads/master similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/refs/heads/master rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/refs/heads/master diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/refs/remotes/origin/HEAD b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/refs/remotes/origin/HEAD similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/refs/remotes/origin/HEAD rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/refs/remotes/origin/HEAD diff --git a/dot_cache/emacs/custom/themes/everforest-theme/dot_git/refs/tags/.keep b/dot_local/share/emacs/custom/themes/everforest-theme/dot_git/refs/tags/.keep similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/dot_git/refs/tags/.keep rename to dot_local/share/emacs/custom/themes/everforest-theme/dot_git/refs/tags/.keep diff --git a/dot_cache/emacs/custom/themes/everforest-theme/everforest-hard-dark-theme.el b/dot_local/share/emacs/custom/themes/everforest-theme/everforest-hard-dark-theme.el similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/everforest-hard-dark-theme.el rename to dot_local/share/emacs/custom/themes/everforest-theme/everforest-hard-dark-theme.el diff --git a/dot_cache/emacs/custom/themes/everforest-theme/everforest-hard-light-theme.el b/dot_local/share/emacs/custom/themes/everforest-theme/everforest-hard-light-theme.el similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/everforest-hard-light-theme.el rename to dot_local/share/emacs/custom/themes/everforest-theme/everforest-hard-light-theme.el diff --git a/dot_cache/emacs/custom/themes/everforest-theme/everforest.el b/dot_local/share/emacs/custom/themes/everforest-theme/everforest.el similarity index 100% rename from dot_cache/emacs/custom/themes/everforest-theme/everforest.el rename to dot_local/share/emacs/custom/themes/everforest-theme/everforest.el