[emacs] Bring back proper dirvish again and clean up epkgs
This commit is contained in:
parent
979b1f114a
commit
80e79dc2bf
|
@ -169,7 +169,7 @@ in
|
||||||
pkgs.gitAndTools.lab
|
pkgs.gitAndTools.lab
|
||||||
pkgs.gimp
|
pkgs.gimp
|
||||||
pkgs.wally-cli
|
pkgs.wally-cli
|
||||||
pkgs.poppler_utils
|
# pkgs.poppler_utils
|
||||||
pkgs.python3Minimal
|
pkgs.python3Minimal
|
||||||
pkgs.python38Packages.pdftotext
|
pkgs.python38Packages.pdftotext
|
||||||
pkgs.w3m
|
pkgs.w3m
|
||||||
|
@ -254,6 +254,8 @@ in
|
||||||
pkgs.isync
|
pkgs.isync
|
||||||
pkgs.j4-dmenu-desktop
|
pkgs.j4-dmenu-desktop
|
||||||
pkgs.jq
|
pkgs.jq
|
||||||
|
pkgs.mediainfo
|
||||||
|
pkgs.poppler
|
||||||
pkgs.kanshi
|
pkgs.kanshi
|
||||||
pkgs.ledger
|
pkgs.ledger
|
||||||
pkgs.libnotify
|
pkgs.libnotify
|
||||||
|
@ -682,10 +684,12 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.emacs29-pgtk;
|
package = pkgs.emacs29-pgtk;
|
||||||
extraPackages = epkgs: [
|
extraPackages = epkgs: [
|
||||||
#epkgs.sqlite3
|
|
||||||
epkgs.zoxide
|
epkgs.zoxide
|
||||||
epkgs.vterm
|
epkgs.vterm
|
||||||
epkgs.pdf-tools
|
epkgs.pdf-tools
|
||||||
|
epkgs.vscode-icon
|
||||||
|
epkgs.mingus
|
||||||
|
epkgs.spacious-padding
|
||||||
epkgs.org-pdftools
|
epkgs.org-pdftools
|
||||||
epkgs.org-super-agenda
|
epkgs.org-super-agenda
|
||||||
epkgs.org-mru-clock
|
epkgs.org-mru-clock
|
||||||
|
@ -696,22 +700,10 @@ in
|
||||||
epkgs.ef-themes
|
epkgs.ef-themes
|
||||||
epkgs.literate-calc-mode
|
epkgs.literate-calc-mode
|
||||||
epkgs.dwim-shell-command
|
epkgs.dwim-shell-command
|
||||||
epkgs.consult-org-roam
|
|
||||||
epkgs.obsidian
|
epkgs.obsidian
|
||||||
epkgs.scad-mode
|
|
||||||
# epkgs.dirvish
|
|
||||||
epkgs.dirvish
|
|
||||||
epkgs.dired-rifle
|
|
||||||
epkgs.dired-rainbow
|
|
||||||
epkgs.dired-sidebar
|
|
||||||
epkgs.dired-subtree
|
|
||||||
epkgs.dired-preview
|
|
||||||
epkgs.dired-narrow
|
|
||||||
epkgs.dired-quick-sort
|
|
||||||
epkgs.dired-ranger
|
|
||||||
epkgs.nerd-icons-dired
|
epkgs.nerd-icons-dired
|
||||||
epkgs.treemacs-icons-dired
|
epkgs.scad-mode
|
||||||
epkgs.all-the-icons-dired
|
epkgs.dirvish
|
||||||
epkgs.zoxide
|
epkgs.zoxide
|
||||||
epkgs.dictcc
|
epkgs.dictcc
|
||||||
epkgs.toml-mode
|
epkgs.toml-mode
|
||||||
|
|
|
@ -32,7 +32,6 @@
|
||||||
doom-dashboard-ascii-banner-fn #'bascht/doom-dashboard-calvin
|
doom-dashboard-ascii-banner-fn #'bascht/doom-dashboard-calvin
|
||||||
frame-title-format (concat "%b - " user-login-name "@" (system-name))
|
frame-title-format (concat "%b - " user-login-name "@" (system-name))
|
||||||
browse-url-browser-function 'browse-url-xdg-open browse-url-generic-program "browser"
|
browse-url-browser-function 'browse-url-xdg-open browse-url-generic-program "browser"
|
||||||
dired-async-mode t
|
|
||||||
hl-todo-keyword-faces
|
hl-todo-keyword-faces
|
||||||
`(("TODO" warning bold)
|
`(("TODO" warning bold)
|
||||||
("FIXME" error bold)
|
("FIXME" error bold)
|
||||||
|
@ -404,46 +403,15 @@
|
||||||
|
|
||||||
(add-hook! markdown-mode-hook 'spell-fu-mode)
|
(add-hook! markdown-mode-hook 'spell-fu-mode)
|
||||||
|
|
||||||
(use-package! dired-preview)
|
(after! dirvish
|
||||||
(use-package! dirvish
|
|
||||||
:config
|
|
||||||
(evil-make-overriding-map dirvish-mode-map 'normal)
|
|
||||||
(dirvish-override-dired-mode)
|
|
||||||
(dirvish-peek-mode)
|
|
||||||
(dirvish-side-follow-mode)
|
|
||||||
|
|
||||||
(setq dirvish-mode-line-format '(:left (sort symlink) :right (omit yank index)))
|
|
||||||
(setq dirvish-attributes '(vc-state subtree-state all-the-icons collapse git-msg file-time file-size))
|
(setq dirvish-attributes '(vc-state subtree-state all-the-icons collapse git-msg file-time file-size))
|
||||||
(setq delete-by-moving-to-trash t)
|
|
||||||
(setq dired-listing-switches "-l --almost-all --human-readable --group-directories-first --no-group")
|
(setq dired-listing-switches "-l --almost-all --human-readable --group-directories-first --no-group")
|
||||||
|
(setq dirvish-hide-details t))
|
||||||
|
|
||||||
:bind ; Bind `dirvish|dirvish-side|dirvish-dwim' as you see fit
|
(map! :after dired
|
||||||
(("C-c f" . dirvish-fd)
|
:map dirvish-mode-map
|
||||||
:map dirvish-mode-map ; Dirvish inherits `dired-mode-map'
|
:n "h" #'dired-up-directory
|
||||||
("a" . dirvish-quick-access)
|
:n "l" #'dired-find-file)
|
||||||
("f" . dirvish-file-info-menu)
|
|
||||||
("y" . dirvish-yank-menu)
|
|
||||||
("N" . dirvish-narrow)
|
|
||||||
("^" . dirvish-history-last)
|
|
||||||
("h" . dired-up-directory)
|
|
||||||
("l" . dired-find-file)
|
|
||||||
("s" . dirvish-quicksort) ; remapped `dired-sort-toggle-or-edit'
|
|
||||||
("v" . dirvish-vc-menu) ; remapped `dired-view-file'
|
|
||||||
("TAB" . dirvish-subtree-toggle)
|
|
||||||
("gg" . beginning-of-buffer)
|
|
||||||
("gu" . dired-up-directory)
|
|
||||||
("md" . dwim-shell-command-drag)
|
|
||||||
("mo" . dwim-shell-command-drop)
|
|
||||||
("G" . end-of-buffer)
|
|
||||||
("M-f" . dirvish-history-go-forward)
|
|
||||||
("M-b" . dirvish-history-go-backward)
|
|
||||||
("M-l" . dirvish-ls-switches-menu)
|
|
||||||
("M-m" . dirvish-mark-menu)
|
|
||||||
("M-t" . dirvish-layout-toggle)
|
|
||||||
("M-s" . dirvish-setup-menu)
|
|
||||||
("M-e" . dirvish-emerge-menu)
|
|
||||||
("M-j" . dirvish-fd-jump))
|
|
||||||
)
|
|
||||||
|
|
||||||
(defun bascht/dirvish-tdir()
|
(defun bascht/dirvish-tdir()
|
||||||
(interactive)
|
(interactive)
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
snippets ; my elves. They type so I don't have to
|
snippets ; my elves. They type so I don't have to
|
||||||
|
|
||||||
:emacs
|
:emacs
|
||||||
(dired) ; making dired pretty [functional]
|
(dired +icons +bindings) ; making dired pretty [functional]
|
||||||
electric ; smarter, keyword-based electric-indent
|
electric ; smarter, keyword-based electric-indent
|
||||||
(undo +tree) ; persistent, smarter undo for your inevitable mistakes
|
(undo +tree) ; persistent, smarter undo for your inevitable mistakes
|
||||||
vc ; version-control and Emacs, sitting in a tree
|
vc ; version-control and Emacs, sitting in a tree
|
||||||
|
|
|
@ -1,27 +1,17 @@
|
||||||
;; -*- no-byte-compile: t; -*-
|
;; -*- no-byte-compile: t; -*-
|
||||||
;;; $DOOMDIR/packages.el
|
;;; $DOOMDIR/packages.el
|
||||||
|
;(package! pdf-tools :built-in 'prefer)
|
||||||
|
;; (package! dirvish :built-in 'prefer)
|
||||||
|
|
||||||
(package! pdf-tools :built-in 'prefer)
|
(package! vscode-icon :built-in 'prefer)
|
||||||
(package! emacsql-sqlite-builtin :built-in 'prefer)
|
(package! nerd-icons-dired :built-in 'prefer)
|
||||||
(package! dictcc :built-in 'prefer)
|
(package! dictcc :built-in 'prefer)
|
||||||
(package! org-caldav :built-in 'prefer)
|
(package! org-caldav :built-in 'prefer)
|
||||||
(package! dirvish :built-in 'prefer)
|
(package! khalel :built-in 'prefer)
|
||||||
(package! dired-rifle :built-in 'prefer)
|
|
||||||
(package! dired-subtree :built-in 'prefer)
|
|
||||||
(package! dired-sidebar :built-in 'prefer)
|
|
||||||
(package! dired-preview :built-in 'prefer)
|
|
||||||
(package! dired-narrow :built-in 'prefer)
|
|
||||||
(package! dired-quick-sort :built-in 'prefer)
|
|
||||||
(package! dired-ranger :built-in 'prefer)
|
|
||||||
(package! nerd-icons-dired :built-in 'prefer)
|
|
||||||
(package! treemacs-icons-dired :built-in 'prefer)
|
|
||||||
(package! all-the-icons-dired :built-in 'prefer)
|
|
||||||
|
|
||||||
|
(package! ef-themes :built-in 'prefer)
|
||||||
;; Until https://github.com/doomemacs/doomemacs/issues/7196 is fixed:
|
(package! mingus :built-in 'prefer)
|
||||||
(unpin! evil-collection)
|
(package! spacious-padding :built-in 'prefer)
|
||||||
(package! evil-collection
|
|
||||||
:recipe (:repo "emacs-evil/evil-collection" :branch "master"))
|
|
||||||
|
|
||||||
(when (string= (system-name) "apfelstrudel")
|
(when (string= (system-name) "apfelstrudel")
|
||||||
(package! protobuf-mode)
|
(package! protobuf-mode)
|
||||||
|
@ -30,4 +20,3 @@
|
||||||
(:host github :repo "shsms/ob-grpc")))
|
(:host github :repo "shsms/ob-grpc")))
|
||||||
|
|
||||||
|
|
||||||
(package! khalel)
|
|
||||||
|
|
Loading…
Reference in New Issue