diff --git a/dot_config/nixpkgs/home.nix b/dot_config/nixpkgs/home.nix index b2f371b..7c14a44 100644 --- a/dot_config/nixpkgs/home.nix +++ b/dot_config/nixpkgs/home.nix @@ -169,7 +169,7 @@ in pkgs.gitAndTools.lab pkgs.gimp pkgs.wally-cli - pkgs.poppler_utils + # pkgs.poppler_utils pkgs.python3Minimal pkgs.python38Packages.pdftotext pkgs.w3m @@ -254,6 +254,8 @@ in pkgs.isync pkgs.j4-dmenu-desktop pkgs.jq + pkgs.mediainfo + pkgs.poppler pkgs.kanshi pkgs.ledger pkgs.libnotify @@ -682,10 +684,12 @@ in enable = true; package = pkgs.emacs29-pgtk; extraPackages = epkgs: [ - #epkgs.sqlite3 epkgs.zoxide epkgs.vterm - epkgs.pdf-tools + epkgs.pdf-tools + epkgs.vscode-icon + epkgs.mingus + epkgs.spacious-padding epkgs.org-pdftools epkgs.org-super-agenda epkgs.org-mru-clock @@ -696,22 +700,10 @@ in epkgs.ef-themes epkgs.literate-calc-mode epkgs.dwim-shell-command - epkgs.consult-org-roam 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.treemacs-icons-dired - epkgs.all-the-icons-dired + epkgs.scad-mode + epkgs.dirvish epkgs.zoxide epkgs.dictcc epkgs.toml-mode diff --git a/dot_doom.d/config.el b/dot_doom.d/config.el index 5a6b7f1..2cd50b4 100644 --- a/dot_doom.d/config.el +++ b/dot_doom.d/config.el @@ -32,7 +32,6 @@ doom-dashboard-ascii-banner-fn #'bascht/doom-dashboard-calvin frame-title-format (concat "%b - " user-login-name "@" (system-name)) browse-url-browser-function 'browse-url-xdg-open browse-url-generic-program "browser" - dired-async-mode t hl-todo-keyword-faces `(("TODO" warning bold) ("FIXME" error bold) @@ -404,46 +403,15 @@ (add-hook! markdown-mode-hook 'spell-fu-mode) -(use-package! dired-preview) -(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))) +(after! dirvish (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 dirvish-hide-details t)) - :bind ; Bind `dirvish|dirvish-side|dirvish-dwim' as you see fit - (("C-c f" . dirvish-fd) - :map dirvish-mode-map ; Dirvish inherits `dired-mode-map' - ("a" . dirvish-quick-access) - ("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)) - ) +(map! :after dired + :map dirvish-mode-map + :n "h" #'dired-up-directory + :n "l" #'dired-find-file) (defun bascht/dirvish-tdir() (interactive) diff --git a/dot_doom.d/init.el b/dot_doom.d/init.el index 1eec6f4..c80b5c3 100644 --- a/dot_doom.d/init.el +++ b/dot_doom.d/init.el @@ -34,7 +34,7 @@ snippets ; my elves. They type so I don't have to :emacs - (dired) ; making dired pretty [functional] + (dired +icons +bindings) ; making dired pretty [functional] electric ; smarter, keyword-based electric-indent (undo +tree) ; persistent, smarter undo for your inevitable mistakes vc ; version-control and Emacs, sitting in a tree diff --git a/dot_doom.d/packages.el b/dot_doom.d/packages.el index bab70f6..2f8e1b8 100644 --- a/dot_doom.d/packages.el +++ b/dot_doom.d/packages.el @@ -1,27 +1,17 @@ ;; -*- no-byte-compile: t; -*- ;;; $DOOMDIR/packages.el +;(package! pdf-tools :built-in 'prefer) +;; (package! dirvish :built-in 'prefer) -(package! pdf-tools :built-in 'prefer) -(package! emacsql-sqlite-builtin :built-in 'prefer) +(package! vscode-icon :built-in 'prefer) +(package! nerd-icons-dired :built-in 'prefer) (package! dictcc :built-in 'prefer) (package! org-caldav :built-in 'prefer) -(package! dirvish :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! khalel :built-in 'prefer) - -;; Until https://github.com/doomemacs/doomemacs/issues/7196 is fixed: -(unpin! evil-collection) -(package! evil-collection - :recipe (:repo "emacs-evil/evil-collection" :branch "master")) +(package! ef-themes :built-in 'prefer) +(package! mingus :built-in 'prefer) +(package! spacious-padding :built-in 'prefer) (when (string= (system-name) "apfelstrudel") (package! protobuf-mode) @@ -30,4 +20,3 @@ (:host github :repo "shsms/ob-grpc"))) -(package! khalel)