Remove numbered pkgs version

.gitignore

@@ -1,5 +1,6 @@
 auto-save-list
 projectile*
+!pkg/projectile.el
 backups
 elpa
 *.elc

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")

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."

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

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."

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)

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

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)

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

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)

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

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)

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

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)

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

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 "<f13>") '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

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

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

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

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

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

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 "<f2> i") 'counsel-info-lookup-symbol)
 (global-set-key (kbd "<f2> u") 'counsel-unicode-char)
 
-(provide '05ivy)
-;;; 05ivy.el ends here
+(provide 'pkg/ivy)
+;;; ivy.el ends here

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

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

pkg/magit.el

@@ -1,4 +1,4 @@
-;;; 05magit -- summary
+;;; pkg/magit -- summary
 ;;; Commentary:
 ;;; Code:
 
@@ -11,5 +11,5 @@
         (:map magit-blame-mode-map
               ("<f5> b" . 'magit-blame-quit)))
 
-(provide '05magit)
-;;; 05magit.el ends here
+(provide 'pkg/magit)
+;;; magit.el ends here

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

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

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