.

1 files changed, 35 insertions, 27 deletions

diff --git a/home/dots/.emacs b/home/dots/.emacs
index 777784e..869049c 100644
--- a/home/dots/.emacs
+++ b/home/dots/.emacs
@@ -4,7 +4,6 @@
 
 (setq package-list
       '(avy
-	corfu
 	devdocs
 	diminish
 	direnv
@@ -256,24 +255,25 @@
   (geiser-mode . (lambda ()
 		   (keymap-set geiser-mode-map "C-." nil))))
 
-(use-package corfu
-  :defer t
-  ;; Optional customizations
-  :custom
-  (corfu-cycle t)                ;; Enable cycling for `corfu-next/previous'
-  ;; (corfu-auto t)                 ;; Enable auto completion
-  ;; (corfu-quit-at-boundary nil)   ;; Never quit at completion boundary
-  (corfu-quit-no-match t)      ;; Never quit, even if there is no match
-  (corfu-preview-current t)    ;; Disable current candidate preview
-  (corfu-preselect 'prompt)      ;; Preselect the prompt
-  (corfu-quit-no-match t)
-  (corfu-on-exact-match 'show)     ;; Configure handling of exact matches
-
-  ;; Recommended: Enable Corfu globally.  This is recommended since Dabbrev can
-  ;; be used globally (M-/).  See also the customization variable
-  ;; `global-corfu-modes' to exclude certain modes.
-  :init
-  (global-corfu-mode))
+;; (use-package corfu
+;;   :defer t
+;;   ;; Optional customizations
+;;   :custom
+;;   (corfu-cycle t)                ;; Enable cycling for `corfu-next/previous'
+;;   ;; (corfu-auto t)                 ;; Enable auto completion
+;;   ;; (corfu-quit-at-boundary nil)   ;; Never quit at completion boundary
+;;   (corfu-quit-no-match t)      ;; Never quit, even if there is no match
+;;   (corfu-preview-current t)    ;; Disable current candidate preview
+;;   (corfu-preselect 'prompt)      ;; Preselect the prompt
+;;   (corfu-quit-no-match t)
+;;   (corfu-on-exact-match 'show)     ;; Configure handling of exact matches
+;;
+;;   ;; Recommended: Enable Corfu globally.  This is recommended since Dabbrev can
+;;   ;; be used globally (M-/).  See also the customization variable
+;;   ;; `global-corfu-modes' to exclude certain modes.
+;;   :init
+;;   (global-corfu-mode)
+;;   (corfu-popupinfo-mode))
 
 (use-package dabbrev
   ;; Swap M-/ and C-M-/
@@ -367,6 +367,10 @@
   :custom
   (completion-cycle-threshold 5)
   (enable-recursive-minibuffers t)
+  (completion-auto-help 'always)
+  (completions-max-height 10)
+  (completions-format 'horizontal)
+  (completion-auto-select 'second-tab)
   (completion-ignore-case t))
 
 (use-package pass
@@ -792,11 +796,11 @@
 
 (use-package dbus)
 
-
 (use-package ido
   :defer t
   :init
   (ido-mode t)
+  (ido-everywhere)
   :bind
   (:repeat-map ido-completion-mode-map
    ("s" . ido-next-match)
@@ -811,7 +815,12 @@
 
 (use-package completion
   :custom
-  (completion-styles '(substring basic partial-completion emacs22)))
+  (read-file-name-completion-ignore-case t)
+  (read-buffer-completion-ignore-case t)
+  (completion-styles '(basic initials partial-completion substring))
+  (completion-category-defaults nil) ; ehh
+  (completion-show-help 't)
+  (completion-category-overrides '((file (styles basic partial-completion)))))
 
 (use-package calendar
   :defer t
@@ -869,6 +878,9 @@
   ((go-mode . (lambda () 
 		(add-hook
 		 'before-save-hook 'eglot-format-buffer nil t)))
+   (go-mode . (lambda () 
+		(add-hook
+		 'before-save-hook 'eglot-format-buffer nil t)))
    (go-mode . (lambda ()
 		(setq-local compile-command "go build .")))))
 
@@ -1082,7 +1094,7 @@
       :empty-lines 1)
      ("l" "Log"
       entry (file+datetree "~/personal-db/notes/log.org")
-      "** %? :cyprus:paramytha:\n%T"
+      "** %? :sweden:bastad:\n%T"
       :prepend t
       :empty-lines 0)
      ("n" "Inbox"
@@ -1092,10 +1104,6 @@
   :bind
   (("C-c c" . org-capture)))
 
-(defun org-agenda-switch-to-narrowed-subtree ()
-  (interactive)
-  (org-agenda-switch-to)
-  (org-narrow-to-subtree))
 
 (use-package org-agenda
   :defer t
@@ -1119,7 +1127,7 @@
   :bind
   (("C-c a" . org-agenda)
    :map org-agenda-mode-map
-   ("<return>" . org-agenda-switch-to-narrowed-subtree)))
+   ("<return>" . org-agenda-tree-to-indirect-buffer)))
 
 (use-package autorevert
   :diminish auto-revert-mode