This commit is contained in:
Joe Frikker
2026-02-04 20:28:24 -05:00
parent 7aa49f1c0c
commit 34b03c3286

View File

@@ -834,10 +834,10 @@ windows. I place windows in the bottom or on the right mostly depending on how w
content to be. content to be.
#+BEGIN_SRC elisp :noweb no :noweb-ref emacs_config #+BEGIN_SRC elisp :noweb no :noweb-ref emacs_config
(setopt display-buffer-alist (setq display-buffer-alist
'(((or "\\*Flymake diagnostics *" '(((or "\\*Flymake diagnostics *"
"\\*Embark Export *" "\\*Embark Export *"
"\\*Embark Collect *" "\\*Embark Collect *"
"\\*xref*" "\\*xref*"
"\\*compilation\\*" "\\*compilation\\*"
"\\*sly-mrepl *" "\\*sly-mrepl *"
@@ -1248,11 +1248,13 @@ available? It seems to work for now anyway...
consult-gh consult-gh
diff-hl diff-hl
forge forge
git-timemachine
magit magit
#+END_SRC #+END_SRC
#+BEGIN_SRC elisp :noweb-ref emacs_config #+BEGIN_SRC elisp :noweb-ref emacs_config
(use-package magit (use-package magit
:defer nil
:bind (("C-x g" . magit-status) :bind (("C-x g" . magit-status)
("s-g" . magit-status) ("s-g" . magit-status)
("C-x M-g" . magit-dispatch) ("C-x M-g" . magit-dispatch)
@@ -1270,7 +1272,9 @@ available? It seems to work for now anyway...
(use-package forge (use-package forge
:after magit :after magit
:custom :custom
(forge-edit-post-hook '(forge-create-pullreq-insert-single-commit-message))) (forge-edit-post-hook '(forge-create-pullreq-insert-single-commit-message))
(forge-status-buffer-default-topic-filters
(forge--topics-spec :type 'topic :active nil :state 'open :order 'newest)))
(use-package diff-hl (use-package diff-hl
:after magit :after magit
@@ -1354,6 +1358,8 @@ available? It seems to work for now anyway...
:preview-key '(:debounce 0.4 any)) :preview-key '(:debounce 0.4 any))
(setq consult-narrow-key "<") ;; "C-+" (setq consult-narrow-key "<") ;; "C-+"
(setq xref-show-xrefs-function #'consult-xref
xref-show-definitions-function #'consult-xref)
) )
(use-package vertico (use-package vertico
@@ -1369,8 +1375,7 @@ available? It seems to work for now anyway...
(use-package orderless (use-package orderless
:custom :custom
(completion-styles '(orderless)) (completion-styles '(orderless basic)))
(orderless-matching-styles '(orderless-literal orderless-flex)))
(use-package marginalia (use-package marginalia
:config :config
@@ -1407,6 +1412,7 @@ available? It seems to work for now anyway...
#+BEGIN_SRC elisp :noweb-ref emacs_config #+BEGIN_SRC elisp :noweb-ref emacs_config
(use-package org (use-package org
:defer nil
:mode ("\\.org\\'" . org-mode) :mode ("\\.org\\'" . org-mode)
:bind (("C-c a" . org-agenda) :bind (("C-c a" . org-agenda)
("C-c c" . org-capture) ("C-c c" . org-capture)
@@ -1455,6 +1461,7 @@ available? It seems to work for now anyway...
(set-face-attribute 'org-level-8 nil :font "Iosevka Aile")) (set-face-attribute 'org-level-8 nil :font "Iosevka Aile"))
(use-package org-present (use-package org-present
:defer nil
:commands (org-present) :commands (org-present)
:config :config
(defun my/org-present-start () (defun my/org-present-start ()
@@ -1517,7 +1524,7 @@ available? It seems to work for now anyway...
("C-c n i" . org-roam-node-insert) ("C-c n i" . org-roam-node-insert)
("C-c n c" . org-roam-capture)) ("C-c n c" . org-roam-capture))
:config :config
(setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag))) ;; (setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag)))
(org-roam-db-autosync-mode)) (org-roam-db-autosync-mode))
(use-package org-modern (use-package org-modern
@@ -1533,22 +1540,13 @@ available? It seems to work for now anyway...
** Terminal ** Terminal
#+BEGIN_SRC nix :noweb-ref emacs_packages #+BEGIN_SRC nix :noweb-ref emacs_packages
eshell-vterm eat
vterm
#+END_SRC #+END_SRC
#+BEGIN_SRC elisp :noweb-ref emacs_config #+BEGIN_SRC elisp :noweb-ref emacs_config
(use-package em-term (use-package eat
:config :config
(push "hx" eshell-visual-commands)) (eat-eshell-mode))
(use-package vterm
:commands vterm)
(use-package eshell-vterm
:after eshell
:config
(eshell-vterm-mode))
#+END_SRC #+END_SRC
** Slack ** Slack