mirror of
https://github.com/librephoenix/nixos-config
synced 2025-04-20 09:14:34 +05:30
Update did something weird w magit, evil-collection and annalist
This commit is contained in:
parent
39484ad9fd
commit
0c1fec94f3
|
@ -836,6 +836,18 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)."
|
||||||
(advice-add 'magit-process-environment
|
(advice-add 'magit-process-environment
|
||||||
:filter-return #'~/magit-process-environment)
|
:filter-return #'~/magit-process-environment)
|
||||||
|
|
||||||
|
(evil-set-initial-state 'magit-status-mode 'normal)
|
||||||
|
(evil-set-initial-state 'magit-log-mode 'normal)
|
||||||
|
(evil-define-key 'normal magit-status-mode-map
|
||||||
|
"j" 'evil-next-visual-line
|
||||||
|
"k" 'evil-previous-visual-line
|
||||||
|
"c" 'magit-commit
|
||||||
|
"s" 'magit-stage
|
||||||
|
"u" 'magit-unstage
|
||||||
|
"l" 'magit-log
|
||||||
|
"F" 'magit-pull
|
||||||
|
"p" 'magit-push)
|
||||||
|
|
||||||
;;;------ dired configuration ------;;;
|
;;;------ dired configuration ------;;;
|
||||||
|
|
||||||
(add-hook 'dired-mode-hook 'all-the-icons-dired-mode)
|
(add-hook 'dired-mode-hook 'all-the-icons-dired-mode)
|
||||||
|
|
|
@ -1186,6 +1186,18 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)."
|
||||||
(advice-add 'magit-process-environment
|
(advice-add 'magit-process-environment
|
||||||
:filter-return #'~/magit-process-environment)
|
:filter-return #'~/magit-process-environment)
|
||||||
|
|
||||||
|
(evil-set-initial-state 'magit-status-mode 'normal)
|
||||||
|
(evil-set-initial-state 'magit-log-mode 'normal)
|
||||||
|
(evil-define-key 'normal magit-status-mode-map
|
||||||
|
"j" 'evil-next-visual-line
|
||||||
|
"k" 'evil-previous-visual-line
|
||||||
|
"c" 'magit-commit
|
||||||
|
"s" 'magit-stage
|
||||||
|
"u" 'magit-unstage
|
||||||
|
"l" 'magit-log
|
||||||
|
"F" 'magit-pull
|
||||||
|
"p" 'magit-push)
|
||||||
|
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
** Dired Configuration
|
** Dired Configuration
|
||||||
#+BEGIN_SRC emacs-lisp :tangle config.el
|
#+BEGIN_SRC emacs-lisp :tangle config.el
|
||||||
|
@ -1537,7 +1549,6 @@ Any git package can be configured for a particular commit or branch:
|
||||||
- =(unpin! pinned-package another-pinned-package)= to get bleeding edge instead of Doom's stability
|
- =(unpin! pinned-package another-pinned-package)= to get bleeding edge instead of Doom's stability
|
||||||
|
|
||||||
#+BEGIN_SRC emacs-lisp :tangle packages.el
|
#+BEGIN_SRC emacs-lisp :tangle packages.el
|
||||||
;;(package! org-bullets)
|
|
||||||
(package! org-modern)
|
(package! org-modern)
|
||||||
(package! org-super-agenda)
|
(package! org-super-agenda)
|
||||||
(package! emacsql :pin "c1a4407")
|
(package! emacsql :pin "c1a4407")
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
;;(package! org-bullets)
|
|
||||||
(package! org-modern)
|
(package! org-modern)
|
||||||
(package! org-super-agenda)
|
(package! org-super-agenda)
|
||||||
(package! emacsql :pin "c1a4407")
|
(package! emacsql :pin "c1a4407")
|
||||||
|
|
Loading…
Reference in a new issue