diff --git a/emacs.el b/emacs.el
index a4a8083..1805c17 100644
--- a/emacs.el
+++ b/emacs.el
@@ -61,10 +61,13 @@
 (straight-use-package 'smartparens)
 (straight-use-package 'rainbow-delimiters)
 (straight-use-package 'hl-todo)
-(straight-use-package 'counsel)
+;; (straight-use-package 'counsel)
+(straight-use-package 'selectrum)
+(straight-use-package 'consult)
+(straight-use-package 'marginalia)
 (straight-use-package 'company)
 ;; (straight-use-package 'eglot)
-(straight-use-package 'lsp-mode)
+;; (straight-use-package 'lsp-mode)
 (straight-use-package 'speed-type)
 (straight-use-package 'magit)
 (straight-use-package 'restart-emacs)
@@ -81,6 +84,8 @@
 (global-unset-key (kbd "C-z"))
 ;; (set-face-attribute 'default nil :height 140)
 
+(setq use-package-compute-statistics t)
+
 (use-package display-line-numbers-mode
   :hook (prog-mode text-mode conf-mode))
 
@@ -95,6 +100,11 @@
 (use-package nix-mode
   :mode "\\.nix\\'")
 
+(use-package zig-mode
+  :custom
+  (zig-format-show-buffer nil)
+  (zig-zig-bin "~/src/zig/build/zig"))
+
 ;; (use-package promela-mode
 ;;   :mode "\\.pml\\'")
 
@@ -128,16 +138,29 @@
 (use-package hl-todo-mode
   :hook prog-mode)
 
-(use-package ivy
+;; (use-package ivy
+;;   :init
+;;   (ivy-mode 1)
+;;   ;; (setq ivy-use-virtual-buffers t)
+;;   (counsel-mode 1)
+;;   :bind (("C-c i" . counsel-imenu)
+;;          ("C-x M-r" . counsel-rg)
+;;          ("C-x M-f" . counsel-fzf)
+;;          ("C-x C-r" . counsel-recentf)
+;;          ("C-c C-r" . ivy-resume)))
+
+(use-package selectrum
   :init
-  (ivy-mode 1)
-  ;; (setq ivy-use-virtual-buffers t)
-  (counsel-mode 1)
-  :bind (("C-c i" . counsel-imenu)
-         ("C-x M-r" . counsel-rg)
-         ("C-x M-f" . counsel-fzf)
-         ("C-x C-r" . counsel-recentf)
-         ("C-c C-r" . ivy-resume)))
+  (ido-mode nil)
+  (selectrum-mode t))
+
+(use-package consult
+  :bind (("C-c i" . consult-imenu)
+         ("C-x b" . consult-buffer)))
+
+(use-package marginalia
+  :init
+  (marginalia-mode 1))
 
 (use-package company
   :config
@@ -149,17 +172,14 @@
 ;;   :config
 ;;   (add-to-list 'eglot-server-programs '(zig-mode . ("~/src/zls/zig-cache/bin/zls"))))
 
-(use-package lsp
-  :config
-  (add-to-list 'lsp-language-id-configuration '(zig-mode . "zig"))
-  (lsp-register-client
-   (make-lsp-client
-    :new-connection (lsp-stdio-connection "~/src/zls/zig-out/bin/zls")
-    :major-modes '(zig-mode)
-    :server-id 'zls)))
-
-(use-package magit
-  :bind (("C-M-g" . magit)))
+;; (use-package lsp
+;;   :config
+;;   (add-to-list 'lsp-language-id-configuration '(zig-mode . "zig"))
+;;   (lsp-register-client
+;;    (make-lsp-client
+;;     :new-connection (lsp-stdio-connection "~/src/zls/zig-out/bin/zls")
+;;     :major-modes '(zig-mode)
+;;     :server-id 'zls)))
 
 (use-package ace-window
   :config