settings to update how wayland display is detected
This commit is contained in:
parent
6c5f570810
commit
e178d20978
3 changed files with 114 additions and 19 deletions
61
init.el
61
init.el
|
@ -115,7 +115,7 @@
|
|||
doom-modeline-buffer-file-name-style 'file-name
|
||||
doom-modeline-buffer-encoding nil
|
||||
doom-modeline-mu4e t
|
||||
doom-modeline-enable-word-count t)
|
||||
doom-modeline-enable-word-count nil)
|
||||
(if (daemonp)
|
||||
(add-hook 'after-make-frame-functions
|
||||
(lambda (frame)
|
||||
|
@ -148,7 +148,9 @@
|
|||
(which-key-mode)
|
||||
:defer 1)
|
||||
|
||||
(setenv "WAYLAND_DISPLAY" "wayland-0")
|
||||
(setenv "WAYLAND_DISPLAY" (if (string= (getenv "XDG_CURRENT_DESKTOP") "Hyprland")
|
||||
"wayland-1"
|
||||
"wayland-0"))
|
||||
|
||||
(executable-find "ssh")
|
||||
(setq ispell-program-name "hunspell"
|
||||
|
@ -242,6 +244,7 @@
|
|||
"ss" '(consult-line :which-key "consult search")
|
||||
"sr" '(consult-ripgrep :which-key "consult ripgrep")
|
||||
"sd" '(dictionary-search :which-key "search the dictionary")
|
||||
"sv" '(imenu :which-key "imenu")
|
||||
"oP" '(proced :which-key "proced")
|
||||
"ov" '(vterm :which-key "vterm")
|
||||
"wo" '(other-window :which-key "other window")
|
||||
|
@ -348,6 +351,43 @@
|
|||
(interactive (list (mark) (point)))
|
||||
(org-table-convert-region beg end ","))
|
||||
|
||||
(defun chris/org-cycle-hide-drawers (state)
|
||||
"Re-hide all drawers after a visibility state change."
|
||||
(interactive)
|
||||
(when (and (derived-mode-p 'org-mode)
|
||||
(not (memq state '(overview folded contents))))
|
||||
(save-excursion
|
||||
(let* ((globalp (memq state '(contents all)))
|
||||
(beg (if globalp
|
||||
(point-min)
|
||||
(point)))
|
||||
(end (if globalp
|
||||
(point-max)
|
||||
(if (eq state 'children)
|
||||
(save-excursion
|
||||
(outline-next-heading)
|
||||
(point))
|
||||
(org-end-of-subtree t)))))
|
||||
(goto-char beg)
|
||||
(while (re-search-forward org-drawer-regexp end t)
|
||||
(save-excursion
|
||||
(beginning-of-line 1)
|
||||
(when (looking-at org-drawer-regexp)
|
||||
(let* ((start (1- (match-beginning 0)))
|
||||
(limit
|
||||
(save-excursion
|
||||
(outline-next-heading)
|
||||
(point)))
|
||||
(msg (format
|
||||
(concat
|
||||
"org-cycle-hide-drawers: "
|
||||
"`:END:`"
|
||||
" line missing at position %s")
|
||||
(1+ start))))
|
||||
(if (re-search-forward "^[ \t]*:END:" limit t)
|
||||
(outline-flag-region start (point-at-eol) t)
|
||||
(user-error msg))))))))))
|
||||
|
||||
(defun chris/org-agenda-setup ()
|
||||
(interactive)
|
||||
(org-indent-mode +1)
|
||||
|
@ -535,7 +575,8 @@
|
|||
(chris/leader-keys
|
||||
:states 'normal
|
||||
:keymaps 'org-mode-map
|
||||
"is" 'org-time-stamp)
|
||||
"is" 'org-time-stamp
|
||||
"tp" (chris/org-cycle-hide-drawers 'children))
|
||||
(chris/leader-keys
|
||||
:states 'visual
|
||||
:keymaps 'override
|
||||
|
@ -560,6 +601,7 @@
|
|||
"zn" 'org-narrow-to-subtree
|
||||
"zw" 'widen
|
||||
"zp" 'org-set-property
|
||||
"zh" (chris/org-cycle-hide-drawers 'subtree)
|
||||
"S" 'org-schedule
|
||||
"t" 'org-todo
|
||||
"gf" 'org-footnote-action
|
||||
|
@ -1047,9 +1089,12 @@ If on a:
|
|||
(use-package consult
|
||||
:after vertico
|
||||
:config
|
||||
(setq consult-narrow-key "'"
|
||||
(setq consult-narrow-key (kbd "C-n")
|
||||
consult-project-root-function 'projectile-project-root)
|
||||
|
||||
(consult-customize
|
||||
consult-org-heading :preview-key nil)
|
||||
|
||||
(defun chris/consult-ripgrep-for-stepdata ()
|
||||
"Make ripgrep search hidden files for stepdata"
|
||||
(interactive)
|
||||
|
@ -1547,7 +1592,9 @@ targets."
|
|||
:commands eglot
|
||||
:hook
|
||||
(c++-mode . eglot-ensure)
|
||||
(rust-mode . eglot-ensure))
|
||||
(c++-ts-mode . eglot-ensure)
|
||||
(rust-mode . eglot-ensure)
|
||||
(rust-ts-mode . eglot-ensure))
|
||||
|
||||
(use-package consult-eglot
|
||||
:general
|
||||
|
@ -1894,7 +1941,7 @@ targets."
|
|||
(setq mail-user-agent 'mu4e-user-agent
|
||||
org-msg-options "html-postamble:nil H:5 num:nil ^:{} toc:nil author:nil email:nil \\n:t"
|
||||
org-msg-startup "hidestars indent inlineimages"
|
||||
org-msg-greeting-fmt "\nHi%s,\n\n"
|
||||
org-msg-greeting-fmt "\n%s\n"
|
||||
org-msg-recipient-names '(("chris@tfcconnection.org" . "Chris Cochrun"))
|
||||
org-msg-greeting-name-limit 3
|
||||
org-msg-default-alternatives '((new . (text html))
|
||||
|
@ -1903,8 +1950,6 @@ targets."
|
|||
org-msg-convert-citation t
|
||||
org-msg-signature "
|
||||
|
||||
Regards,
|
||||
|
||||
#+begin_signature
|
||||
--
|
||||
*Chris*
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue