Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: yqrashawn/yqdotfiles
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5254e5cc6c518c09950536140da4951fff00e595
Choose a base ref
..
head repository: yqrashawn/yqdotfiles
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 387df4e9338a253077c34a6c8e8659ffc27a92a7
Choose a head ref
Showing with 22 additions and 6 deletions.
  1. +11 −4 .doom.d/better-default.el
  2. +3 −1 .doom.d/map.el
  3. +8 −1 modules/yqrashawn/home-manager/cli/functions.sh
15 changes: 11 additions & 4 deletions .doom.d/better-default.el
View file
Original file line number Diff line number Diff line change
@@ -149,12 +149,16 @@
(apply orig-fn (not arg) project-p))


;;; +word-wrap
(setq! +word-wrap-fill-style 'soft)
(pushnew! +word-wrap-disabled-modes 'minibuffer-mode)

(+global-word-wrap-mode +1)

(defadvice! ++word-wrap--enable-global-mode (orig-fn)
:around #'+word-wrap--enable-global-mode
(unless (derived-mode-p 'prog-mode)
(funcall orig-fn)))
;; (defadvice! ++word-wrap--enable-global-mode (orig-fn)
;; :around #'+word-wrap--enable-global-mode
;; (unless (derived-mode-p 'prog-mode)
;; (funcall orig-fn)))

(set-popup-rules!
'(("^\\*[Hh]elp" :slot 2 :side right :vslot -8 :size 0.35 :select t :quit current)
@@ -950,3 +954,6 @@ If `DEVICE-NAME' is provided, it will be used instead of prompting the user."
;; and `buffer-terminator-interval'.)
;; (kill-buffer-property . inactive)
(return . :keep))))

;; quote “
;; quote ”
4 changes: 3 additions & 1 deletion .doom.d/map.el
View file
Original file line number Diff line number Diff line change
@@ -651,7 +651,9 @@
:n "gj" #'cider-inspector-next-page
:n "gk" #'cider-inspector-prev-page
:g "C-j" #'cider-inspector-next-inspectable-object
:g "C-k" #'cider-inspector-previous-inspectable-object)
:g "C-k" #'cider-inspector-previous-inspectable-object
:n "C-j" #'cider-inspector-next-inspectable-object
:n "C-k" #'cider-inspector-previous-inspectable-object)
(:map cider-repl-mode-map
(:localleader
"sp" (cmd!
9 changes: 8 additions & 1 deletion modules/yqrashawn/home-manager/cli/functions.sh
View file
Original file line number Diff line number Diff line change
@@ -65,4 +65,11 @@ _dopy_completion() {
return 0
}

complete -o default -F _dopy_completion sysdo
# Check if the script is running in Zsh
if [ -n "$ZSH_VERSION" ]; then
# Use compdef for Zsh
compdef _dopy_completion sysdo
elif [ -n "$BASH_VERSION" ]; then
# Use complete for Bash
complete -o default -F _dopy_completion sysdo
fi