about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--users/tazjin/emacs/config/init.el12
-rw-r--r--users/tazjin/emacs/default.nix11
2 files changed, 15 insertions, 8 deletions
diff --git a/users/tazjin/emacs/config/init.el b/users/tazjin/emacs/config/init.el
index a5b0e933d56f..89aefdca4750 100644
--- a/users/tazjin/emacs/config/init.el
+++ b/users/tazjin/emacs/config/init.el
@@ -29,6 +29,10 @@
 
 (use-package browse-kill-ring)
 
+(use-package company
+  :config
+  (global-company-mode))
+
 (use-package consult
   :bind
   ("C-c r g" . consult-ripgrep)
@@ -68,6 +72,14 @@
   (prescient-persist-mode)
   (setq completion-styles '(basic prescient)))
 
+(use-package vertico-prescient
+  :config
+  (vertico-prescient-mode))
+
+(use-package company-prescient
+  :config
+  (company-prescient-mode))
+
 (use-package rainbow-delimiters :hook (prog-mode . rainbow-delimiters-mode))
 (use-package rainbow-mode)
 (use-package s)
diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index 80a922043277..b07ca2927f44 100644
--- a/users/tazjin/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
@@ -53,13 +53,14 @@ pkgs.makeOverridable
       browse-kill-ring
       cargo
       clojure-mode
+      company
+      company-prescient
       consult
       deft
       direnv
       elixir-mode
       elm-mode
       erlang
-      depotExwm
       go-mode
       google-c-style
       gruber-darker-theme
@@ -93,6 +94,7 @@ pkgs.makeOverridable
       undo-tree
       uuidgen
       vertico
+      vertico-prescient
       vterm
       web-mode
       websocket
@@ -102,11 +104,6 @@ pkgs.makeOverridable
       zetteldeft
       zoxide
 
-      # experimental (not otherwise embedded in config yet)
-      orderless
-      corfu
-      eat
-
       # Wonky stuff
       (currentTelega epkgs)
       customTreesitGrammars # TODO(tazjin): how is this *supposed* to work?!
@@ -179,8 +176,6 @@ pkgs.makeOverridable
 
           # Expose telega/tdlib version check as a target that is built in
           # CI.
-          #
-          # TODO(tazjin): uncomment when telega works again
           inherit tdlibCheck;
           meta.ci.targets = [ "tdlibCheck" ];
         };