From 0a735091f76e43cadbaeb97321522324387fc7c2 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sat, 13 May 2023 17:41:03 +0200 Subject: [PATCH] Prepend my Emacs libraries to avoid collisions --- .../lib/{annotate.el => az_annotate.el} | 0 .../emacs.d/lib/{company.el => az_company.el} | 0 ...el => az_counsel-git-grep-current-mode.el} | 0 .../emacs.d/lib/{counsel.el => az_counsel.el} | 0 .../emacs/emacs.d/lib/{deft.el => az_deft.el} | 0 .../lib/{deft_raw.el => az_deft_raw.el} | 0 .../lib/{detect_os.el => az_detect_os.el} | 0 .../emacs.d/lib/{dired.el => az_dired.el} | 0 .../emacs.d/lib/{direnv.el => az_direnv.el} | 0 .../emacs/emacs.d/lib/{evil.el => az_evil.el} | 0 .../lib/{flycheck.el => az_flycheck.el} | 0 .../lib/{format_all.el => az_format_all.el} | 0 .../emacs.d/lib/{hydra.el => az_hydra.el} | 0 .../lib/{keybindings.el => az_keybindings.el} | 0 ...keyring_update.el => az_keyring_update.el} | 0 .../lib/{langtool.el => az_langtool.el} | 0 ...languageserver.el => az_languageserver.el} | 0 .../emacs.d/lib/{magit.el => az_magit.el} | 0 .../emacs.d/lib/{manuals.el => az_manuals.el} | 0 .../lib/{markdown.el => az_markdown.el} | 0 .../lib/{move_text.el => az_move_text.el} | 0 .../emacs/emacs.d/lib/{mu4e.el => az_mu4e.el} | 0 .../lib/{olivetti.el => az_olivetti.el} | 0 .../lib/{packages.el => az_packages.el} | 0 .../lib/{pdf_tools.el => az_pdf_tools.el} | 0 .../lib/{perspective.el => az_perspective.el} | 0 .../lib/{powershell.el => az_powershell.el} | 0 .../lib/{projectile.el => az_projectile.el} | 0 .../emacs.d/lib/{python.el => az_python.el} | 0 .../lib/{spellcheck.el => az_spellcheck.el} | 0 .../emacs.d/lib/{theme.el => az_theme.el} | 0 .../lib/{treemacs.el => az_treemacs.el} | 0 .../emacs/emacs.d/lib/{ui.el => az_ui.el} | 0 .../emacs.d/lib/{utils.el => az_utils.el} | 0 .../emacs.d/lib/{various.el => az_various.el} | 0 .../emacs.d/lib/{vterm.el => az_vterm.el} | 0 .../emacs.d/lib/{webmode.el => az_webmode.el} | 0 .../{window_split.el => az_window_split.el} | 0 .../emacs.d/lib/{xclip.el => az_xclip.el} | 0 .../emacs/emacs.d/lib/{yaml.el => az_yaml.el} | 0 .../lib/{yasnippet.el => az_yasnippet.el} | 0 .../software/emacs/emacs.d/modules.el | 80 +++++++++---------- 42 files changed, 40 insertions(+), 40 deletions(-) rename home-manager/software/emacs/emacs.d/lib/{annotate.el => az_annotate.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{company.el => az_company.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{counsel-git-grep-current-mode.el => az_counsel-git-grep-current-mode.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{counsel.el => az_counsel.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{deft.el => az_deft.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{deft_raw.el => az_deft_raw.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{detect_os.el => az_detect_os.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{dired.el => az_dired.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{direnv.el => az_direnv.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{evil.el => az_evil.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{flycheck.el => az_flycheck.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{format_all.el => az_format_all.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{hydra.el => az_hydra.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{keybindings.el => az_keybindings.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{keyring_update.el => az_keyring_update.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{langtool.el => az_langtool.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{languageserver.el => az_languageserver.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{magit.el => az_magit.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{manuals.el => az_manuals.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{markdown.el => az_markdown.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{move_text.el => az_move_text.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{mu4e.el => az_mu4e.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{olivetti.el => az_olivetti.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{packages.el => az_packages.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{pdf_tools.el => az_pdf_tools.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{perspective.el => az_perspective.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{powershell.el => az_powershell.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{projectile.el => az_projectile.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{python.el => az_python.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{spellcheck.el => az_spellcheck.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{theme.el => az_theme.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{treemacs.el => az_treemacs.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{ui.el => az_ui.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{utils.el => az_utils.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{various.el => az_various.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{vterm.el => az_vterm.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{webmode.el => az_webmode.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{window_split.el => az_window_split.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{xclip.el => az_xclip.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{yaml.el => az_yaml.el} (100%) rename home-manager/software/emacs/emacs.d/lib/{yasnippet.el => az_yasnippet.el} (100%) diff --git a/home-manager/software/emacs/emacs.d/lib/annotate.el b/home-manager/software/emacs/emacs.d/lib/az_annotate.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/annotate.el rename to home-manager/software/emacs/emacs.d/lib/az_annotate.el diff --git a/home-manager/software/emacs/emacs.d/lib/company.el b/home-manager/software/emacs/emacs.d/lib/az_company.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/company.el rename to home-manager/software/emacs/emacs.d/lib/az_company.el diff --git a/home-manager/software/emacs/emacs.d/lib/counsel-git-grep-current-mode.el b/home-manager/software/emacs/emacs.d/lib/az_counsel-git-grep-current-mode.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/counsel-git-grep-current-mode.el rename to home-manager/software/emacs/emacs.d/lib/az_counsel-git-grep-current-mode.el diff --git a/home-manager/software/emacs/emacs.d/lib/counsel.el b/home-manager/software/emacs/emacs.d/lib/az_counsel.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/counsel.el rename to home-manager/software/emacs/emacs.d/lib/az_counsel.el diff --git a/home-manager/software/emacs/emacs.d/lib/deft.el b/home-manager/software/emacs/emacs.d/lib/az_deft.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/deft.el rename to home-manager/software/emacs/emacs.d/lib/az_deft.el diff --git a/home-manager/software/emacs/emacs.d/lib/deft_raw.el b/home-manager/software/emacs/emacs.d/lib/az_deft_raw.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/deft_raw.el rename to home-manager/software/emacs/emacs.d/lib/az_deft_raw.el diff --git a/home-manager/software/emacs/emacs.d/lib/detect_os.el b/home-manager/software/emacs/emacs.d/lib/az_detect_os.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/detect_os.el rename to home-manager/software/emacs/emacs.d/lib/az_detect_os.el diff --git a/home-manager/software/emacs/emacs.d/lib/dired.el b/home-manager/software/emacs/emacs.d/lib/az_dired.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/dired.el rename to home-manager/software/emacs/emacs.d/lib/az_dired.el diff --git a/home-manager/software/emacs/emacs.d/lib/direnv.el b/home-manager/software/emacs/emacs.d/lib/az_direnv.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/direnv.el rename to home-manager/software/emacs/emacs.d/lib/az_direnv.el diff --git a/home-manager/software/emacs/emacs.d/lib/evil.el b/home-manager/software/emacs/emacs.d/lib/az_evil.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/evil.el rename to home-manager/software/emacs/emacs.d/lib/az_evil.el diff --git a/home-manager/software/emacs/emacs.d/lib/flycheck.el b/home-manager/software/emacs/emacs.d/lib/az_flycheck.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/flycheck.el rename to home-manager/software/emacs/emacs.d/lib/az_flycheck.el diff --git a/home-manager/software/emacs/emacs.d/lib/format_all.el b/home-manager/software/emacs/emacs.d/lib/az_format_all.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/format_all.el rename to home-manager/software/emacs/emacs.d/lib/az_format_all.el diff --git a/home-manager/software/emacs/emacs.d/lib/hydra.el b/home-manager/software/emacs/emacs.d/lib/az_hydra.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/hydra.el rename to home-manager/software/emacs/emacs.d/lib/az_hydra.el diff --git a/home-manager/software/emacs/emacs.d/lib/keybindings.el b/home-manager/software/emacs/emacs.d/lib/az_keybindings.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/keybindings.el rename to home-manager/software/emacs/emacs.d/lib/az_keybindings.el diff --git a/home-manager/software/emacs/emacs.d/lib/keyring_update.el b/home-manager/software/emacs/emacs.d/lib/az_keyring_update.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/keyring_update.el rename to home-manager/software/emacs/emacs.d/lib/az_keyring_update.el diff --git a/home-manager/software/emacs/emacs.d/lib/langtool.el b/home-manager/software/emacs/emacs.d/lib/az_langtool.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/langtool.el rename to home-manager/software/emacs/emacs.d/lib/az_langtool.el diff --git a/home-manager/software/emacs/emacs.d/lib/languageserver.el b/home-manager/software/emacs/emacs.d/lib/az_languageserver.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/languageserver.el rename to home-manager/software/emacs/emacs.d/lib/az_languageserver.el diff --git a/home-manager/software/emacs/emacs.d/lib/magit.el b/home-manager/software/emacs/emacs.d/lib/az_magit.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/magit.el rename to home-manager/software/emacs/emacs.d/lib/az_magit.el diff --git a/home-manager/software/emacs/emacs.d/lib/manuals.el b/home-manager/software/emacs/emacs.d/lib/az_manuals.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/manuals.el rename to home-manager/software/emacs/emacs.d/lib/az_manuals.el diff --git a/home-manager/software/emacs/emacs.d/lib/markdown.el b/home-manager/software/emacs/emacs.d/lib/az_markdown.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/markdown.el rename to home-manager/software/emacs/emacs.d/lib/az_markdown.el diff --git a/home-manager/software/emacs/emacs.d/lib/move_text.el b/home-manager/software/emacs/emacs.d/lib/az_move_text.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/move_text.el rename to home-manager/software/emacs/emacs.d/lib/az_move_text.el diff --git a/home-manager/software/emacs/emacs.d/lib/mu4e.el b/home-manager/software/emacs/emacs.d/lib/az_mu4e.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/mu4e.el rename to home-manager/software/emacs/emacs.d/lib/az_mu4e.el diff --git a/home-manager/software/emacs/emacs.d/lib/olivetti.el b/home-manager/software/emacs/emacs.d/lib/az_olivetti.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/olivetti.el rename to home-manager/software/emacs/emacs.d/lib/az_olivetti.el diff --git a/home-manager/software/emacs/emacs.d/lib/packages.el b/home-manager/software/emacs/emacs.d/lib/az_packages.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/packages.el rename to home-manager/software/emacs/emacs.d/lib/az_packages.el diff --git a/home-manager/software/emacs/emacs.d/lib/pdf_tools.el b/home-manager/software/emacs/emacs.d/lib/az_pdf_tools.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/pdf_tools.el rename to home-manager/software/emacs/emacs.d/lib/az_pdf_tools.el diff --git a/home-manager/software/emacs/emacs.d/lib/perspective.el b/home-manager/software/emacs/emacs.d/lib/az_perspective.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/perspective.el rename to home-manager/software/emacs/emacs.d/lib/az_perspective.el diff --git a/home-manager/software/emacs/emacs.d/lib/powershell.el b/home-manager/software/emacs/emacs.d/lib/az_powershell.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/powershell.el rename to home-manager/software/emacs/emacs.d/lib/az_powershell.el diff --git a/home-manager/software/emacs/emacs.d/lib/projectile.el b/home-manager/software/emacs/emacs.d/lib/az_projectile.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/projectile.el rename to home-manager/software/emacs/emacs.d/lib/az_projectile.el diff --git a/home-manager/software/emacs/emacs.d/lib/python.el b/home-manager/software/emacs/emacs.d/lib/az_python.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/python.el rename to home-manager/software/emacs/emacs.d/lib/az_python.el diff --git a/home-manager/software/emacs/emacs.d/lib/spellcheck.el b/home-manager/software/emacs/emacs.d/lib/az_spellcheck.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/spellcheck.el rename to home-manager/software/emacs/emacs.d/lib/az_spellcheck.el diff --git a/home-manager/software/emacs/emacs.d/lib/theme.el b/home-manager/software/emacs/emacs.d/lib/az_theme.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/theme.el rename to home-manager/software/emacs/emacs.d/lib/az_theme.el diff --git a/home-manager/software/emacs/emacs.d/lib/treemacs.el b/home-manager/software/emacs/emacs.d/lib/az_treemacs.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/treemacs.el rename to home-manager/software/emacs/emacs.d/lib/az_treemacs.el diff --git a/home-manager/software/emacs/emacs.d/lib/ui.el b/home-manager/software/emacs/emacs.d/lib/az_ui.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/ui.el rename to home-manager/software/emacs/emacs.d/lib/az_ui.el diff --git a/home-manager/software/emacs/emacs.d/lib/utils.el b/home-manager/software/emacs/emacs.d/lib/az_utils.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/utils.el rename to home-manager/software/emacs/emacs.d/lib/az_utils.el diff --git a/home-manager/software/emacs/emacs.d/lib/various.el b/home-manager/software/emacs/emacs.d/lib/az_various.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/various.el rename to home-manager/software/emacs/emacs.d/lib/az_various.el diff --git a/home-manager/software/emacs/emacs.d/lib/vterm.el b/home-manager/software/emacs/emacs.d/lib/az_vterm.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/vterm.el rename to home-manager/software/emacs/emacs.d/lib/az_vterm.el diff --git a/home-manager/software/emacs/emacs.d/lib/webmode.el b/home-manager/software/emacs/emacs.d/lib/az_webmode.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/webmode.el rename to home-manager/software/emacs/emacs.d/lib/az_webmode.el diff --git a/home-manager/software/emacs/emacs.d/lib/window_split.el b/home-manager/software/emacs/emacs.d/lib/az_window_split.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/window_split.el rename to home-manager/software/emacs/emacs.d/lib/az_window_split.el diff --git a/home-manager/software/emacs/emacs.d/lib/xclip.el b/home-manager/software/emacs/emacs.d/lib/az_xclip.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/xclip.el rename to home-manager/software/emacs/emacs.d/lib/az_xclip.el diff --git a/home-manager/software/emacs/emacs.d/lib/yaml.el b/home-manager/software/emacs/emacs.d/lib/az_yaml.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/yaml.el rename to home-manager/software/emacs/emacs.d/lib/az_yaml.el diff --git a/home-manager/software/emacs/emacs.d/lib/yasnippet.el b/home-manager/software/emacs/emacs.d/lib/az_yasnippet.el similarity index 100% rename from home-manager/software/emacs/emacs.d/lib/yasnippet.el rename to home-manager/software/emacs/emacs.d/lib/az_yasnippet.el diff --git a/home-manager/software/emacs/emacs.d/modules.el b/home-manager/software/emacs/emacs.d/modules.el index 85dffce..25d21b2 100644 --- a/home-manager/software/emacs/emacs.d/modules.el +++ b/home-manager/software/emacs/emacs.d/modules.el @@ -1,50 +1,50 @@ ;; basic settings -(load-file (modules-path "detect_os.el")) -(load-file (modules-path "dired.el")) -(load-file (modules-path "packages.el")) -(load-file (modules-path "theme.el")) -(load-file (modules-path "ui.el")) -(load-file (modules-path "utils.el")) -(load-file (modules-path "various.el")) -(load-file (modules-path "window_split.el")) +(load-file (modules-path "az_detect_os.el")) +(load-file (modules-path "az_dired.el")) +(load-file (modules-path "az_packages.el")) +(load-file (modules-path "az_theme.el")) +(load-file (modules-path "az_ui.el")) +(load-file (modules-path "az_utils.el")) +(load-file (modules-path "az_various.el")) +(load-file (modules-path "az_window_split.el")) ;;(load-file (modules-path "xclip.el")) ;; keybindings -(load-file (modules-path "evil.el")) -(load-file (modules-path "hydra.el")) -(load-file (modules-path "keybindings.el")) +(load-file (modules-path "az_evil.el")) +(load-file (modules-path "az_hydra.el")) +(load-file (modules-path "az_keybindings.el")) ;; note taking and writing -(load-file (modules-path "deft_raw.el")) -(load-file (modules-path "deft.el")) -(load-file (modules-path "langtool.el")) -(load-file (modules-path "markdown.el")) -(load-file (modules-path "move_text.el")) -(load-file (modules-path "olivetti.el")) -(load-file (modules-path "pdf_tools.el")) -(load-file (modules-path "spellcheck.el")) +(load-file (modules-path "az_deft_raw.el")) +(load-file (modules-path "az_deft.el")) +(load-file (modules-path "az_langtool.el")) +(load-file (modules-path "az_markdown.el")) +(load-file (modules-path "az_move_text.el")) +(load-file (modules-path "az_olivetti.el")) +(load-file (modules-path "az_pdf_tools.el")) +(load-file (modules-path "az_spellcheck.el")) ;; programming -(load-file (modules-path "annotate.el")) -(load-file (modules-path "company.el")) -(load-file (modules-path "direnv.el")) -(load-file (modules-path "format_all.el")) -(load-file (modules-path "flycheck.el")) -(load-file (modules-path "magit.el")) -(load-file (modules-path "languageserver.el")) -(load-file (modules-path "powershell.el")) -(load-file (modules-path "projectile.el")) -(load-file (modules-path "python.el")) -(load-file (modules-path "webmode.el")) -(load-file (modules-path "yaml.el")) +(load-file (modules-path "az_annotate.el")) +(load-file (modules-path "az_company.el")) +(load-file (modules-path "az_direnv.el")) +(load-file (modules-path "az_format_all.el")) +(load-file (modules-path "az_flycheck.el")) +(load-file (modules-path "az_magit.el")) +(load-file (modules-path "az_languageserver.el")) +(load-file (modules-path "az_powershell.el")) +(load-file (modules-path "az_projectile.el")) +(load-file (modules-path "az_python.el")) +(load-file (modules-path "az_webmode.el")) +(load-file (modules-path "az_yaml.el")) ;; various third party -(load-file (modules-path "counsel.el")) -(load-file (modules-path "counsel-git-grep-current-mode.el")) -(load-file (modules-path "keyring_update.el")) -(load-file (modules-path "manuals.el")) -(load-file (modules-path "mu4e.el")) -(load-file (modules-path "treemacs.el")) -(load-file (modules-path "perspective.el")) -(load-file (modules-path "vterm.el")) -(load-file (modules-path "yasnippet.el")) +(load-file (modules-path "az_counsel.el")) +(load-file (modules-path "az_counsel-git-grep-current-mode.el")) +(load-file (modules-path "az_keyring_update.el")) +(load-file (modules-path "az_manuals.el")) +(load-file (modules-path "az_mu4e.el")) +(load-file (modules-path "az_treemacs.el")) +(load-file (modules-path "az_perspective.el")) +(load-file (modules-path "az_vterm.el")) +(load-file (modules-path "az_yasnippet.el"))