From 376e3611a3b4516691aefbaa00cb7cc2131a132f Mon Sep 17 00:00:00 2001 From: David Florness Date: Tue, 16 Apr 2019 13:55:40 -0600 Subject: [PATCH] Don't load lisp in ~/emacs.d/lisp as features --- init.el | 25 +++++++++++-------------- lisp/setup-appearance.el | 13 ------------- lisp/setup-defaults.el | 13 ------------- lisp/setup-dev.el | 14 -------------- lisp/setup-go.el | 13 ------------- lisp/setup-helm.el | 13 ------------- lisp/setup-keys.el | 13 ------------- lisp/setup-lisp.el | 13 ------------- lisp/setup-org.el | 13 ------------- lisp/setup-packages.el | 11 ----------- lisp/setup-python.el | 13 ------------- 11 files changed, 11 insertions(+), 143 deletions(-) diff --git a/init.el b/init.el index aa842dd..9cd56a5 100644 --- a/init.el +++ b/init.el @@ -16,21 +16,18 @@ "/usr/share/emacs/site-lisp/*")))) (add-to-list 'load-path d t)) -(add-to-list 'load-path "~/.emacs.d/lisp") -(load-file "~/.emacs.d/lisp/setup-packages.el") - - -(require 'setup-packages) -(require 'setup-keys) -(require 'setup-appearance) -(require 'setup-org) -(require 'setup-dev) -(require 'setup-helm) -(require 'setup-defaults) -(require 'setup-lisp) -(require 'setup-python) -(require 'setup-go) +;;; Loading of personal config files +(load "~/.emacs.d/lisp/setup-packages") +(load "~/.emacs.d/lisp/setup-keys") +(load "~/.emacs.d/lisp/setup-appearance") +(load "~/.emacs.d/lisp/setup-org") +(load "~/.emacs.d/lisp/setup-dev") +(load "~/.emacs.d/lisp/setup-helm") +(load "~/.emacs.d/lisp/setup-defaults") +(load "~/.emacs.d/lisp/setup-lisp") +(load "~/.emacs.d/lisp/setup-python") +(load "~/.emacs.d/lisp/setup-go") ;;; Winner mode: allows for undoing and redoing of windoow configurations diff --git a/lisp/setup-appearance.el b/lisp/setup-appearance.el index 6942925..62ae8d8 100644 --- a/lisp/setup-appearance.el +++ b/lisp/setup-appearance.el @@ -1,12 +1,3 @@ -;;; setup-appearance --- Setup look of Emacs - -;;; Commentary: - -;; This sets up the look of Emacs to my liking - -;;; Code: - - ;;; Change frame title (setq frame-title-format "emacs") @@ -54,7 +45,3 @@ 100) '(85 . 50) '(100 . 100))))) (global-set-key (kbd "C-c t") 'toggle-transparency) - - -(provide 'setup-appearance) -;;; setup-appearance.el ends here diff --git a/lisp/setup-defaults.el b/lisp/setup-defaults.el index ed00fb9..89e7a1c 100644 --- a/lisp/setup-defaults.el +++ b/lisp/setup-defaults.el @@ -1,14 +1 @@ -;;; setup-defaults --- Setup defaults - -;;; Commentary: - -;; Set up default values for miscellanious variables - -;;; Code: - - (setq-default fill-column 80) - - -(provide 'setup-defaults) -;;; setup-defaults.el ends here diff --git a/lisp/setup-dev.el b/lisp/setup-dev.el index 6153a13..4dae449 100644 --- a/lisp/setup-dev.el +++ b/lisp/setup-dev.el @@ -1,11 +1,3 @@ -;;; setup-dev --- Setup packages for easy development - -;;; Commentary: - -;; This sets up packages which aid heavily in development - -;;; Code: - (require 'evil) @@ -166,9 +158,3 @@ :ensure t :mode ("\\`PKGBUILD\\'" . pkgbuild-mode) :defer t) - - - - -(provide 'setup-dev) -;;; setup-dev.el ends here diff --git a/lisp/setup-go.el b/lisp/setup-go.el index f2da057..14e62e3 100644 --- a/lisp/setup-go.el +++ b/lisp/setup-go.el @@ -1,12 +1,3 @@ -;;; setup-go -- Setup Golang-related packages - -;;; Commentary: - -;; This sets up golang-related packages - -;;; Code: - - (use-package go-mode :ensure t :defer t) @@ -18,7 +9,3 @@ :config (progn (add-to-list 'company-backends 'company-go))) - - -(provide 'setup-go) -;;; setup-go.el ends here diff --git a/lisp/setup-helm.el b/lisp/setup-helm.el index ae6832e..e84c507 100644 --- a/lisp/setup-helm.el +++ b/lisp/setup-helm.el @@ -1,12 +1,3 @@ -;;; setup-helm --- Setup helm - -;;; Commentary: - -;; Set up helm and related packages - -;;; Code: - - ;;; Helm: incremental completion and selection narrowing framework (use-package helm :ensure t @@ -101,7 +92,3 @@ (use-package helm-pass :ensure t) - - -(provide 'setup-helm) -;;; setup-helm.el ends here diff --git a/lisp/setup-keys.el b/lisp/setup-keys.el index 4be65b1..b0304c5 100644 --- a/lisp/setup-keys.el +++ b/lisp/setup-keys.el @@ -1,12 +1,3 @@ -;;; setup-keys --- Setup keys - -;;; Commentary: - -;; Setup keybindings to my liking - -;;; Code: - - ;;; Evil (extensible vi layer) (use-package evil :ensure t @@ -95,7 +86,3 @@ (global-set-key (kbd "") (lambda () (interactive) (switch-to-buffer "*scratch*"))) - - -(provide 'setup-keys) -;;; setup-keys.el ends here diff --git a/lisp/setup-lisp.el b/lisp/setup-lisp.el index 1752de4..04b186b 100644 --- a/lisp/setup-lisp.el +++ b/lisp/setup-lisp.el @@ -1,12 +1,3 @@ -;;; setup-lisp --- Setup lisp-related packages - -;;; Commentary: - -;; This sets up lisp-related packages, regardless of dialect - -;;; Code: - - (use-package elisp-slime-nav :ensure t :config @@ -42,7 +33,3 @@ (use-package common-lisp-snippets :ensure t :after yasnippet) - - -(provide 'setup-lisp) -;;; setup-lisp.el ends here diff --git a/lisp/setup-org.el b/lisp/setup-org.el index fc30373..99087ea 100644 --- a/lisp/setup-org.el +++ b/lisp/setup-org.el @@ -1,12 +1,3 @@ -;;; setup-org.el --- Setup Org-mode packages - -;;; Commentary: - -;; This sets up org-mode related packages - -;;; Code: - - ;;; Org mode for keeping notes, todo lists, planning, and fast ;;; documenting (use-package org @@ -49,7 +40,3 @@ :config (progn (setq org-contacts-files '("~/org/contacts.org")))) - - -(provide 'setup-org) -;;; setup-org.el ends here diff --git a/lisp/setup-packages.el b/lisp/setup-packages.el index 57b54fb..1ab010a 100644 --- a/lisp/setup-packages.el +++ b/lisp/setup-packages.el @@ -1,12 +1,3 @@ -;;; setup-packages --- Setup packages -;;; -;;; Commentary: - -;; This sets up package archives / preliminaries for later config - -;;; Code: - - (require 'package) (require 'tls) @@ -43,5 +34,3 @@ (require 'use-package) (add-to-list 'Info-directory-list "~/.local/share/info/") -;;; setup-packages.el ends here -(provide 'setup-packages) diff --git a/lisp/setup-python.el b/lisp/setup-python.el index aeb71ac..76a2d1c 100644 --- a/lisp/setup-python.el +++ b/lisp/setup-python.el @@ -1,12 +1,3 @@ -;;; setup-python --- Setup Python-related packages - -;;; Commentary: - -;; This sets up python-related packages - -;;; Code: - - (add-hook 'python-mode-hook #'lsp) @@ -19,7 +10,3 @@ :ensure t :hook (python-mode . pipenv-mode) :commands (pipenv-activate)) - - -(provide 'setup-python) -;;; setup-python.el ends here -- 2.38.4