diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 11d89c5..22d121a 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -69,7 +69,7 @@ Otherwise the startup will be very slow. " (require 'init-bookmark) (require 'init-dashboard) -;;(require 'init-dired) +(require 'init-dired) ;;(require 'init-highlight) ;;(require 'init-ibuffer) ;;(require 'init-persp) diff --git a/.config/emacs/lisp/init-dired.el b/.config/emacs/lisp/init-dired.el index a7916b5..2bb2d8b 100644 --- a/.config/emacs/lisp/init-dired.el +++ b/.config/emacs/lisp/init-dired.el @@ -5,9 +5,12 @@ ;; Directory operations (use-package dired :ensure nil ; built-in + :hook (dired-mode . dired-omit-mode) :general (:keymaps 'dired-mode-map - "C-c C-p" 'wdired-change-to-wdired-mode) + "C-c C-p" 'wdired-change-to-wdired-mode + "C-c C-r" 'dired-rsync) + :custom (dired-omit-files (rx (seq bol "."))) :config ;; Guess a default target directory (setq dired-dwim-target t) @@ -17,7 +20,13 @@ dired-recursive-copies 'always) ;; Show directory first - (setq dired-listing-switches "-alh --group-directories-first")) + (setq dired-listing-switches "-alh --group-directories-first") + (evil-collection-define-key 'normal 'dired-mode-map + "." 'dired-omit-mode + "h" 'dired-single-up-directory + "l" 'dired-single-buffer + ")" 'dired-git-info-mode + "s" 'hydra-dired-quick-sort/body)) ;; Quick sort dired buffers via hydra (use-package dired-quick-sort @@ -26,10 +35,7 @@ :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 - "s" 'hydra-dired-quick-sort/body)) + (setq dired-quick-sort-suppress-setup-warning t)) ;; Show git info in dired (use-package dired-git-info @@ -41,15 +47,12 @@ (use-package dired-rsync :straight t :ensure t - :defer t - :bind (:map dired-mode-map - ("C-c C-r" . dired-rsync))) + :defer t) ;; Colorful dired (use-package diredfl :straight t :ensure t - :defer t :hook (dired-mode . diredfl-mode)) ;; Shows icons @@ -63,23 +66,22 @@ :hook (dired-mode . nerd-icons-dired-mode)) ;; Extra Dired functionality -(use-package dired-aux :ensure nil) +(use-package dired-aux ; built-in package + :ensure nil) (use-package dired-single + :straight t + :ensure t + :defer t :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 + :straight t + :ensure t + :defer t)) (provide 'init-dired) ;;; init-dired.el ends here diff --git a/.config/emacs/lisp/init-edit.el b/.config/emacs/lisp/init-edit.el index b593b54..6951a73 100644 --- a/.config/emacs/lisp/init-edit.el +++ b/.config/emacs/lisp/init-edit.el @@ -53,7 +53,7 @@ :diminish hs-minor-mode :pretty-hydra ((:title (pretty-hydra-title "HideShow" 'octicon "nf-oct-fold") - :color amaranth :quit-key ("q" "C-g")) + :color amaranth :quit-key ("q" "C-g")) ("Fold" (("t" hs-toggle-all "toggle all") ("a" hs-show-all "show all") diff --git a/.config/emacs/lisp/init-general.el b/.config/emacs/lisp/init-general.el index 5b42c38..87362f6 100644 --- a/.config/emacs/lisp/init-general.el +++ b/.config/emacs/lisp/init-general.el @@ -11,7 +11,7 @@ (global-set-key (kbd "C-=") 'text-scale-increase) (global-set-key (kbd "C--") 'text-scale-decrease) -; TODO move to hideshow + ; TODO move to hideshow (global-set-key (kbd "C-") 'hs-toggle-hiding) ;; When you begin a keybind, whichkey will show you all keybinds you can follow the first one with in order to form a full keywords. diff --git a/.config/emacs/lisp/init-ui.el b/.config/emacs/lisp/init-ui.el index 7da6178..a3904d7 100644 --- a/.config/emacs/lisp/init-ui.el +++ b/.config/emacs/lisp/init-ui.el @@ -46,14 +46,16 @@ doom-modeline-persp-icon t doom-modeline-display-default-persp-name t doom-modeline-indent-info t)) -;;(use-package hide-mode-line -;; :hook (((completion-list-mode -;; completion-in-region-mode -;; eshell-mode shell-mode -;; term-mode vterm-mode -;; treemacs-mode -;; lsp-ui-imenu-mode -;; pdf-annot-list-mode) . hide-mode-line-mode))) +(use-package hide-mode-line + :straight t + :ensure t + :hook (((completion-list-mode + completion-in-region-mode + eshell-mode shell-mode + term-mode vterm-mode + treemacs-mode + lsp-ui-imenu-mode + pdf-annot-list-mode) . hide-mode-line-mode))) ;; A minor-mode menu for mode-line (use-package minions @@ -110,12 +112,12 @@ ;; Good pixel line scrolling (if (fboundp 'pixel-scroll-precision-mode) (pixel-scroll-precision-mode t) - (use-package good-scroll - :straight t - :ensure t - :hook (after-init . good-scroll-mode) - :bind (([remap next] . good-scroll-up-full-screen) - ([remap prior] . good-scroll-down-full-screen)))) + (use-package good-scroll + :straight t + :ensure t + :hook (after-init . good-scroll-mode) + :bind (([remap next] . good-scroll-up-full-screen) + ([remap prior] . good-scroll-down-full-screen)))) ;; Smooth scrolling over images (use-package iscroll @@ -141,9 +143,6 @@ (set-fontset-font "fontset-default" (cons page-break-lines-char page-break-lines-char) (face-attribute 'default :family))) -(use-package form-feed - :disabled - :hook (after-init . global-form-feed-mode)) ;; emoji (use-package emojify diff --git a/.config/emacs/lisp/init-vertico.el b/.config/emacs/lisp/init-vertico.el index fff7c7b..8025ec9 100644 --- a/.config/emacs/lisp/init-vertico.el +++ b/.config/emacs/lisp/init-vertico.el @@ -16,15 +16,14 @@ :ensure t :hook (vertico-mode . nerd-icons-completion-mode)) -(when (display-graphic-p) - (use-package vertico-posframe - :straight t - :ensure t - :when custom-vertico-posframe - :after vertico - :hook (vertico-mode . vertico-posframe-mode) - :config - (setq vertico-posframe-border-width 5))) +(use-package vertico-posframe + :straight t + :ensure t + :when (and custom-vertico-posframe 'display-graphic-p) + :after vertico + :hook (vertico-mode . vertico-posframe-mode) + :config + (setq vertico-posframe-border-width 5)) ;; (setq vertico-posframe-parameters ;; '((left-fringe . 20) ;; (right-fringe . 20))))) @@ -168,13 +167,6 @@ (t ,(nerd-icons-codicon "nf-cod-code") :face font-lock-warning-face))))) -(use-package corfu-terminal - :straight t - :ensure t - :config - (unless (display-graphic-p) - (corfu-terminal-mode))) - ;;; Cape ;; Setup Cape for better completion-at-point support and more (use-package cape