maciej/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove numbered pkgs version

Browse source
This commit is contained in:
Maciej 2020-09-24 19:19:02 +03:00
parent b2318b6ef0
commit 6defe997ae
Signed by: maciej
GPG key ID: 41D62D42D3B0D765
28 changed files with 85 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

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

28
init.el
View file

@ -22,20 +22,20 @@
(require 'use-package) (require 'use-package)
;; General configuration files. ;; General configuration files.
(require '01base "$HOME/.emacs.d/01base.el") (require 'pkg/base "$HOME/.emacs.d/pkg/base.el")
(require '01sys-specific "$HOME/.emacs.d/01sys-specific.el") (require 'pkg/sys-specific "$HOME/.emacs.d/pkg/sys-specific.el")
(require '05macros "$HOME/.emacs.d/05macros.el") (require 'pkg/macros "$HOME/.emacs.d/pkg/macros.el")
(require '05ivy "$HOME/.emacs.d/05ivy.el") (require 'pkg/ivy "$HOME/.emacs.d/pkg/ivy.el")
(require '05hydra "$HOME/.emacs.d/05hydra.el") (require 'pkg/hydra "$HOME/.emacs.d/pkg/hydra.el")
(require '05magit "$HOME/.emacs.d/05magit.el") (require 'pkg/magit "$HOME/.emacs.d/pkg/magit.el")
(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") (require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
(require '05company-yasnippet "$HOME/.emacs.d/05company-yasnippet.el") (require 'pkg/company-yasnippet "$HOME/.emacs.d/pkg/company-yasnippet.el")
(require '05flycheck "$HOME/.emacs.d/05flycheck.el") (require 'pkg/flycheck "$HOME/.emacs.d/pkg/flycheck.el")
(require '05projectile "$HOME/.emacs.d/05projectile.el") (require 'pkg/projectile "$HOME/.emacs.d/pkg/projectile.el")
(require '05ctags "$HOME/.emacs.d/05ctags.el") (require 'pkg/ctags "$HOME/.emacs.d/pkg/ctags.el")
(require '05ispell "$HOME/.emacs.d/05ispell.el") (require 'pkg/ispell "$HOME/.emacs.d/pkg/ispell.el")
(require '05deft "$HOME/.emacs.d/05deft.el") (require 'pkg/deft "$HOME/.emacs.d/pkg/deft.el")
(require '05lsp "$HOME/.emacs.d/05lsp.el") (require 'pkg/lsp "$HOME/.emacs.d/pkg/lsp.el")
;; Themes ;; Themes
(require '10themes "$HOME/.emacs.d/themes/themes.el") (require '10themes "$HOME/.emacs.d/themes/themes.el")

6
languages/clang.el
View file

@ -2,9 +2,9 @@
;;; Commentary: ;;; Commentary:
;;; Code: ;;; Code:
(require '05projectile "$HOME/.emacs.d/05projectile.el") (require 'pkg/projectile "$HOME/.emacs.d/pkg/projectile.el")
(require '05ctags "$HOME/.emacs.d/05ctags.el") (require 'pkg/ctags "$HOME/.emacs.d/pkg/ctags.el")
(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") (require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
(defun activate-clang-mode () (defun activate-clang-mode ()
"Goodies for editing c files." "Goodies for editing c files."

4
languages/clojure.el
View file

@ -2,8 +2,8 @@
;;; Commentary: ;;; Commentary:
;;; Code: ;;; Code:
(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") (require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
(require '05hydra "$HOME/.emacs.d/05hydra.el") (require 'pkg/hydra "$HOME/.emacs.d/pkg/hydra.el")
(use-package clojure-mode (use-package clojure-mode
:defer t :defer t

2
languages/elisp.el
View file

@ -2,7 +2,7 @@
;;; Commentary: ;;; Commentary:
;;; Code: ;;; 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 () (defun activate-emacs-lisp-mode ()
"Goodies for editing Emacs files." "Goodies for editing Emacs files."

6
languages/elixir.el
View file

@ -2,9 +2,9 @@
;;; Commentary: ;;; Commentary:
;;; Code: ;;; Code:
(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") (require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
(require '05flycheck "$HOME/.emacs.d/05flycheck.el") (require 'pkg/flycheck "$HOME/.emacs.d/pkg/flycheck.el")
(require '05hydra "$HOME/.emacs.d/05hydra.el") (require 'pkg/hydra "$HOME/.emacs.d/pkg/hydra.el")
(use-package elixir-mode (use-package elixir-mode
:requires (lsp-mode lsp-ui) :requires (lsp-mode lsp-ui)

4
languages/erlang.el
View file

@ -2,8 +2,8 @@
;;; Commentary: ;;; Commentary:
;;; Code: ;;; Code:
(require '05ctags "$HOME/.emacs.d/05ctags.el") (require 'pkg/ctags "$HOME/.emacs.d/pkg/ctags.el")
(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") (require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
(use-package erlang (use-package erlang
:defer t :defer t

4
languages/fsharp.el
View file

@ -10,8 +10,8 @@
;;; Code: ;;; Code:
(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") (require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
(require '05flycheck "$HOME/.emacs.d/05flycheck.el") (require 'pkg/flycheck "$HOME/.emacs.d/pkg/flycheck.el")
(use-package fsharp-mode (use-package fsharp-mode
:requires (lsp-mode lsp-ui) :requires (lsp-mode lsp-ui)

6
languages/haskell.el
View file

@ -10,9 +10,9 @@
;;; Code: ;;; Code:
(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") (require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
(require '05flycheck "$HOME/.emacs.d/05flycheck.el") (require 'pkg/flycheck "$HOME/.emacs.d/pkg/flycheck.el")
(require '05hydra "$HOME/.emacs.d/05hydra.el") (require 'pkg/hydra "$HOME/.emacs.d/pkg/hydra.el")
(use-package haskell-mode (use-package haskell-mode
:ensure t :ensure t

6
languages/javascript.el
View file

@ -2,9 +2,9 @@
;;; Commentary: ;;; Commentary:
;;; Code: ;;; Code:
(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") (require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
(require '05flycheck "$HOME/.emacs.d/05flycheck.el") (require 'pkg/flycheck "$HOME/.emacs.d/pkg/flycheck.el")
(require '05lsp "$HOME/.emacs.d/05lsp.el") (require 'pkg/lsp "$HOME/.emacs.d/pkg/lsp.el")
(use-package js2-mode (use-package js2-mode
:requires (web-mode company-web lsp-mode lsp-ui) :requires (web-mode company-web lsp-mode lsp-ui)

2
languages/markdown.el
View file

@ -2,7 +2,7 @@
;;; Commentary: ;;; Commentary:
;;; Code: ;;; 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 (use-package markdown-mode
:ensure t :ensure t

6
languages/ruby.el
View file

@ -2,9 +2,9 @@
;;; Commentary: ;;; Commentary:
;;; Code: ;;; Code:
(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") (require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
(require '05projectile "$HOME/.emacs.d/05projectile.el") (require 'pkg/projectile "$HOME/.emacs.d/pkg/projectile.el")
(require '05ctags "$HOME/.emacs.d/05ctags.el") (require 'pkg/ctags "$HOME/.emacs.d/pkg/ctags.el")
(use-package rspec-mode :ensure t :defer t) (use-package rspec-mode :ensure t :defer t)
(use-package ruby-end :ensure t :defer t) (use-package ruby-end :ensure t :defer t)

4
languages/rust.el
View file

@ -2,8 +2,8 @@
;;; Commentary: ;;; Commentary:
;;; Code: ;;; Code:
(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el") (require 'pkg/prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
(require '05flycheck "$HOME/.emacs.d/05flycheck.el") (require 'pkg/flycheck "$HOME/.emacs.d/pkg/flycheck.el")
(use-package rust-mode (use-package rust-mode
:ensure t :ensure t

4
languages/web.el
View file

@ -2,8 +2,8 @@
;;; Commentary: ;;; Commentary:
;;; Code: ;;; Code:
(require '05lsp "$HOME/.emacs.d/05lsp.el") (require 'pkg/lsp "$HOME/.emacs.d/pkg/lsp.el")
(require '05flycheck "$HOME/.emacs.d/05flycheck.el") (require 'pkg/flycheck "$HOME/.emacs.d/pkg/flycheck.el")
(use-package web-mode (use-package web-mode
:requires (lsp-mode flycheck) :requires (lsp-mode flycheck)

8
01base.el → pkg/base.el
View file

@ -1,4 +1,4 @@
;;; 01base.el --- summary ;;; pkg/base.el --- summary
;; Author: Maciej Szlosarczyk ;; Author: Maciej Szlosarczyk
;; Maintainer: Maciej Szlosarczyk ;; Maintainer: Maciej Szlosarczyk
@ -6,7 +6,7 @@
;;; Commentary: ;;; Commentary:
;; 01base defines basic packages and environment. ;; pkg/base defines basic packages and environment.
;;; Code: ;;; Code:
@ -164,5 +164,5 @@
(which-key-mode t) (which-key-mode t)
(provide '01base) (provide 'pkg/base)
;;; 01base.el ends here ;;; base.el ends here

6
05company-yasnippet.el → pkg/company-yasnippet.el
View file

@ -1,4 +1,4 @@
;;; 05company-yasnippet -- summary ;;; pkg/company-yasnippet -- summary
;;; Commentary: ;;; Commentary:
;;; Company completion framework configuration ;;; Company completion framework configuration
;;; Code: ;;; Code:
@ -71,5 +71,5 @@
(define-key text-mode-map (kbd "<f13>") 'insert-space-and-complete) (define-key text-mode-map (kbd "<f13>") 'insert-space-and-complete)
(define-key text-mode-map (kbd "TAB") 'company-indent-or-complete-common) (define-key text-mode-map (kbd "TAB") 'company-indent-or-complete-common)
(provide '05company-yasnippet) (provide 'pkg/company-yasnippet)
;;; 05company-yasnippet.el ends here ;;; company-yasnippet.el ends here

6
05ctags.el → pkg/ctags.el
View file

@ -1,4 +1,4 @@
;;; 05ctags -- summary ;;; pkg/ctags -- summary
;;; Commentary: ;;; Commentary:
;;; Old and rudimental completion framework. ;;; Old and rudimental completion framework.
;;; Code: ;;; Code:
@ -54,5 +54,5 @@
(add-to-list (make-local-variable 'ctags/major-modes-to-update-on-save) mode)) (add-to-list (make-local-variable 'ctags/major-modes-to-update-on-save) mode))
(add-hook 'after-save-hook 'ctags/update-tags-on-save) (add-hook 'after-save-hook 'ctags/update-tags-on-save)
(provide '05ctags) (provide 'pkg/ctags)
;;; 05ctags.el ends here ;;; ctags.el ends here

6
05deft.el → pkg/deft.el
View file

@ -1,4 +1,4 @@
;;; 05deft.el -- summary ;;; pkg/deft.el -- summary
;;; Commentary: ;;; Commentary:
;;; Notational velocity, backed by OneDrive. ;;; Notational velocity, backed by OneDrive.
;;; Code: ;;; Code:
@ -13,5 +13,5 @@
(global-set-key (kbd "C-c d d") 'deft) (global-set-key (kbd "C-c d d") 'deft)
(provide '05deft) (provide 'pkg/deft)
;;; 05deft.el ends here ;;; deft.el ends here

6
05flycheck.el → pkg/flycheck.el
View file

@ -1,4 +1,4 @@
;;; 05flycheck -- summary ;;; pkg/flycheck -- summary
;;; Commentary: ;;; Commentary:
;;; Code: ;;; Code:
@ -9,5 +9,5 @@
:defer t :defer t
:config (global-flycheck-mode t)) :config (global-flycheck-mode t))
(provide '05flycheck) (provide 'pkg/flycheck)
;;; 05flycheck.el ends here ;;; flycheck.el ends here

6
05hydra.el → pkg/hydra.el
View file

@ -1,4 +1,4 @@
;;; 05hydra -- summary ;;; pkg/hydra -- summary
;;; Commentary: ;;; Commentary:
;;; Global hydra definitions. ;;; Global hydra definitions.
;;; Code: ;;; Code:
@ -103,5 +103,5 @@ _r_: reload buffer
("C-c w" . hydra-window-menu/body) ("C-c w" . hydra-window-menu/body)
("C-c l" . hydra-language-context-menu/body)) ("C-c l" . hydra-language-context-menu/body))
(provide '05hydra) (provide 'pkg/hydra)
;;; 05hydra.el ends here ;;; hydra.el ends here

6
05ispell.el → pkg/ispell.el
View file

@ -1,4 +1,4 @@
;;; 05ispell -- summary ;;; pkg/ispell -- summary
;;; Commentary: ;;; Commentary:
;;; Highlight misspelled words ;;; Highlight misspelled words
;;; Code: ;;; Code:
@ -10,5 +10,5 @@
'("--run-together" "--run-together-limit=5" "--run-together-min=2")) '("--run-together" "--run-together-limit=5" "--run-together-min=2"))
:hook ((prog-mode text-mode) . flyspell-mode)) :hook ((prog-mode text-mode) . flyspell-mode))
(provide '05ispell) (provide 'pkg/ispell)
;;; 05ispell.el ends here ;;; ispell.el ends here

6
05ivy.el → pkg/ivy.el
View file

@ -1,4 +1,4 @@
;;; 05ivy -- summary ;;; pkg/ivy -- summary
;;; Commentary: ;;; Commentary:
;;; Counsel, Swiper and Ivy. ;;; Counsel, Swiper and Ivy.
;;; Code: ;;; Code:
@ -26,5 +26,5 @@
(global-set-key (kbd "<f2> i") 'counsel-info-lookup-symbol) (global-set-key (kbd "<f2> i") 'counsel-info-lookup-symbol)
(global-set-key (kbd "<f2> u") 'counsel-unicode-char) (global-set-key (kbd "<f2> u") 'counsel-unicode-char)
(provide '05ivy) (provide 'pkg/ivy)
;;; 05ivy.el ends here ;;; ivy.el ends here

6
05lsp.el → pkg/lsp.el
View file

@ -1,4 +1,4 @@
;;; 05lsp -- summary ;;; pkg/lsp -- summary
;;; Commentary: ;;; Commentary:
;;; Global Language Server Protocol Config ;;; Global Language Server Protocol Config
;;; Code: ;;; Code:
@ -28,5 +28,5 @@
lsp-ui-doc-include-signature t lsp-ui-doc-include-signature t
lsp-log-io nil) lsp-log-io nil)
(provide '05lsp) (provide 'pkg/lsp)
;;; 05lsp.el ends here ;;; lsp.el ends here

6
05macros.el → pkg/macros.el
View file

@ -1,4 +1,4 @@
;;; 05macros -- summary ;;; macros -- summary
;;; Commentary: ;;; Commentary:
;;; Code: ;;; Code:
@ -9,5 +9,5 @@
(setq result (append (list (car form) result) (setq result (append (list (car form) result)
(cdr form)))))) (cdr form))))))
(provide '05macros) (provide 'pkg/macros)
;;; 05macros ends here ;;; macros ends here

6
05magit.el → pkg/magit.el
View file

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

6
05prog-mode.el → pkg/prog-mode.el
View file

@ -1,4 +1,4 @@
;;; 05prog-mode -- summary ;;; pkg/prog-mode -- summary
;;; Commentary: ;;; Commentary:
;;; Code: ;;; Code:
@ -79,5 +79,5 @@
:ensure t :ensure t
:defer t) :defer t)
(provide '05prog-mode) (provide 'pkg/prog-mode)
;;; 05prog-mode ends here ;;; prog-mode ends here

6
05projectile.el → pkg/projectile.el
View file

@ -1,4 +1,4 @@
;;; 07projectile -- summary ;;; pkg/projectile -- summary
;;; Commentary: ;;; Commentary:
;;; Project management based on git repos ;;; Project management based on git repos
;;; Code: ;;; Code:
@ -20,5 +20,5 @@
(projectile-mode t) (projectile-mode t)
(provide '05projectile) (provide 'pkg/projectile)
;;; 05projectile.el ends here ;;; projectile.el ends here

6
01sys-specific.el → pkg/sys-specific.el
View file

@ -1,4 +1,4 @@
;;; 01sys-specific -- summary ;;; sys-specific -- summary
;;; Commentary: ;;; Commentary:
;;; Make Emacs play nicer with specific operating systems ;;; Make Emacs play nicer with specific operating systems
;;; Code: ;;; Code:
@ -62,5 +62,5 @@
(global-set-key (kbd "A-z") 'undo) (global-set-key (kbd "A-z") 'undo)
(global-set-key (kbd "A-q") 'kill-emacs))) (global-set-key (kbd "A-q") 'kill-emacs)))
(provide '01sys-specific) (provide 'pkg/sys-specific)
;;; 01sys-specific.el ends here ;;; sys-specific.el ends here