use git and core-libs

init.el

@@ -87,18 +87,19 @@
 
 ;;; Keybinding
   (use-package evil
-    :ensure t)
-  (use-package evil-leader
-    :ensure t)
+    :ensure t
+    :config
+    (evil-mode 1))
 
-  (require 'functions)
+  (require 'core-libs)
+  (require 'keybindings)
+  (require 'init-git)
   (require 'prog-common)
   (require 'prog-c-cpp)
   (require 'prog-python)
   (require 'prog-haskell)
   (require 'init-org)
   (require 'apps)
-  (require 'keybindings)
   )
 
 

lisp/completion.el

@@ -89,6 +89,11 @@
         ivy-on-del-error-function #'ignore
         ivy-use-selectable-prompt t
         )
+  :bind
+  (("C-c s s" . 'swiper)
+   ("C-c s p" . 'user/counsel-search-project)
+   ("C-c s d" . 'user/counsel-search-dir)
+   )
   )
 
 (use-package counsel

lisp/functions.el → lisp/core-libs.el

-;;; functions.el -- my functions & macros
+;;; core-libs.el -- my functions & macros
 
 ;;; Commentary:
 
 ;;; Code:
-(defvar emacs-default-map (make-sparse-keymap)
-  "Base keymap for all Emacs leader key commands.")
-
 (defun open-init-file()
   "Find and open the init.el."
   (interactive)
@@ -43,5 +40,5 @@ If INITIAL-DIRECTORY is non nil start in that directory."
   (interactive)
   (user/counsel-search-rg default-directory))
 
-(provide 'functions)
+(provide 'core-libs)
 ;;; functions.el ends here

lisp/editor.el

@@ -192,13 +192,13 @@
   (use-package anzu
     :ensure t
     :defer t
-    :hook isearch-mode)
+    )
 
   (use-package evil-anzu
     :ensure t
     :defer t
     :config
-    (global-anzu-mode 1)))
+    (anzu-mode 1)))
 
 ;;; Whichkey
 (use-package which-key

lisp/init-git.el

+;;; init-git.el --- git configurations
+
+;;; Commentary:
+
+;;; Code:
+(use-package magit
+  :ensure t
+  :bind (("C-c g s" . 'magit-status)
+         ("C-c g d" . 'magit-diff-range)
+         )
+  )
+
+
+(use-package forge
+  :ensure t
+  )
+
+(use-package magit-gitflow
+  :ensure t
+  :hook (magit-mode . turn-on-magit-gitflow)
+  )
+
+(use-package evil-magit
+  :ensure t
+  :init
+  (setq evil-magit-state 'motion))
+
+(provide 'init-git)
+;;; init-git.el ends here

lisp/init-org.el

@@ -73,7 +73,7 @@
   :defer t)
 
 (use-package valign
-  :load-path "lisp/valign"
+  :ensure t
   :config
   (add-hook 'org-mode-hook #'valign-mode)
   :diminish valign-mode)

lisp/keybindings.el

 
 ;;; Code:
-;;; Evil
-(require 'evil)
-(require 'evil-leader)
-(global-evil-leader-mode)
-(evil-leader/set-leader "SPC")
-(evil-leader/set-key
-  ;;swiper minibuffers-------------------------
-  "f f" 'counsel-find-file
-  "f r" 'counsel-recentf
-  "f s" 'save-buffer
-  "SPC" 'counsel-M-x
-  ;; "SPC" 'execute-extended-command
-  "s s" 'swiper
-  "s d" 'user/counsel-search-dir
-  "s p" 'user/counsel-search-project
-  "h i" 'counsel-imenu
-  ;; buffer
-  "b d" 'kill-current-buffer
-  "b k" 'kill-buffer
-  "b b" 'counsel-switch-buffer
-  ;; magit-----------------------------------
-  "g s" 'magit-status
-  "g d" 'magit-diff-range
-  "g p" 'magit-push-current
-  "g P" 'magit-pull-branch
-  "g c" 'magit-commit
-  ;; projectile------------------------------
-  "p f" 'counsel-projectile-find-file
-  "p h" 'counsel-projectile
-  "p p" 'counsel-projectile-switch-project
-  "p b" 'counsel-projectile-switch-to-buffer
-  "p k" 'projectile-kill-buffers
-  ;; windows options-------------------------
-  "w l" 'evil-window-right
-  "w h" 'evil-window-left
-  "w k" 'evil-window-up
-  "w j" 'evil-window-down
-  "w 2" 'split-window-right
-  "w -" 'split-window-vertically
-  "w 0" 'delete-window
-  "w 1" 'delete-other-windows
-  ;; youdao dict------------------------------
-  "o y" 'youdao-dictionary-search-at-point+
-  ;; flycheck mode
-  "e n" 'flycheck-next-error
-  "e p" 'flycheck-previous-error
-  "e l" 'flycheck-list-errors
-  ;; jump mode
-  "j i" 'imenu
-  ;; global
-  "o c" 'open-userconfig-file
-  "o i" 'open-init-file
-  )
-(evil-mode 1)
+(defvar emacs-default-map (make-sparse-keymap)
+  "Base keymap for all Emacs leader key commands.")
+
 
 (provide 'keybindings)
 ;;; keybindings.el ends here