From bbfd3f6192a8bc443c044fff3677f814b1ed0230 Mon Sep 17 00:00:00 2001 From: Jeremy Dormitzer Date: Sat, 20 Feb 2021 11:52:15 -0500 Subject: [PATCH] Don't use Chemacs --- emacs/.emacs-profile | 1 - emacs/.emacs-profiles.el | 3 --- emacs/{.emacs.modular => .emacs.d}/config/init-auth.el | 0 .../config/init-buffers.el | 0 .../config/init-completion.el | 0 .../config/init-dashboard.el | 10 +++++++++- .../config/init-defaults.el | 0 emacs/.emacs.d/config/init-dired.el | 7 +++++++ .../config/init-dotfiles.el | 0 emacs/{.emacs.modular => .emacs.d}/config/init-evil.el | 0 .../{.emacs.modular => .emacs.d}/config/init-files.el | 0 emacs/{.emacs.modular => .emacs.d}/config/init-git.el | 0 .../config/init-keybindings.el | 0 emacs/.emacs.d/config/init-profiler.el | 5 +++++ .../config/init-projects.el | 0 emacs/{.emacs.modular => .emacs.d}/config/init-ui.el | 3 +-- .../config/init-windows.el | 0 .../themes/jdormit-doom-solarized-light-theme.el | 0 emacs/{.emacs.modular => .emacs.d}/init.el | 2 ++ {emacs/.emacs.old => old-emacs}/.emacs.tiny.el | 0 {emacs/.emacs.old => old-emacs}/eshell/alias | 0 {emacs/.emacs.old => old-emacs}/init.el | 0 {emacs/.emacs.old => old-emacs}/init.el~ | 0 {emacs/.emacs.old => old-emacs}/init.org | 0 24 files changed, 24 insertions(+), 7 deletions(-) delete mode 100644 emacs/.emacs-profile delete mode 100644 emacs/.emacs-profiles.el rename emacs/{.emacs.modular => .emacs.d}/config/init-auth.el (100%) rename emacs/{.emacs.modular => .emacs.d}/config/init-buffers.el (100%) rename emacs/{.emacs.modular => .emacs.d}/config/init-completion.el (100%) rename emacs/{.emacs.modular => .emacs.d}/config/init-dashboard.el (54%) rename emacs/{.emacs.modular => .emacs.d}/config/init-defaults.el (100%) create mode 100644 emacs/.emacs.d/config/init-dired.el rename emacs/{.emacs.modular => .emacs.d}/config/init-dotfiles.el (100%) rename emacs/{.emacs.modular => .emacs.d}/config/init-evil.el (100%) rename emacs/{.emacs.modular => .emacs.d}/config/init-files.el (100%) rename emacs/{.emacs.modular => .emacs.d}/config/init-git.el (100%) rename emacs/{.emacs.modular => .emacs.d}/config/init-keybindings.el (100%) create mode 100644 emacs/.emacs.d/config/init-profiler.el rename emacs/{.emacs.modular => .emacs.d}/config/init-projects.el (100%) rename emacs/{.emacs.modular => .emacs.d}/config/init-ui.el (88%) rename emacs/{.emacs.modular => .emacs.d}/config/init-windows.el (100%) rename emacs/{.emacs.modular => .emacs.d}/config/themes/jdormit-doom-solarized-light-theme.el (100%) rename emacs/{.emacs.modular => .emacs.d}/init.el (96%) rename {emacs/.emacs.old => old-emacs}/.emacs.tiny.el (100%) rename {emacs/.emacs.old => old-emacs}/eshell/alias (100%) rename {emacs/.emacs.old => old-emacs}/init.el (100%) rename {emacs/.emacs.old => old-emacs}/init.el~ (100%) rename {emacs/.emacs.old => old-emacs}/init.org (100%) diff --git a/emacs/.emacs-profile b/emacs/.emacs-profile deleted file mode 100644 index f7c124c..0000000 --- a/emacs/.emacs-profile +++ /dev/null @@ -1 +0,0 @@ -modular \ No newline at end of file diff --git a/emacs/.emacs-profiles.el b/emacs/.emacs-profiles.el deleted file mode 100644 index c15ed94..0000000 --- a/emacs/.emacs-profiles.el +++ /dev/null @@ -1,3 +0,0 @@ -(("modular" . ((user-emacs-directory . "~/.emacs.modular"))) - ("old" . ((user-emacs-directory . "~/.emacs.old"))) - ("doom" . ((user-emacs-directory . "~/doom-emacs")))) diff --git a/emacs/.emacs.modular/config/init-auth.el b/emacs/.emacs.d/config/init-auth.el similarity index 100% rename from emacs/.emacs.modular/config/init-auth.el rename to emacs/.emacs.d/config/init-auth.el diff --git a/emacs/.emacs.modular/config/init-buffers.el b/emacs/.emacs.d/config/init-buffers.el similarity index 100% rename from emacs/.emacs.modular/config/init-buffers.el rename to emacs/.emacs.d/config/init-buffers.el diff --git a/emacs/.emacs.modular/config/init-completion.el b/emacs/.emacs.d/config/init-completion.el similarity index 100% rename from emacs/.emacs.modular/config/init-completion.el rename to emacs/.emacs.d/config/init-completion.el diff --git a/emacs/.emacs.modular/config/init-dashboard.el b/emacs/.emacs.d/config/init-dashboard.el similarity index 54% rename from emacs/.emacs.modular/config/init-dashboard.el rename to emacs/.emacs.d/config/init-dashboard.el index ccdf2a7..4265600 100644 --- a/emacs/.emacs.modular/config/init-dashboard.el +++ b/emacs/.emacs.d/config/init-dashboard.el @@ -2,6 +2,8 @@ (use-package dashboard :demand t :config + (when (file-exists-p (expand-file-name "~/Sync/pictures/hallows.png")) + (setq dashboard-startup-banner (expand-file-name "~/Sync/pictures/hallows.png"))) (dashboard-setup-startup-hook) :general ('normal dashboard-mode-map @@ -13,7 +15,13 @@ "gr" #'dashboard-refresh-buffer "q" #'quit-window "r" #'dashboard-jump-to-recent-files + "p" #'dashboard-jump-to-projects "{" #'dashboard-previous-section - "}" #'dashboard-next-section)) + "}" #'dashboard-next-section) + :custom + (dashboard-items '((recents . 5) (projects . 5))) + (dashboard-set-heading-icons t) + (dashboard-set-file-icons t) + (dashboard-set-navigator t)) (provide 'init-dashboard) diff --git a/emacs/.emacs.modular/config/init-defaults.el b/emacs/.emacs.d/config/init-defaults.el similarity index 100% rename from emacs/.emacs.modular/config/init-defaults.el rename to emacs/.emacs.d/config/init-defaults.el diff --git a/emacs/.emacs.d/config/init-dired.el b/emacs/.emacs.d/config/init-dired.el new file mode 100644 index 0000000..949b2c9 --- /dev/null +++ b/emacs/.emacs.d/config/init-dired.el @@ -0,0 +1,7 @@ +;; Make Dired even better +(use-package dired + :straight (:type built-in) + :config + (evil-collection-dired-setup)) + +(provide 'init-dired) diff --git a/emacs/.emacs.modular/config/init-dotfiles.el b/emacs/.emacs.d/config/init-dotfiles.el similarity index 100% rename from emacs/.emacs.modular/config/init-dotfiles.el rename to emacs/.emacs.d/config/init-dotfiles.el diff --git a/emacs/.emacs.modular/config/init-evil.el b/emacs/.emacs.d/config/init-evil.el similarity index 100% rename from emacs/.emacs.modular/config/init-evil.el rename to emacs/.emacs.d/config/init-evil.el diff --git a/emacs/.emacs.modular/config/init-files.el b/emacs/.emacs.d/config/init-files.el similarity index 100% rename from emacs/.emacs.modular/config/init-files.el rename to emacs/.emacs.d/config/init-files.el diff --git a/emacs/.emacs.modular/config/init-git.el b/emacs/.emacs.d/config/init-git.el similarity index 100% rename from emacs/.emacs.modular/config/init-git.el rename to emacs/.emacs.d/config/init-git.el diff --git a/emacs/.emacs.modular/config/init-keybindings.el b/emacs/.emacs.d/config/init-keybindings.el similarity index 100% rename from emacs/.emacs.modular/config/init-keybindings.el rename to emacs/.emacs.d/config/init-keybindings.el diff --git a/emacs/.emacs.d/config/init-profiler.el b/emacs/.emacs.d/config/init-profiler.el new file mode 100644 index 0000000..ce02a80 --- /dev/null +++ b/emacs/.emacs.d/config/init-profiler.el @@ -0,0 +1,5 @@ +;; Profiling startup time +(use-package esup + :commands esup) + +(provide 'init-profiler) diff --git a/emacs/.emacs.modular/config/init-projects.el b/emacs/.emacs.d/config/init-projects.el similarity index 100% rename from emacs/.emacs.modular/config/init-projects.el rename to emacs/.emacs.d/config/init-projects.el diff --git a/emacs/.emacs.modular/config/init-ui.el b/emacs/.emacs.d/config/init-ui.el similarity index 88% rename from emacs/.emacs.modular/config/init-ui.el rename to emacs/.emacs.d/config/init-ui.el index b0dcb1d..0e4fae8 100644 --- a/emacs/.emacs.modular/config/init-ui.el +++ b/emacs/.emacs.d/config/init-ui.el @@ -1,5 +1,4 @@ -;; Much-needed user interface improvements - +;; Don't show ugly graphical UI elements (when (window-system) (tool-bar-mode -1) (scroll-bar-mode -1) diff --git a/emacs/.emacs.modular/config/init-windows.el b/emacs/.emacs.d/config/init-windows.el similarity index 100% rename from emacs/.emacs.modular/config/init-windows.el rename to emacs/.emacs.d/config/init-windows.el diff --git a/emacs/.emacs.modular/config/themes/jdormit-doom-solarized-light-theme.el b/emacs/.emacs.d/config/themes/jdormit-doom-solarized-light-theme.el similarity index 100% rename from emacs/.emacs.modular/config/themes/jdormit-doom-solarized-light-theme.el rename to emacs/.emacs.d/config/themes/jdormit-doom-solarized-light-theme.el diff --git a/emacs/.emacs.modular/init.el b/emacs/.emacs.d/init.el similarity index 96% rename from emacs/.emacs.modular/init.el rename to emacs/.emacs.d/init.el index 69f6517..ff36522 100644 --- a/emacs/.emacs.modular/init.el +++ b/emacs/.emacs.d/init.el @@ -28,11 +28,13 @@ (require 'init-evil) (require 'init-keybindings) (require 'init-auth) +(require 'init-profiler) (require 'init-dashboard) (require 'init-dotfiles) (require 'init-buffers) (require 'init-files) (require 'init-windows) +(require 'init-dired) (require 'init-completion) (require 'init-ui) (require 'init-projects) diff --git a/emacs/.emacs.old/.emacs.tiny.el b/old-emacs/.emacs.tiny.el similarity index 100% rename from emacs/.emacs.old/.emacs.tiny.el rename to old-emacs/.emacs.tiny.el diff --git a/emacs/.emacs.old/eshell/alias b/old-emacs/eshell/alias similarity index 100% rename from emacs/.emacs.old/eshell/alias rename to old-emacs/eshell/alias diff --git a/emacs/.emacs.old/init.el b/old-emacs/init.el similarity index 100% rename from emacs/.emacs.old/init.el rename to old-emacs/init.el diff --git a/emacs/.emacs.old/init.el~ b/old-emacs/init.el~ similarity index 100% rename from emacs/.emacs.old/init.el~ rename to old-emacs/init.el~ diff --git a/emacs/.emacs.old/init.org b/old-emacs/init.org similarity index 100% rename from emacs/.emacs.old/init.org rename to old-emacs/init.org