From f7930ce4906babcadb478be0327fd662e88791f3 Mon Sep 17 00:00:00 2001
From: Rutherther <rutherther@proton.me>
Date: Mon, 10 Jun 2024 21:57:29 +0200
Subject: [PATCH] some updates

---
 early-init.el |  2 ++
 init.el       | 48 ++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/early-init.el b/early-init.el
index 20ef4bc8cb7423fb016b5c28c9158818e6b3a582..4891d2baae832b9dc79d5d17640c9ef2f99b0434 100644
--- a/early-init.el
+++ b/early-init.el
@@ -1,3 +1,5 @@
+(eval-and-compile (setq load-prefer-newer t))
+
 ;; ------------------------------------------------------------------------------------------
 ;; Speed optimization taken from igloo.el, see https://github.com/VojtechStep/igloo.el
 ;; ------------------------------------------------------------------------------------------
diff --git a/init.el b/init.el
index 4f7802b0743f8d9dd540d508e6d4bae50cfeb3f3..2e9df31c7a42682f49edbd455ba6af9be6f7f935 100644
--- a/init.el
+++ b/init.el
@@ -46,6 +46,14 @@
 
 (setq-default resize-mini-windows t)
 
+(my-use-package whitespace
+  :hook
+  ((before-save . whitespace-cleanup)
+   ((prog-mode text-mode) . whitespace-mode))
+  :config
+  (setq whitespace-line-column 80) ;; limit line length
+  (setq whitespace-style '(face tabs empty trailing lines-tail)))
+
 ;; Default editing configs
 (setq create-lockfiles nil)
 (setq auto-save-default nil)
@@ -253,10 +261,14 @@
                  (window-parameters (mode-line-format . none)))))
 
 ;; Consult users will also want the embark-consult package.
-(use-package embark-consult
+(my-use-package embark-consult
   :ensure t
+  :bind (:map search-map
+          ("s" . consult-ripgrep-all))
   :hook
-  (embark-collect-mode . consult-preview-at-point-mode))
+  ((embark-collect-mode . consult-preview-at-point-mode))
+  :init
+  (require 'consult-ripgrep-all))
 
 (my-use-package consult
   :ensure t
@@ -390,6 +402,8 @@
   (minibuffer-setup . cursor-intangible-mode)
   :general
   (my-leader "n" '(:keymap narrow-map :wk "Narrowing"))
+  :bind
+  (("C-x C-b" . ibuffer))
   :custom
   (enable-recursive-minibuffers t)
   (read-extended-command-predicate #'command-completion-default-include-p)
@@ -440,6 +454,9 @@
 ;; File browser
 (my-use-package dired
   :ensure nil
+  :general
+  (my-leader
+    "o d" '(dired-jump :wk "Dired"))
   :custom
   (dired-dwim-target t))
 
@@ -447,7 +464,6 @@
   :ensure t
   :config
   (diredfl-global-mode))
-;; TODO test
 
 (my-use-package fd-dired
   :ensure t
@@ -456,6 +472,29 @@
     "s d" '(fd-dired :wk "Search dired")
     "s D" '(fd-grep-dired :wk "Search contents dired")))
 
+(my-use-package dired-filter
+  :ensure t)
+
+(my-use-package dired-subtree
+  :ensure t)
+
+(my-use-package dired-ranger
+  :ensure t
+;; TODO: config of move, copy etc.
+)
+
+(my-use-package dired-narrow
+  :ensure t)
+
+(my-use-package dired-collapse
+  :ensure t
+  :hook
+  (dired-mode . dired-collapse-mode))
+
+;; TODO: Use this?
+;; (my-use-package dirvish
+;;   :ensure t)
+
 ;; Git
 (my-use-package transient
   :ensure t)
@@ -641,9 +680,6 @@
   (add-to-list 'auto-mode-alist '("\\.rs\\'" . rustic-mode))
   (load (expand-file-name "nix-mode-mmm.el" (file-name-directory (locate-library "nix-mode")))))
 
-;; Some additional stuff
-(add-hook 'write-file-hooks 'delete-trailing-whitespace nil t)
-
 ;; Last step - async
 (elpaca-process-queues)