mirror of
https://gitlab.com/dwt1/dotfiles.git
synced 2026-08-09 17:41:12 +10:00
Minor edits
Merge branch 'master' of gitlab.com:dwt1/dotfiles
This commit is contained in:
+21
-21
@@ -12,7 +12,7 @@
|
||||
(use-package all-the-icons-dired
|
||||
:hook (dired-mode . (lambda () (all-the-icons-dired-mode t))))
|
||||
|
||||
(setq backup-directory-alist '((".*" . "~/.local/share/Trash/files")))
|
||||
(setq backup-directory-alist '((".*" . "~/.config/emacs/backups/")))
|
||||
|
||||
(use-package claude-code
|
||||
:ensure (claude-code :host github :repo "stevemolitor/claude-code.el")
|
||||
@@ -216,8 +216,9 @@
|
||||
(define-key evil-motion-state-map (kbd "SPC") nil)
|
||||
(define-key evil-motion-state-map (kbd "RET") nil)
|
||||
(define-key evil-motion-state-map (kbd "TAB") nil))
|
||||
|
||||
;; Setting RETURN key in org-mode to follow links
|
||||
(setq org-return-follows-link t)
|
||||
(setq org-return-follows-link t)
|
||||
|
||||
(use-package flycheck
|
||||
:ensure t
|
||||
@@ -386,7 +387,7 @@
|
||||
"g r" '(vc-revert :wk "Git revert file")
|
||||
"g s" '(magit-stage-file :wk "Git stage file")
|
||||
"g t" '(git-timemachine :wk "Git time machine")
|
||||
"g u" '(magit-stage-file :wk "Git unstage file"))
|
||||
"g u" '(magit-unstage-file :wk "Git unstage file"))
|
||||
|
||||
(dt/leader-keys
|
||||
"h" '(:ignore t :wk "Help")
|
||||
@@ -508,7 +509,7 @@
|
||||
)
|
||||
|
||||
(use-package git-timemachine
|
||||
:after git-timemachine
|
||||
;; :after git-timemachine
|
||||
:hook (evil-normalize-keymaps . git-timemachine-hook)
|
||||
:config
|
||||
(evil-define-key 'normal git-timemachine-mode-map (kbd "C-j") 'git-timemachine-show-previous-revision)
|
||||
@@ -542,9 +543,9 @@
|
||||
("C-x B" . ivy-switch-buffer-other-window))
|
||||
:diminish
|
||||
:custom
|
||||
(setq ivy-use-virtual-buffers t)
|
||||
(setq ivy-count-format "(%d/%d) ")
|
||||
(setq enable-recursive-minibuffers t)
|
||||
(ivy-use-virtual-buffers t)
|
||||
(ivy-count-format "(%d/%d) ")
|
||||
(enable-recursive-minibuffers t)
|
||||
:config
|
||||
(ivy-mode))
|
||||
|
||||
@@ -557,9 +558,9 @@
|
||||
:ensure t
|
||||
:init (ivy-rich-mode 1) ;; this gets us descriptions in M-x.
|
||||
:custom
|
||||
(ivy-virtual-abbreviate 'full
|
||||
ivy-rich-switch-buffer-align-virtual-buffer t
|
||||
ivy-rich-path-style 'abbrev)
|
||||
(ivy-virtual-abbreviate 'full)
|
||||
(ivy-rich-switch-buffer-align-virtual-buffer t)
|
||||
(ivy-rich-path-style 'abbrev)
|
||||
:config
|
||||
(ivy-set-display-transformer 'ivy-switch-buffer
|
||||
'ivy-rich-switch-buffer-transformer))
|
||||
@@ -644,14 +645,14 @@
|
||||
|
||||
(eval-after-load 'org-indent '(diminish 'org-indent-mode))
|
||||
|
||||
(custom-set-faces
|
||||
'(org-level-1 ((t (:inherit outline-1 :height 1.7))))
|
||||
'(org-level-2 ((t (:inherit outline-2 :height 1.6))))
|
||||
'(org-level-3 ((t (:inherit outline-3 :height 1.5))))
|
||||
'(org-level-4 ((t (:inherit outline-4 :height 1.4))))
|
||||
'(org-level-5 ((t (:inherit outline-5 :height 1.3))))
|
||||
'(org-level-6 ((t (:inherit outline-5 :height 1.2))))
|
||||
'(org-level-7 ((t (:inherit outline-5 :height 1.1)))))
|
||||
(custom-set-faces
|
||||
'(org-level-1 ((t (:inherit outline-1 :height 1.7))))
|
||||
'(org-level-2 ((t (:inherit outline-2 :height 1.6))))
|
||||
'(org-level-3 ((t (:inherit outline-3 :height 1.5))))
|
||||
'(org-level-4 ((t (:inherit outline-4 :height 1.4))))
|
||||
'(org-level-5 ((t (:inherit outline-5 :height 1.3))))
|
||||
'(org-level-6 ((t (:inherit outline-5 :height 1.2))))
|
||||
'(org-level-7 ((t (:inherit outline-5 :height 1.1)))))
|
||||
|
||||
(require 'org-tempo)
|
||||
|
||||
@@ -775,7 +776,7 @@
|
||||
eshell-hist-ignoredups t
|
||||
eshell-scroll-to-bottom-on-input t
|
||||
eshell-destroy-buffer-when-process-dies t
|
||||
eshell-visual-commands'("bash" "fish" "htop" "ssh" "top" "zsh"))
|
||||
eshell-visual-commands '("bash" "fish" "htop" "ssh" "top" "zsh"))
|
||||
|
||||
(use-package vterm
|
||||
:ensure t
|
||||
@@ -842,7 +843,6 @@
|
||||
which-key-side-window-max-height 0.25
|
||||
which-key-idle-delay 0.8
|
||||
which-key-max-description-length 25
|
||||
which-key-allow-imprecise-window-fit nil
|
||||
which-key-separator " → " ))
|
||||
|
||||
(defun reader ()
|
||||
@@ -852,7 +852,7 @@
|
||||
("Third" . 'third-choice))))
|
||||
(alist-get
|
||||
(completing-read "Choose: " choices)
|
||||
choices nil nil 'message)))
|
||||
choices nil nil #'equal)))
|
||||
|
||||
(defun github-code-search ()
|
||||
"Search code on github for a given language."
|
||||
|
||||
+15
-17
@@ -1,7 +1,5 @@
|
||||
#+TITLE: DT's GNU Emacs Config
|
||||
#+AUTHOR: Derek Taylor (DT)
|
||||
#+DESCRIPTION: DT's personal Emacs config.
|
||||
#+STARTUP: showeverything
|
||||
#+AUTHORng
|
||||
#+OPTIONS: toc:2
|
||||
|
||||
* TABLE OF CONTENTS :toc:
|
||||
@@ -95,7 +93,7 @@ This is an icon set that can be used with dashboard, dired, ibuffer and other Em
|
||||
By default, Emacs creates automatic backups of files in their original directories, such "file.el" and the backup "file.el~". This leads to a lot of clutter, so let's tell Emacs to put all backups that it creates in the =TRASH= directory.
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
(setq backup-directory-alist '((".*" . "~/.local/share/Trash/files")))
|
||||
(setq backup-directory-alist '((".*" . "~/.config/emacs/backups/")))
|
||||
|
||||
#+end_src
|
||||
|
||||
@@ -362,8 +360,9 @@ An RSS newsfeed reader for Emacs. Move through the articles with 'j/k'. Move t
|
||||
(define-key evil-motion-state-map (kbd "SPC") nil)
|
||||
(define-key evil-motion-state-map (kbd "RET") nil)
|
||||
(define-key evil-motion-state-map (kbd "TAB") nil))
|
||||
|
||||
;; Setting RETURN key in org-mode to follow links
|
||||
(setq org-return-follows-link t)
|
||||
(setq org-return-follows-link t)
|
||||
|
||||
#+end_src
|
||||
|
||||
@@ -558,7 +557,7 @@ mouse wheel for zooming in/out.
|
||||
"g r" '(vc-revert :wk "Git revert file")
|
||||
"g s" '(magit-stage-file :wk "Git stage file")
|
||||
"g t" '(git-timemachine :wk "Git time machine")
|
||||
"g u" '(magit-stage-file :wk "Git unstage file"))
|
||||
"g u" '(magit-unstage-file :wk "Git unstage file"))
|
||||
|
||||
(dt/leader-keys
|
||||
"h" '(:ignore t :wk "Help")
|
||||
@@ -688,7 +687,7 @@ mouse wheel for zooming in/out.
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
(use-package git-timemachine
|
||||
:after git-timemachine
|
||||
;; :after git-timemachine
|
||||
:hook (evil-normalize-keymaps . git-timemachine-hook)
|
||||
:config
|
||||
(evil-define-key 'normal git-timemachine-mode-map (kbd "C-j") 'git-timemachine-show-previous-revision)
|
||||
@@ -735,9 +734,9 @@ Adding highlights to TODO and related words.
|
||||
("C-x B" . ivy-switch-buffer-other-window))
|
||||
:diminish
|
||||
:custom
|
||||
(setq ivy-use-virtual-buffers t)
|
||||
(setq ivy-count-format "(%d/%d) ")
|
||||
(setq enable-recursive-minibuffers t)
|
||||
(ivy-use-virtual-buffers t)
|
||||
(ivy-count-format "(%d/%d) ")
|
||||
(enable-recursive-minibuffers t)
|
||||
:config
|
||||
(ivy-mode))
|
||||
|
||||
@@ -750,9 +749,9 @@ Adding highlights to TODO and related words.
|
||||
:ensure t
|
||||
:init (ivy-rich-mode 1) ;; this gets us descriptions in M-x.
|
||||
:custom
|
||||
(ivy-virtual-abbreviate 'full
|
||||
ivy-rich-switch-buffer-align-virtual-buffer t
|
||||
ivy-rich-path-style 'abbrev)
|
||||
(ivy-virtual-abbreviate 'full)
|
||||
(ivy-rich-switch-buffer-align-virtual-buffer t)
|
||||
(ivy-rich-path-style 'abbrev)
|
||||
:config
|
||||
(ivy-set-display-transformer 'ivy-switch-buffer
|
||||
'ivy-rich-switch-buffer-transformer))
|
||||
@@ -802,7 +801,7 @@ Neotree is a file tree viewer. When you open neotree, it jumps to the current f
|
||||
| neotree-toggle | /Toggle neotree/ | SPC t n |
|
||||
| neotree- dir | /Open directory in neotree/ | SPC d n |
|
||||
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
#+begin_src emacs-lisp
|
||||
(use-package neotree
|
||||
:config
|
||||
(setq neo-smart-open t
|
||||
@@ -1099,7 +1098,7 @@ Eshell is an Emacs 'shell' that is written in Elisp.
|
||||
eshell-hist-ignoredups t
|
||||
eshell-scroll-to-bottom-on-input t
|
||||
eshell-destroy-buffer-when-process-dies t
|
||||
eshell-visual-commands'("bash" "fish" "htop" "ssh" "top" "zsh"))
|
||||
eshell-visual-commands '("bash" "fish" "htop" "ssh" "top" "zsh"))
|
||||
#+end_src
|
||||
|
||||
** Vterm
|
||||
@@ -1202,7 +1201,6 @@ With Emacs version 29, true transparency has been added. I have turned transpar
|
||||
which-key-side-window-max-height 0.25
|
||||
which-key-idle-delay 0.8
|
||||
which-key-max-description-length 25
|
||||
which-key-allow-imprecise-window-fit nil
|
||||
which-key-separator " → " ))
|
||||
#+end_src
|
||||
|
||||
@@ -1215,7 +1213,7 @@ With Emacs version 29, true transparency has been added. I have turned transpar
|
||||
("Third" . 'third-choice))))
|
||||
(alist-get
|
||||
(completing-read "Choose: " choices)
|
||||
choices nil nil 'message)))
|
||||
choices nil nil #'equal)))
|
||||
|
||||
(defun github-code-search ()
|
||||
"Search code on github for a given language."
|
||||
|
||||
Reference in New Issue
Block a user