From 6defe997ae2147b573e4377f7d3033d05cac3724 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Thu, 24 Sep 2020 19:19:02 +0300 Subject: [PATCH] Remove numbered pkgs version --- .gitignore | 1 + init.el | 28 +++++++++---------- languages/clang.el | 6 ++-- languages/clojure.el | 4 +-- languages/elisp.el | 2 +- languages/elixir.el | 6 ++-- languages/erlang.el | 4 +-- languages/fsharp.el | 4 +-- languages/haskell.el | 6 ++-- languages/javascript.el | 6 ++-- languages/markdown.el | 2 +- languages/ruby.el | 6 ++-- languages/rust.el | 4 +-- languages/web.el | 4 +-- 01base.el => pkg/base.el | 8 +++--- .../company-yasnippet.el | 6 ++-- 05ctags.el => pkg/ctags.el | 6 ++-- 05deft.el => pkg/deft.el | 6 ++-- 05flycheck.el => pkg/flycheck.el | 6 ++-- 05hydra.el => pkg/hydra.el | 6 ++-- 05ispell.el => pkg/ispell.el | 6 ++-- 05ivy.el => pkg/ivy.el | 6 ++-- 05lsp.el => pkg/lsp.el | 6 ++-- 05macros.el => pkg/macros.el | 6 ++-- 05magit.el => pkg/magit.el | 6 ++-- 05prog-mode.el => pkg/prog-mode.el | 6 ++-- 05projectile.el => pkg/projectile.el | 6 ++-- 01sys-specific.el => pkg/sys-specific.el | 6 ++-- 28 files changed, 85 insertions(+), 84 deletions(-) rename 01base.el => pkg/base.el (97%) rename 05company-yasnippet.el => pkg/company-yasnippet.el (96%) rename 05ctags.el => pkg/ctags.el (96%) rename 05deft.el => pkg/deft.el (82%) rename 05flycheck.el => pkg/flycheck.el (72%) rename 05hydra.el => pkg/hydra.el (97%) rename 05ispell.el => pkg/ispell.el (81%) rename 05ivy.el => pkg/ivy.el (94%) rename 05lsp.el => pkg/lsp.el (92%) rename 05macros.el => pkg/macros.el (78%) rename 05magit.el => pkg/magit.el (79%) rename 05prog-mode.el => pkg/prog-mode.el (96%) rename 05projectile.el => pkg/projectile.el (91%) rename 01sys-specific.el => pkg/sys-specific.el (96%) diff --git a/.gitignore b/.gitignore index 8d63e9e..f7347f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ auto-save-list projectile* +!pkg/projectile.el backups elpa *.elc diff --git a/init.el b/init.el index a6eb531..22f6fb8 100644 --- a/init.el +++ b/init.el @@ -22,20 +22,20 @@ (require 'use-package) ;; General configuration files. -(require '01base "$HOME/.emacs.d/01base.el") -(require '01sys-specific "$HOME/.emacs.d/01sys-specific.el") -(require '05macros "$HOME/.emacs.d/05macros.el") -(require '05ivy "$HOME/.emacs.d/05ivy.el") -(require '05hydra "$HOME/.emacs.d/05hydra.el") -(require '05magit "$HOME/.emacs.d/05magit.el") -(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") -(require '05company-yasnippet "$HOME/.emacs.d/05company-yasnippet.el") -(require '05flycheck "$HOME/.emacs.d/05flycheck.el") -(require '05projectile "$HOME/.emacs.d/05projectile.el") -(require '05ctags "$HOME/.emacs.d/05ctags.el") -(require '05ispell "$HOME/.emacs.d/05ispell.el") -(require '05deft "$HOME/.emacs.d/05deft.el") -(require '05lsp "$HOME/.emacs.d/05lsp.el") +(require 'pkg/base "$HOME/.emacs.d/pkg/base.el") +(require 'pkg/sys-specific "$HOME/.emacs.d/pkg/sys-specific.el") +(require 'pkg/macros "$HOME/.emacs.d/pkg/macros.el") +(require 'pkg/ivy "$HOME/.emacs.d/pkg/ivy.el") +(require 'pkg/hydra "$HOME/.emacs.d/pkg/hydra.el") +(require 'pkg/magit "$HOME/.emacs.d/pkg/magit.el") +(require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'pkg/company-yasnippet "$HOME/.emacs.d/pkg/company-yasnippet.el") +(require 'pkg/flycheck "$HOME/.emacs.d/pkg/flycheck.el") +(require 'pkg/projectile "$HOME/.emacs.d/pkg/projectile.el") +(require 'pkg/ctags "$HOME/.emacs.d/pkg/ctags.el") +(require 'pkg/ispell "$HOME/.emacs.d/pkg/ispell.el") +(require 'pkg/deft "$HOME/.emacs.d/pkg/deft.el") +(require 'pkg/lsp "$HOME/.emacs.d/pkg/lsp.el") ;; Themes (require '10themes "$HOME/.emacs.d/themes/themes.el") diff --git a/languages/clang.el b/languages/clang.el index f890d0f..7330d73 100644 --- a/languages/clang.el +++ b/languages/clang.el @@ -2,9 +2,9 @@ ;;; Commentary: ;;; Code: -(require '05projectile "$HOME/.emacs.d/05projectile.el") -(require '05ctags "$HOME/.emacs.d/05ctags.el") -(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") +(require 'pkg/projectile "$HOME/.emacs.d/pkg/projectile.el") +(require 'pkg/ctags "$HOME/.emacs.d/pkg/ctags.el") +(require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (defun activate-clang-mode () "Goodies for editing c files." diff --git a/languages/clojure.el b/languages/clojure.el index 871e6f1..021d15e 100644 --- a/languages/clojure.el +++ b/languages/clojure.el @@ -2,8 +2,8 @@ ;;; Commentary: ;;; Code: -(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") -(require '05hydra "$HOME/.emacs.d/05hydra.el") +(require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'pkg/hydra "$HOME/.emacs.d/pkg/hydra.el") (use-package clojure-mode :defer t diff --git a/languages/elisp.el b/languages/elisp.el index d1510e8..5a4e5ca 100644 --- a/languages/elisp.el +++ b/languages/elisp.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") +(require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (defun activate-emacs-lisp-mode () "Goodies for editing Emacs files." diff --git a/languages/elixir.el b/languages/elixir.el index db594dc..fec90b1 100644 --- a/languages/elixir.el +++ b/languages/elixir.el @@ -2,9 +2,9 @@ ;;; Commentary: ;;; Code: -(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") -(require '05flycheck "$HOME/.emacs.d/05flycheck.el") -(require '05hydra "$HOME/.emacs.d/05hydra.el") +(require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'pkg/flycheck "$HOME/.emacs.d/pkg/flycheck.el") +(require 'pkg/hydra "$HOME/.emacs.d/pkg/hydra.el") (use-package elixir-mode :requires (lsp-mode lsp-ui) diff --git a/languages/erlang.el b/languages/erlang.el index 5e06ed4..2d9f0db 100644 --- a/languages/erlang.el +++ b/languages/erlang.el @@ -2,8 +2,8 @@ ;;; Commentary: ;;; Code: -(require '05ctags "$HOME/.emacs.d/05ctags.el") -(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") +(require 'pkg/ctags "$HOME/.emacs.d/pkg/ctags.el") +(require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (use-package erlang :defer t diff --git a/languages/fsharp.el b/languages/fsharp.el index b1e3b89..fc2a477 100644 --- a/languages/fsharp.el +++ b/languages/fsharp.el @@ -10,8 +10,8 @@ ;;; Code: -(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") -(require '05flycheck "$HOME/.emacs.d/05flycheck.el") +(require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'pkg/flycheck "$HOME/.emacs.d/pkg/flycheck.el") (use-package fsharp-mode :requires (lsp-mode lsp-ui) diff --git a/languages/haskell.el b/languages/haskell.el index 472b5a0..b59f371 100644 --- a/languages/haskell.el +++ b/languages/haskell.el @@ -10,9 +10,9 @@ ;;; Code: -(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") -(require '05flycheck "$HOME/.emacs.d/05flycheck.el") -(require '05hydra "$HOME/.emacs.d/05hydra.el") +(require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'pkg/flycheck "$HOME/.emacs.d/pkg/flycheck.el") +(require 'pkg/hydra "$HOME/.emacs.d/pkg/hydra.el") (use-package haskell-mode :ensure t diff --git a/languages/javascript.el b/languages/javascript.el index 267dad6..aff5768 100644 --- a/languages/javascript.el +++ b/languages/javascript.el @@ -2,9 +2,9 @@ ;;; Commentary: ;;; Code: -(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") -(require '05flycheck "$HOME/.emacs.d/05flycheck.el") -(require '05lsp "$HOME/.emacs.d/05lsp.el") +(require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'pkg/flycheck "$HOME/.emacs.d/pkg/flycheck.el") +(require 'pkg/lsp "$HOME/.emacs.d/pkg/lsp.el") (use-package js2-mode :requires (web-mode company-web lsp-mode lsp-ui) diff --git a/languages/markdown.el b/languages/markdown.el index 8f991de..5b1335c 100644 --- a/languages/markdown.el +++ b/languages/markdown.el @@ -2,7 +2,7 @@ ;;; Commentary: ;;; Code: -(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") +(require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") (use-package markdown-mode :ensure t diff --git a/languages/ruby.el b/languages/ruby.el index 310c9f5..3294f1d 100644 --- a/languages/ruby.el +++ b/languages/ruby.el @@ -2,9 +2,9 @@ ;;; Commentary: ;;; Code: -(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") -(require '05projectile "$HOME/.emacs.d/05projectile.el") -(require '05ctags "$HOME/.emacs.d/05ctags.el") +(require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'pkg/projectile "$HOME/.emacs.d/pkg/projectile.el") +(require 'pkg/ctags "$HOME/.emacs.d/pkg/ctags.el") (use-package rspec-mode :ensure t :defer t) (use-package ruby-end :ensure t :defer t) diff --git a/languages/rust.el b/languages/rust.el index aaf2648..992cc8d 100644 --- a/languages/rust.el +++ b/languages/rust.el @@ -2,8 +2,8 @@ ;;; Commentary: ;;; Code: -(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") -(require '05flycheck "$HOME/.emacs.d/05flycheck.el") +(require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el") +(require 'pkg/flycheck "$HOME/.emacs.d/pkg/flycheck.el") (use-package rust-mode :ensure t diff --git a/languages/web.el b/languages/web.el index c7cc46b..11b0e9e 100644 --- a/languages/web.el +++ b/languages/web.el @@ -2,8 +2,8 @@ ;;; Commentary: ;;; Code: -(require '05lsp "$HOME/.emacs.d/05lsp.el") -(require '05flycheck "$HOME/.emacs.d/05flycheck.el") +(require 'pkg/lsp "$HOME/.emacs.d/pkg/lsp.el") +(require 'pkg/flycheck "$HOME/.emacs.d/pkg/flycheck.el") (use-package web-mode :requires (lsp-mode flycheck) diff --git a/01base.el b/pkg/base.el similarity index 97% rename from 01base.el rename to pkg/base.el index e48b8c8..b8ff1c5 100644 --- a/01base.el +++ b/pkg/base.el @@ -1,4 +1,4 @@ -;;; 01base.el --- summary +;;; pkg/base.el --- summary ;; Author: Maciej Szlosarczyk ;; Maintainer: Maciej Szlosarczyk @@ -6,7 +6,7 @@ ;;; Commentary: -;; 01base defines basic packages and environment. +;; pkg/base defines basic packages and environment. ;;; Code: @@ -164,5 +164,5 @@ (which-key-mode t) -(provide '01base) -;;; 01base.el ends here +(provide 'pkg/base) +;;; base.el ends here diff --git a/05company-yasnippet.el b/pkg/company-yasnippet.el similarity index 96% rename from 05company-yasnippet.el rename to pkg/company-yasnippet.el index c824a22..59afe35 100644 --- a/05company-yasnippet.el +++ b/pkg/company-yasnippet.el @@ -1,4 +1,4 @@ -;;; 05company-yasnippet -- summary +;;; pkg/company-yasnippet -- summary ;;; Commentary: ;;; Company completion framework configuration ;;; Code: @@ -71,5 +71,5 @@ (define-key text-mode-map (kbd "") 'insert-space-and-complete) (define-key text-mode-map (kbd "TAB") 'company-indent-or-complete-common) -(provide '05company-yasnippet) -;;; 05company-yasnippet.el ends here +(provide 'pkg/company-yasnippet) +;;; company-yasnippet.el ends here diff --git a/05ctags.el b/pkg/ctags.el similarity index 96% rename from 05ctags.el rename to pkg/ctags.el index fe1662c..babc2d2 100644 --- a/05ctags.el +++ b/pkg/ctags.el @@ -1,4 +1,4 @@ -;;; 05ctags -- summary +;;; pkg/ctags -- summary ;;; Commentary: ;;; Old and rudimental completion framework. ;;; Code: @@ -54,5 +54,5 @@ (add-to-list (make-local-variable 'ctags/major-modes-to-update-on-save) mode)) (add-hook 'after-save-hook 'ctags/update-tags-on-save) -(provide '05ctags) -;;; 05ctags.el ends here +(provide 'pkg/ctags) +;;; ctags.el ends here diff --git a/05deft.el b/pkg/deft.el similarity index 82% rename from 05deft.el rename to pkg/deft.el index 36ba2af..90cbb05 100644 --- a/05deft.el +++ b/pkg/deft.el @@ -1,4 +1,4 @@ -;;; 05deft.el -- summary +;;; pkg/deft.el -- summary ;;; Commentary: ;;; Notational velocity, backed by OneDrive. ;;; Code: @@ -13,5 +13,5 @@ (global-set-key (kbd "C-c d d") 'deft) -(provide '05deft) -;;; 05deft.el ends here +(provide 'pkg/deft) +;;; deft.el ends here diff --git a/05flycheck.el b/pkg/flycheck.el similarity index 72% rename from 05flycheck.el rename to pkg/flycheck.el index 322e11a..a48c8fe 100644 --- a/05flycheck.el +++ b/pkg/flycheck.el @@ -1,4 +1,4 @@ -;;; 05flycheck -- summary +;;; pkg/flycheck -- summary ;;; Commentary: ;;; Code: @@ -9,5 +9,5 @@ :defer t :config (global-flycheck-mode t)) -(provide '05flycheck) -;;; 05flycheck.el ends here +(provide 'pkg/flycheck) +;;; flycheck.el ends here diff --git a/05hydra.el b/pkg/hydra.el similarity index 97% rename from 05hydra.el rename to pkg/hydra.el index fa3895c..07c7b97 100644 --- a/05hydra.el +++ b/pkg/hydra.el @@ -1,4 +1,4 @@ -;;; 05hydra -- summary +;;; pkg/hydra -- summary ;;; Commentary: ;;; Global hydra definitions. ;;; Code: @@ -103,5 +103,5 @@ _r_: reload buffer ("C-c w" . hydra-window-menu/body) ("C-c l" . hydra-language-context-menu/body)) -(provide '05hydra) -;;; 05hydra.el ends here +(provide 'pkg/hydra) +;;; hydra.el ends here diff --git a/05ispell.el b/pkg/ispell.el similarity index 81% rename from 05ispell.el rename to pkg/ispell.el index ffd78cf..4170acf 100644 --- a/05ispell.el +++ b/pkg/ispell.el @@ -1,4 +1,4 @@ -;;; 05ispell -- summary +;;; pkg/ispell -- summary ;;; Commentary: ;;; Highlight misspelled words ;;; Code: @@ -10,5 +10,5 @@ '("--run-together" "--run-together-limit=5" "--run-together-min=2")) :hook ((prog-mode text-mode) . flyspell-mode)) -(provide '05ispell) -;;; 05ispell.el ends here +(provide 'pkg/ispell) +;;; ispell.el ends here diff --git a/05ivy.el b/pkg/ivy.el similarity index 94% rename from 05ivy.el rename to pkg/ivy.el index 76fc18a..1f5b0b9 100644 --- a/05ivy.el +++ b/pkg/ivy.el @@ -1,4 +1,4 @@ -;;; 05ivy -- summary +;;; pkg/ivy -- summary ;;; Commentary: ;;; Counsel, Swiper and Ivy. ;;; Code: @@ -26,5 +26,5 @@ (global-set-key (kbd " i") 'counsel-info-lookup-symbol) (global-set-key (kbd " u") 'counsel-unicode-char) -(provide '05ivy) -;;; 05ivy.el ends here +(provide 'pkg/ivy) +;;; ivy.el ends here diff --git a/05lsp.el b/pkg/lsp.el similarity index 92% rename from 05lsp.el rename to pkg/lsp.el index 1992a0d..3273b75 100644 --- a/05lsp.el +++ b/pkg/lsp.el @@ -1,4 +1,4 @@ -;;; 05lsp -- summary +;;; pkg/lsp -- summary ;;; Commentary: ;;; Global Language Server Protocol Config ;;; Code: @@ -28,5 +28,5 @@ lsp-ui-doc-include-signature t lsp-log-io nil) -(provide '05lsp) -;;; 05lsp.el ends here +(provide 'pkg/lsp) +;;; lsp.el ends here diff --git a/05macros.el b/pkg/macros.el similarity index 78% rename from 05macros.el rename to pkg/macros.el index 0eb64ab..38b0d27 100644 --- a/05macros.el +++ b/pkg/macros.el @@ -1,4 +1,4 @@ -;;; 05macros -- summary +;;; macros -- summary ;;; Commentary: ;;; Code: @@ -9,5 +9,5 @@ (setq result (append (list (car form) result) (cdr form)))))) -(provide '05macros) -;;; 05macros ends here +(provide 'pkg/macros) +;;; macros ends here diff --git a/05magit.el b/pkg/magit.el similarity index 79% rename from 05magit.el rename to pkg/magit.el index bd5684e..1d45857 100644 --- a/05magit.el +++ b/pkg/magit.el @@ -1,4 +1,4 @@ -;;; 05magit -- summary +;;; pkg/magit -- summary ;;; Commentary: ;;; Code: @@ -11,5 +11,5 @@ (:map magit-blame-mode-map (" b" . 'magit-blame-quit))) -(provide '05magit) -;;; 05magit.el ends here +(provide 'pkg/magit) +;;; magit.el ends here diff --git a/05prog-mode.el b/pkg/prog-mode.el similarity index 96% rename from 05prog-mode.el rename to pkg/prog-mode.el index da1dc24..0fe8645 100644 --- a/05prog-mode.el +++ b/pkg/prog-mode.el @@ -1,4 +1,4 @@ -;;; 05prog-mode -- summary +;;; pkg/prog-mode -- summary ;;; Commentary: ;;; Code: @@ -79,5 +79,5 @@ :ensure t :defer t) -(provide '05prog-mode) -;;; 05prog-mode ends here +(provide 'pkg/prog-mode) +;;; prog-mode ends here diff --git a/05projectile.el b/pkg/projectile.el similarity index 91% rename from 05projectile.el rename to pkg/projectile.el index 46b8bbc..4e5a1c6 100644 --- a/05projectile.el +++ b/pkg/projectile.el @@ -1,4 +1,4 @@ -;;; 07projectile -- summary +;;; pkg/projectile -- summary ;;; Commentary: ;;; Project management based on git repos ;;; Code: @@ -20,5 +20,5 @@ (projectile-mode t) -(provide '05projectile) -;;; 05projectile.el ends here +(provide 'pkg/projectile) +;;; projectile.el ends here diff --git a/01sys-specific.el b/pkg/sys-specific.el similarity index 96% rename from 01sys-specific.el rename to pkg/sys-specific.el index d8941c2..094c00f 100644 --- a/01sys-specific.el +++ b/pkg/sys-specific.el @@ -1,4 +1,4 @@ -;;; 01sys-specific -- summary +;;; sys-specific -- summary ;;; Commentary: ;;; Make Emacs play nicer with specific operating systems ;;; Code: @@ -62,5 +62,5 @@ (global-set-key (kbd "A-z") 'undo) (global-set-key (kbd "A-q") 'kill-emacs))) -(provide '01sys-specific) -;;; 01sys-specific.el ends here +(provide 'pkg/sys-specific) +;;; sys-specific.el ends here