commit 396407dc5f2e80da3c62c9fe54230bcfc02e52d9
parent 92558f1c698158a8f945d50a34841a739c0dc2c4
Author: Vincent Demeester <vincent@sbr.pm>
Date: Tue, 9 Jul 2024 13:47:59 +0200
tools/emacs: some cleanup still.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
8 files changed, 60 insertions(+), 39 deletions(-)
diff --git a/tools/emacs/config/config-buffers.el b/tools/emacs/config/config-buffers.el
@@ -77,11 +77,8 @@
(unless (eq ibuffer-sorting-mode 'filename/process)
(ibuffer-do-sort-by-filename/process)))))
-(use-package popper
- :bind (("C-`" . popper-toggle)
- ("M-`" . popper-cycle)
- ("C-M-`" . popper-toggle-type))
- :init
+(unless noninteractive
+ (require 'popper)
(setq popper-reference-buffers
'("\\*Messages\\*"
"Output\\*$"
@@ -93,7 +90,13 @@
flymake-project-diagnostics-mode
Man-mode
woman-mode))
+ (global-set-key (kbd "C-`") 'popper-toggle)
+ (global-set-key (kbd "M-`") 'popper-cycle)
+ (global-set-key (kbd "C-M-`") 'popper-toggle-type)
(popper-mode +1)
+
+ ;; For echo-area hints
+ (require 'popper-echo)
(popper-echo-mode +1))
(use-package goto-addr
diff --git a/tools/emacs/config/config-dired.el b/tools/emacs/config/config-dired.el
@@ -157,6 +157,7 @@ This relies on the external 'fd' executable."
(setq-default
;; Ask for creation of missing directories when copying/moving
dired-create-destination-dirs 'ask
+ dired-create-destination-dirs-on-trailing-dirsep t
;; Search only file names when point is on a file name
dired-isearch-filenames'dwim))
diff --git a/tools/emacs/config/config-programming.el b/tools/emacs/config/config-programming.el
@@ -37,15 +37,15 @@
((call-interactively 'compile))))
;; try out consult-gh
-(use-package consult-gh
- :after consult
- :config
- (add-to-list 'consult-gh-default-orgs-list "vdemeester")
- (setq consult-gh-default-orgs-list (append consult-gh-default-orgs-list (remove "" (split-string (or (consult-gh--command-to-string "org" "list") "") "\n"))))
- (require 'consult-gh-embark)
- (require 'consult-gh-transient)
- (setq consult-gh-show-preview t)
- (setq consult-gh-preview-key "M-o"))
+;; (use-package consult-gh
+;; :after consult
+;; :config
+;; (add-to-list 'consult-gh-default-orgs-list "vdemeester")
+;; (setq consult-gh-default-orgs-list (append consult-gh-default-orgs-list (remove "" (split-string (or (consult-gh--command-to-string "org" "list") "") "\n"))))
+;; (require 'consult-gh-embark)
+;; (require 'consult-gh-transient)
+;; (setq consult-gh-show-preview t)
+;; (setq consult-gh-preview-key "M-o"))
(provide 'config-programming)
;;; config-programming.el ends here
diff --git a/tools/emacs/config/programming-config.el b/tools/emacs/config/programming-config.el
@@ -139,6 +139,12 @@
("\\.markdown\\'" . markdown-mode))
:hook ((markdown-mode . visual-line-mode)
(gfm-mode . visual-line-mode)))
+
+(use-package orgalist
+ :commands (orgalist-mode)
+ :hook ((markdown-mode . orgalist-mode)
+ (gfm-mode . orgalist-mode)))
+
;; (use-package copilot
;; :preface
;; (unless (package-installed-p 'copilot)
diff --git a/tools/emacs/config/programming-elisp.el b/tools/emacs/config/programming-elisp.el
@@ -0,0 +1,9 @@
+;;; programming-elisp.el --- -*- lexical-binding: t; -*-
+;;; Commentary:
+;;; Emacs lisp programming language configuration
+;;; Code:
+(use-package smartparens
+ :hook ((emacs-lisp-mode . smartparens-strict-mode)))
+
+(provide 'programming-elisp)
+;;; programming-elisp.el ends here
diff --git a/tools/emacs/lisp/ol-rg.el b/tools/emacs/lisp/ol-rg.el
@@ -34,6 +34,7 @@
;;; Code:
+(require 'rg)
(require 'ol)
;; Install the link type
diff --git a/tools/emacs/lisp/ol-ripgrep.el b/tools/emacs/lisp/ol-ripgrep.el
@@ -34,6 +34,7 @@
;;; Code:
(require 'ol)
+(require 'ripgrep)
;; Install the link type
(org-link-set-parameters "ripgrep"
diff --git a/users/vincent/dev/emacs.nix b/users/vincent/dev/emacs.nix
@@ -36,15 +36,15 @@ let
adoc-mode
aggressive-indent
alert
- all-the-icons
+ # all-the-icons
async
avy
bbdb
beginend
- cape # FIXME: configure
+ cape
casual-avy
casual-dired
- color-identifiers-mode
+ # color-identifiers-mode
conner
consult
consult-dir
@@ -52,12 +52,12 @@ let
corfu
dash
dape
- delight
+ # delight
denote
dired-collapse
dired-narrow
dired-rsync
- dired-sidebar
+ # dired-sidebar
diredfl
dockerfile-mode
doom-modeline
@@ -66,19 +66,19 @@ let
editorconfig
edit-indirect
eldoc-box
- emacs-everywhere
+ # emacs-everywhere
embark
embark-consult
- emms
+ # emms
envrc
eshell-prompt-extras
esup
- expand-region
+ # expand-region
flimenu
- flymake-languagetool
+ # flymake-languagetool
flymake-yamllint
- flymake-codespell
- fontaine
+ # flymake-codespell
+ # fontaine
focus
git-commit
git-gutter
@@ -86,18 +86,18 @@ let
git-modes
go-mode
gotest
- goto-last-change
+ # goto-last-change
hardhat
helpful
highlight
highlight-indentation
- hl-todo
+ # hl-todo
htmlize
ibuffer-vc
jinx
json-mode
ligature
- lin
+ # lin
magit
magit-popup
marginalia
@@ -105,10 +105,10 @@ let
mct
modus-themes
multi-vterm
- multiple-cursors
+ # multiple-cursors
mwim
- nerd-icons
- nix-buffer
+ # nerd-icons
+ # nix-buffer
nix-mode
nix-ts-mode
nixpkgs-fmt
@@ -119,10 +119,10 @@ let
orderless # TODO configure this
org
orgalist
- org-appear
- org-capture-pop-frame
+ # org-appear
+ # org-capture-pop-frame
org-contrib
- org-journal
+ # org-journal
org-modern
org-nix-shell
org-ql
@@ -133,14 +133,14 @@ let
orgit
ox-pandoc
pandoc-mode
- pdf-tools
+ # pdf-tools
popper
- pkgs.bookmark-plus
- rainbow-delimiters
- rainbow-mode
+ pkgs.bookmark-plus # Do I use it ?
+ # rainbow-delimiters
+ # rainbow-mode
rg
ripgrep
- run-command
+ run-command # Try this out instead of conner, might be even better
scratch
shr-tag-pre-highlight
smartparens
