diff --git a/config/emacs/emacs.org b/config/emacs/emacs.org
index 7385247f..f6c34607 100644
--- a/config/emacs/emacs.org
+++ b/config/emacs/emacs.org
@@ -420,13 +420,12 @@ Should make startup faster, taken from doom-emacs
 ** General Leader Key
 #+begin_src emacs-lisp
   (use-package general
-    :demand t
     :config
-    (general-create-definer sakomacs/leader-keys
-      :keymaps `(normal insert visual emacs)
-      :prefix "SPC"
-      :global-prefix "C-SPC")
-    (sakomacs/leader-keys
+    ;; (general-create-definer sakomacs/leader-keys
+    ;;   :keymaps `(normal insert visual emacs)
+    ;;   :prefix "SPC"
+    ;;   :global-prefix "C-SPC")
+    (nvmap :prefix "SPC" :global-prefix "C-SPC"
      ;; code
      "c" `(:ignore c :which-key "code")
      "cc" `(compile :which-key "compile")
diff --git a/config/emacs/init.el b/config/emacs/init.el
index 966a61b3..e0faa213 100644
--- a/config/emacs/init.el
+++ b/config/emacs/init.el
@@ -347,13 +347,12 @@ kept-old-versions 5)
   :config (delete-selection-mode +1))
 
 (use-package general
-  :demand t
   :config
-  (general-create-definer sakomacs/leader-keys
-    :keymaps `(normal insert visual emacs)
-    :prefix "SPC"
-    :global-prefix "C-SPC")
-  (sakomacs/leader-keys
+  ;; (general-create-definer sakomacs/leader-keys
+  ;;   :keymaps `(normal insert visual emacs)
+  ;;   :prefix "SPC"
+  ;;   :global-prefix "C-SPC")
+  (nvmap :prefix "SPC" :global-prefix "C-SPC"
    ;; code
    "c" `(:ignore c :which-key "code")
    "cc" `(compile :which-key "compile")