Skip to content

Commit a75d587

Browse files
committed
tweak(window): do not deffer
1 parent cd75b1b commit a75d587

File tree

1 file changed

+65
-66
lines changed

1 file changed

+65
-66
lines changed

modules/me-window.el

Lines changed: 65 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -12,86 +12,85 @@
1212

1313
;;; Code:
1414

15-
(+deferred!
16-
(add-to-list
17-
'display-buffer-alist
18-
`(,(rx (seq "*" (or "Help" (seq "helpful" (zero-or-more not-newline))) "*"))
19-
(display-buffer-reuse-window display-buffer-pop-up-window)
20-
(inhibit-same-window . t)))
15+
(add-to-list
16+
'display-buffer-alist
17+
`(,(rx (seq "*" (or "Help" (seq "helpful" (zero-or-more not-newline))) "*"))
18+
(display-buffer-reuse-window display-buffer-pop-up-window)
19+
(inhibit-same-window . t)))
2120

2221
;; Show *Warnings* at bottom
23-
(add-to-list
24-
'display-buffer-alist
25-
`("*Warnings*"
26-
(display-buffer-reuse-window display-buffer-in-direction)
27-
(direction . bottom) ;; bottom (above below...)
28-
(dedicated . t) ;; Close when finished
29-
(reusable-frames . visible) ;;
30-
(window-height . 10)))
22+
(add-to-list
23+
'display-buffer-alist
24+
`("*Warnings*"
25+
(display-buffer-reuse-window display-buffer-in-direction)
26+
(direction . bottom) ;; bottom (above below...)
27+
(dedicated . t) ;; Close when finished
28+
(reusable-frames . visible) ;;
29+
(window-height . 10)))
3130

3231
;; Show dictionary definition and completion buffer on the right side
33-
(add-to-list
34-
'display-buffer-alist
35-
`(,(rx (seq "*" (or "Dictionary" "lexic" "Completions") "*"))
36-
(display-buffer-in-side-window)
37-
(side . right)
38-
(window-width . 82)))
32+
(add-to-list
33+
'display-buffer-alist
34+
`(,(rx (seq "*" (or "Dictionary" "lexic" "Completions") "*"))
35+
(display-buffer-in-side-window)
36+
(side . right)
37+
(window-width . 82)))
3938

40-
(add-to-list
41-
'display-buffer-alist
42-
`(,(rx (seq "*" (or "eshell" "terminal") "*"))
43-
;; (display-buffer-reuse-window display-buffer-at-bottom)
44-
(display-buffer-reuse-window display-buffer-in-direction)
45-
(direction . bottom) ;; bottom (above below...)
46-
(dedicated . t) ;; Close when finished
47-
(reusable-frames . visible) ;;
48-
(window-height . 0.3)))
39+
(add-to-list
40+
'display-buffer-alist
41+
`(,(rx (seq "*" (or "eshell" "terminal") "*"))
42+
;; (display-buffer-reuse-window display-buffer-at-bottom)
43+
(display-buffer-reuse-window display-buffer-in-direction)
44+
(direction . bottom) ;; bottom (above below...)
45+
(dedicated . t) ;; Close when finished
46+
(reusable-frames . visible) ;;
47+
(window-height . 0.3)))
4948

50-
(setq frame-title-format
51-
'(""
52-
(:eval
53-
(if (and
54-
(bound-and-true-p org-roam-directory)
55-
(string-prefix-p
56-
(expand-file-name org-roam-directory)
57-
(expand-file-name (or buffer-file-name ""))))
58-
(replace-regexp-in-string ".*/[0-9]*-?" ""
59-
(subst-char-in-string ?_ ?\s buffer-file-name))
60-
"%b"))
61-
(:eval
62-
(let ((proj
63-
(ignore-errors
64-
(cond
65-
((featurep 'projectile)
66-
(projectile-project-name))
67-
(t
68-
(or
69-
(project-name (project-current))
70-
(file-name-nondirectory
71-
(string-trim-right (expand-file-name (vc-root-dir)) "/"))))))))
72-
(concat
73-
(if (buffer-modified-p) "" "")
74-
(when (and proj (not (string= proj "-")))
75-
(format " %s" proj)))))))
49+
(setq frame-title-format
50+
'(""
51+
(:eval
52+
(if (and
53+
(bound-and-true-p org-roam-directory)
54+
(string-prefix-p
55+
(expand-file-name org-roam-directory)
56+
(expand-file-name (or buffer-file-name ""))))
57+
(replace-regexp-in-string ".*/[0-9]*-?" ""
58+
(subst-char-in-string ?_ ?\s buffer-file-name))
59+
"%b"))
60+
(:eval
61+
(let ((proj
62+
(ignore-errors
63+
(cond
64+
((featurep 'projectile)
65+
(projectile-project-name))
66+
(t
67+
(or
68+
(project-name (project-current))
69+
(file-name-nondirectory
70+
(string-trim-right (expand-file-name (vc-root-dir)) "/"))))))))
71+
(concat
72+
(if (buffer-modified-p) "" "")
73+
(when (and proj (not (string= proj "-")))
74+
(format " %s" proj)))))))
7675

7776
;; Adapted from: github.com/Phundrak/dotfiles/blob/master/org/config/emacs.org
78-
(with-eval-after-load 'hydra
79-
(defhydra +window-adjust-size (:hint nil :foreign-keys warn)
80-
"
77+
(with-eval-after-load 'hydra
78+
(defhydra +window-adjust-size (:hint nil :foreign-keys warn)
79+
"
8180
^Zoom^ ^Other
8281
^^^^^^^-----------------------------------------
8382
[_t_/_s_] shrink/enlarge vertically [_q_] quit
8483
[_c_/_r_] shrink/enlarge horizontally
8584
"
86-
("q" nil :exit t)
87-
("c" shrink-window-horizontally)
88-
("t" enlarge-window)
89-
("s" shrink-window)
90-
("r" enlarge-window-horizontally))
85+
("q" nil :exit t)
86+
("c" shrink-window-horizontally)
87+
("t" enlarge-window)
88+
("s" shrink-window)
89+
("r" enlarge-window-horizontally))
9190

92-
(+map!
93-
:infix "w"
94-
"a" '(+window-adjust-size/body :wk "Adjust window size"))))
91+
(+map!
92+
:infix "w"
93+
"a" '(+window-adjust-size/body :wk "Adjust window size")))
9594

9695

9796
(provide 'me-window)

0 commit comments

Comments
 (0)