add completion and spell, syntax and version checking, deft and treemacs and bibliography settings

settings/version-control-settings.el

@@ -0,0 +1,58 @@
+;;; version-control-settings.el --- Version control settings  -*- lexical-binding: t -*-
+
+;;; Commentary:
+;; IMPORTANT for magit: do not delete and change in magit-version.el
+;; the version, see also git repo lisp/Makefile
+
+;; TODO: add? https://github.com/alphapapa/magit-todos
+
+;; Requirements:
+;; magit https://melpa.org/#/magit
+;;   https://magit.vc/manual/magit/Installing-from-the-Git-Repository.html#Installing-from-the-Git-Repository
+;;   http://wikemacs.org/wiki/Magit
+;;   dash with-editor git-commit transient
+;; git-messenger https://melpa.org/#/git-messenger
+;;   popup
+;; orgit
+;; diff-hl https://elpa.gnu.org/packages/diff-hl.html
+;; (not anymore) ido-completing-read+ (now using ivy)
+;; ivy
+
+;;; Code:
+(use-package magit
+  :load-path (lambda() (concat user-emacs-directory "lisp/magit"))
+  :hook (prog-mode . magit-file-mode)
+  :config
+  ;; (setq magit-completing-read-function 'magit-builtin-completing-read)   ;; if ivy-mode is on then it uses it otherwise set to 'ivy-completing-read
+  ;; (setq magit-completing-read-function 'magit-ido-completing-read)       ;; Use ido to checkout branches. requires ido-completing-read+
+  )
+
+;; On Windows, we must use Git GUI to enter username and password
+;; See: https://github.com/magit/magit/wiki/FAQ#windows-cannot-push-via-https
+(when (eq window-system 'w32)
+  (setenv "GIT_ASKPASS" "git-gui--askpass"))
+
+(use-package git-messenger
+  :after (magit)
+  :bind (("C-x v p" . git-messenger:popup-message))
+  ;;:config
+  ;;(setq git-messenger:use-magit-popup t)
+  )
+
+(use-package orgit
+  :after (magit org)
+  )
+
+(use-package diff-hl
+  :load-path (lambda() (concat user-emacs-directory "lisp/diff-hl"))
+  :hook (
+         ((prog-mode vc-dir-mode) . turn-on-diff-hl-mode)
+         (magit-pre-refresh . diff-hl-magit-pre-refresh)
+         (magit-post-refresh . diff-hl-magit-post-refresh)
+         )
+  ;;:config
+  ;;(global-diff-hl-mode)
+  )
+
+(provide 'version-control-settings)
+;;; version-control-settings.el ends here