diff --git a/flake.nix b/flake.nix
index 041911ce..bdb08165 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,7 +32,7 @@
         term = "alacritty"; # Default terminal command;
         font = "Intel One Mono"; # Selected font
         fontPkg = pkgs.intel-one-mono; # Font package
-        editor = "neovide"; # Default editor;
+        editor = "emacsclient"; # Default editor;
         # editor spawning translator
         # generates a command that can be used to spawn editor inside a gui
         # EDITOR and TERM session variables must be set in home.nix or other module
diff --git a/user/app/emacs/default.nix b/user/app/emacs/default.nix
index c510c01a..6c4b8323 100644
--- a/user/app/emacs/default.nix
+++ b/user/app/emacs/default.nix
@@ -7,9 +7,9 @@
       alwaysEnsure = true;
       extraEmacsPackages = epkgs: with epkgs; [
         command-log-mode
-        vertico hotfuzz
+        vertico corfu hotfuzz orderless
         evil evil-collection evil-snipe evil-owl evil-vimish-fold
-        doom-modeline
+        dashboard doom-modeline
         nerd-icons nerd-icons-dired nerd-icons-corfu
         nerd-icons-ibuffer nerd-icons-completion
         yasnippet
diff --git a/user/app/emacs/init.el b/user/app/emacs/init.el
index 29143f28..04ffb912 100644
--- a/user/app/emacs/init.el
+++ b/user/app/emacs/init.el
@@ -35,12 +35,25 @@
   :init
   (vertico-mode))
 
-(use-package hotfuzz
-  :config
-  (setq completion-styles '(flex hotfuzz)))
+;; Completion
+(use-package hotfuzz)
+(use-package orderless)
+(setq completion-styles '(orderless flex hotfuzz))
+
+;; Magit
+(use-package magit)
+
+;; Projectile
+(use-package projectile
+  :init
+  (projectile-mode +1))
 
 ;; Enable vim
+(setq evil-want-keybinding nil)
+
 (use-package evil
+  :init
+  (setq evil-want-keybinding nil)
   :config
   (evil-set-leader nil (kbd "C-SPC"))
   (evil-set-leader 'normal (kbd "SPC"))
@@ -50,6 +63,7 @@
 (use-package evil-collection
   :init
   (setq evil-want-keybinding nil)
+  :config
   (evil-collection-init))
 
 (evil-define-key 'normal 'global (kbd "<leader>.") 'find-file)