From b1c8ba04218b9908fe8c7b9e645faaa214919d38 Mon Sep 17 00:00:00 2001 From: JaeYoo-Im Date: Tue, 3 Sep 2024 19:57:10 +0900 Subject: [PATCH] emacs : use-package to straight, bookmark gpt dashboard dired --- .config/emacs/init.el | 6 +- .config/emacs/lisp/init-bookmark.el | 2 +- .config/emacs/lisp/init-chatgpt.el | 6 ++ .config/emacs/lisp/init-dashboard.el | 2 + .config/emacs/lisp/init-dired.el | 106 +++++++++++++++------------ .config/emacs/lisp/init-package.el | 18 ++++- 6 files changed, 89 insertions(+), 51 deletions(-) diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 8f4fc54..11d89c5 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -67,8 +67,8 @@ Otherwise the startup will be very slow. " (require 'init-yasnippet) -;;(require 'init-bookmark) -;;(require 'init-dashboard) +(require 'init-bookmark) +(require 'init-dashboard) ;;(require 'init-dired) ;;(require 'init-highlight) ;;(require 'init-ibuffer) @@ -113,7 +113,7 @@ Otherwise the startup will be very slow. " ;;(require 'init-debug) ;; ;;(require 'init-extra) -;;(require 'init-chatgpt) +(require 'init-chatgpt) ;; ;;(require 'init-copilot) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/.config/emacs/lisp/init-bookmark.el b/.config/emacs/lisp/init-bookmark.el index 8c9d83b..e2bc4c9 100644 --- a/.config/emacs/lisp/init-bookmark.el +++ b/.config/emacs/lisp/init-bookmark.el @@ -1,7 +1,7 @@ ;;; init-bookmark.el -*- lexical-binding: t -*- ;; Bookmark (use-package bookmark - :ensure nil + :ensure nil ; emacs built-in :config (with-no-warnings ;; Display icons for bookmarks diff --git a/.config/emacs/lisp/init-chatgpt.el b/.config/emacs/lisp/init-chatgpt.el index 2197527..9ca964d 100644 --- a/.config/emacs/lisp/init-chatgpt.el +++ b/.config/emacs/lisp/init-chatgpt.el @@ -1,8 +1,14 @@ ;; init-chatgpt.el -*- lexical-binding: t -*- (use-package chatgpt-shell + :straight t + :ensure t + :defer t :config (setq chatgpt-shell-openai-key custom-chatgpt-my-key)) (use-package dall-e-shell + :straight t + :ensure t + :defer t :config (setq dall-e-shell-openai-key custom-chatgpt-my-key)) diff --git a/.config/emacs/lisp/init-dashboard.el b/.config/emacs/lisp/init-dashboard.el index 4792c98..88b6622 100644 --- a/.config/emacs/lisp/init-dashboard.el +++ b/.config/emacs/lisp/init-dashboard.el @@ -2,6 +2,8 @@ (require 'init-funcs) (use-package dashboard + :straight t + :ensure t :diminish dashboard-mode :functions (nerd-icons-faicon nerd-icons-mdicon diff --git a/.config/emacs/lisp/init-dired.el b/.config/emacs/lisp/init-dired.el index 133e261..a7916b5 100644 --- a/.config/emacs/lisp/init-dired.el +++ b/.config/emacs/lisp/init-dired.el @@ -4,7 +4,7 @@ ;; Directory operations (use-package dired - :ensure nil + :ensure nil ; built-in :general (:keymaps 'dired-mode-map "C-c C-p" 'wdired-change-to-wdired-mode) @@ -17,55 +17,69 @@ dired-recursive-copies 'always) ;; Show directory first - (setq dired-listing-switches "-alh --group-directories-first") + (setq dired-listing-switches "-alh --group-directories-first")) - ;; Quick sort dired buffers via hydra - (use-package dired-quick-sort - :hook (after-init . dired-quick-sort-setup) - :init - (setq dired-quick-sort-suppress-setup-warning t) - :config - (evil-collection-define-key 'normal 'dired-mode-map - "s" 'hydra-dired-quick-sort/body)) - - ;; Show git info in dired - (use-package dired-git-info) - - ;; Allow rsync from dired buffers - (use-package dired-rsync - :bind (:map dired-mode-map - ("C-c C-r" . dired-rsync))) - - ;; Colorful dired - (use-package diredfl - :hook (dired-mode . diredfl-mode)) - - ;; Shows icons - (use-package nerd-icons-dired - :diminish - :commands nerd-icons-dired-mode - :custom-face - (nerd-icons-dired-dir-face ((t (:inherit nerd-icons-dsilver :foreground unspecified)))) - :hook (dired-mode . nerd-icons-dired-mode)) - - ;; Extra Dired functionality - (use-package dired-aux :ensure nil) - - (use-package dired-single - :commands (dired dired-jump)) - (use-package dired-hide-dotfiles - :hook (dired-mode) ;; hide default when dired-mode enabled. - :config - (evil-collection-define-key 'normal 'dired-mode-map - "H" 'dired-hide-dotfiles-mode)) +;; Quick sort dired buffers via hydra +(use-package dired-quick-sort + :straight t + :ensure t + :defer t + :hook (after-init . dired-quick-sort-setup) + :init + (setq dired-quick-sort-suppress-setup-warning t) + :config (evil-collection-define-key 'normal 'dired-mode-map - "h" 'dired-single-up-directory - "l" 'dired-single-buffer - ")" 'dired-git-info-mode)) + "s" 'hydra-dired-quick-sort/body)) + +;; Show git info in dired +(use-package dired-git-info + :straight t + :ensure t + :defer t) + +;; Allow rsync from dired buffers +(use-package dired-rsync + :straight t + :ensure t + :defer t + :bind (:map dired-mode-map + ("C-c C-r" . dired-rsync))) + +;; Colorful dired +(use-package diredfl + :straight t + :ensure t + :defer t + :hook (dired-mode . diredfl-mode)) + +;; Shows icons +(use-package nerd-icons-dired + :straight t + :ensure t + :diminish + :commands nerd-icons-dired-mode + :custom-face + (nerd-icons-dired-dir-face ((t (:inherit nerd-icons-dsilver :foreground unspecified)))) + :hook (dired-mode . nerd-icons-dired-mode)) + +;; Extra Dired functionality +(use-package dired-aux :ensure nil) + +(use-package dired-single + :commands (dired dired-jump)) +(use-package dired-hide-dotfiles + :hook (dired-mode) ;; hide default when dired-mode enabled. + :config + (evil-collection-define-key 'normal 'dired-mode-map + "H" 'dired-hide-dotfiles-mode)) +(evil-collection-define-key 'normal 'dired-mode-map + "h" 'dired-single-up-directory + "l" 'dired-single-buffer + ")" 'dired-git-info-mode) ;; `find-dired' alternative using `fd' -(when (executable-find "fd") - (use-package fd-dired)) +;; (when (executable-find "fd") +;; (use-package fd-dired)) (provide 'init-dired) ;;; init-dired.el ends here diff --git a/.config/emacs/lisp/init-package.el b/.config/emacs/lisp/init-package.el index 1384554..f6de26f 100644 --- a/.config/emacs/lisp/init-package.el +++ b/.config/emacs/lisp/init-package.el @@ -8,6 +8,21 @@ (and (file-readable-p custom-file) (load custom-file)) + +; (when (version< emacs-version "28") +; (add-to-list 'package-archives '("nongnu" . "https://elpa.nongnu.org/nongnu/"))) +; (add-to-list 'package-archives '("stable" . "https://stable.melpa.org/packages/")) +; (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/")) + +; (customize-set-variable 'package-archive-priorities +; '(("gnu" . 99) ; prefer GNU packages +; ("nongnu" . 80) ; use non-gnu packages if +; ; not found in GNU elpa +; ("stable" . 70) ; prefer "released" versions +; ; from melpa +; ("melpa" . 0))) ; if all else fails, get it +; ; from melpa + (defvar bootstrap-version) (let ((bootstrap-file (expand-file-name @@ -29,7 +44,8 @@ ; hide info in modeline (use-package diminish - :straight t) + :straight t + :ensure t) (provide 'init-package) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;