diff --git a/home/natto/config/emacs/README.org b/home/common/emacs/config/README.org similarity index 100% rename from home/natto/config/emacs/README.org rename to home/common/emacs/config/README.org diff --git a/home/natto/config/emacs/config.org b/home/common/emacs/config/config.org similarity index 98% rename from home/natto/config/emacs/config.org rename to home/common/emacs/config/config.org index 15e229b..7ce5c4a 100644 --- a/home/natto/config/emacs/config.org +++ b/home/common/emacs/config/config.org @@ -78,13 +78,13 @@ (dark-theme t)) #+end_src -** Configure Selectrum -Enable selectrum +** Minibuffer +Enable vertico #+begin_src emacs-lisp -(use-package selectrum - :defer t +(use-package vertico + :ensure t :config - (selectrum-mode +1)) + (vertico-mode 1)) #+end_src Add selectrum-prescient @@ -130,6 +130,12 @@ Add selectrum-prescient (evil-define-key 'visual global-map (kbd ">") 'my/evil-shift-right) (evil-define-key 'visual global-map (kbd "<") 'my/evil-shift-left) (evil-mode 1)) + +(use-package evil-collection + :after evil + :ensure t + :config + (evil-collection-init)) #+end_src *** Configure undo tree diff --git a/home/natto/config/emacs/init.el b/home/common/emacs/config/init.el similarity index 100% rename from home/natto/config/emacs/init.el rename to home/common/emacs/config/init.el diff --git a/home/default.nix b/home/default.nix index a4e4f0f..6c60e02 100644 --- a/home/default.nix +++ b/home/default.nix @@ -114,7 +114,7 @@ in amneesh = inputs.home-manager.lib.homeManagerConfiguration { inherit extraSpecialArgs; modules = [ - ./common/emacs + ./common/emacs ./amneesh ] ++ common; pkgs = mkPkgs "x86_64-linux";