diff --git a/.config/fish/config.fish b/.config/fish/config.fish index c5eab11..e032e67 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -5,7 +5,6 @@ # |____/ |_| # # My fish config. Not much to see here. Some pretty standard stuff. -set -U fish_user_paths $fish_user_paths $HOME/.local/bin/ set fish_greeting # Supresses fish's intro message set TERM "xterm-256color" # Sets the terminal type set EDITOR "emacsclient -t -a ''" # $EDITOR use Emacs in terminal diff --git a/.doom.d/config.el b/.doom.d/config.el index 6c5a107..d85ed2d 100644 --- a/.doom.d/config.el +++ b/.doom.d/config.el @@ -34,9 +34,24 @@ :leader :desc "Dired view file" "d v" #'dired-view-file))) -(evil-define-key 'normal peep-dired-mode-map (kbd "j") 'peep-dired-next-file - (kbd "k") 'peep-dired-prev-file) +;; Make 'h' and 'l' go back and forward in dired. Much faster to navigate the directory structure! +(evil-define-key 'normal dired-mode-map + (kbd "h") 'dired-up-directory + (kbd "l") 'dired-open-file) ; use dired-find-file instead if not using dired-open package +;; If peep-dired is enabled, you will get image previews as you go up/down with 'j' and 'k' +(evil-define-key 'normal peep-dired-mode-map + (kbd "j") 'peep-dired-next-file + (kbd "k") 'peep-dired-prev-file) (add-hook 'peep-dired-hook 'evil-normalize-keymaps) +;; Get file icons in dired +(add-hook 'dired-mode-hook 'all-the-icons-dired-mode) +;; With dired-open plugin, you can launch external programs for certain extensions +;; For example, I set all .png files to open in 'sxiv' and all .mp4 files to open in 'mpv' +(setq dired-open-extensions '(("gif" . "sxiv") + ("jpg" . "sxiv") + ("png" . "sxiv") + ("mkv" . "mpv") + ("mp4" . "mpv"))) (setq doom-theme 'doom-one) (map! :leader diff --git a/.doom.d/config.org b/.doom.d/config.org index f500247..4311945 100644 --- a/.doom.d/config.org +++ b/.doom.d/config.org @@ -78,14 +78,16 @@ To use tabs in Doom Emacs, be sure to uncomment "tabs" in Doom's init.el. Displ * DIRED Dired is the file manager within Emacs. Below, I setup keybindings for image previews (peep-dired). Doom Emacs does not use 'SPC d' for any of its keybindings, so I've chosen the format of 'SPC d' plus 'key'. -| COMMAND | DESCRIPTION | KEYBINDING | -|-------------------------------------------+--------------------------------------------+------------| -| dired | /Open dired file manager/ | SPC d d | -| dired-jump | /Jump to current directory in dired/ | SPC d j | -| (in dired) peep-dired | /Toggle image previews within dired/ | SPC d p | -| (in dired) dired-view-file | /View file in dired/ | SPC d v | -| (in peep-dired-mode) peep-dired-next-file | /Move to next file in peep-dired-mode/ | j | -| (in peep-dired-mode) peep-dired-prev-file | /Move to previous file in peep-dired-mode/ | k | +| COMMAND | DESCRIPTION | KEYBINDING | +|-------------------------------------------+-------------------------------------------------+------------| +| dired | /Open dired file manager/ | SPC d d | +| dired-jump | /Jump to current directory in dired/ | SPC d j | +| (in dired) peep-dired | /Toggle image previews within dired/ | SPC d p | +| (in dired) dired-view-file | /View file in dired/ | SPC d v | +| (in dired) dired-up-directory | Go up in the directory tree | h | +| (in dired) dired-find-file | Go down in the directory tree (or open if file) | l | +| (in peep-dired-mode) peep-dired-next-file | /Move to next file in peep-dired-mode/ | j | +| (in peep-dired-mode) peep-dired-prev-file | /Move to previous file in peep-dired-mode/ | k | #+BEGIN_SRC emacs-lisp (map! :leader @@ -102,9 +104,24 @@ Dired is the file manager within Emacs. Below, I setup keybindings for image pr :leader :desc "Dired view file" "d v" #'dired-view-file))) -(evil-define-key 'normal peep-dired-mode-map (kbd "j") 'peep-dired-next-file - (kbd "k") 'peep-dired-prev-file) +;; Make 'h' and 'l' go back and forward in dired. Much faster to navigate the directory structure! +(evil-define-key 'normal dired-mode-map + (kbd "h") 'dired-up-directory + (kbd "l") 'dired-open-file) ; use dired-find-file instead if not using dired-open package +;; If peep-dired is enabled, you will get image previews as you go up/down with 'j' and 'k' +(evil-define-key 'normal peep-dired-mode-map + (kbd "j") 'peep-dired-next-file + (kbd "k") 'peep-dired-prev-file) (add-hook 'peep-dired-hook 'evil-normalize-keymaps) +;; Get file icons in dired +(add-hook 'dired-mode-hook 'all-the-icons-dired-mode) +;; With dired-open plugin, you can launch external programs for certain extensions +;; For example, I set all .png files to open in 'sxiv' and all .mp4 files to open in 'mpv' +(setq dired-open-extensions '(("gif" . "sxiv") + ("jpg" . "sxiv") + ("png" . "sxiv") + ("mkv" . "mpv") + ("mp4" . "mpv"))) #+END_SRC * DOOM THEME diff --git a/.doom.d/packages.el b/.doom.d/packages.el index 52f9a0d..5fef768 100644 --- a/.doom.d/packages.el +++ b/.doom.d/packages.el @@ -48,6 +48,8 @@ ;(unpin! pinned-package another-pinned-package) ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) ;(unpin! t) +(package! all-the-icons-dired) +(package! dired-open) (package! dmenu) (package! elfeed) (package! emms)