mirror of
https://github.com/jimeh/.emacs.d.git
synced 2026-02-19 13:46:41 +00:00
Majorly re-organize modules
- Split large modules into smaller parts (e.g. siren-text-manipulation) - Organize modules into high level groups: - completion - core - editor - languages - linting - misc - navigation - projects - spelling - text-editing - version-control - windows - workspaces
This commit is contained in:
19
modules/version-control/siren-diff-hl.el
Normal file
19
modules/version-control/siren-diff-hl.el
Normal file
@@ -0,0 +1,19 @@
|
||||
;;; siren-diff-hl.el --- jimeh's Emacs Siren: diff-hl configuration.
|
||||
|
||||
;;; Commentary:
|
||||
|
||||
;; Basic configuration for diff-hl.
|
||||
|
||||
;;; Code:
|
||||
|
||||
(use-package diff-hl
|
||||
:demand
|
||||
:hook ((dired-mode . diff-hl-dired-mode)
|
||||
(magit-post-refresh-hook . diff-hl-magit-post-refresh))
|
||||
|
||||
:config
|
||||
(global-diff-hl-mode +1)
|
||||
(diff-hl-flydiff-mode +1))
|
||||
|
||||
(provide 'siren-diff-hl)
|
||||
;;; siren-diff-hl.el ends here
|
||||
25
modules/version-control/siren-ediff.el
Normal file
25
modules/version-control/siren-ediff.el
Normal file
@@ -0,0 +1,25 @@
|
||||
;;; siren-ediff.el --- jimeh's Emacs Siren: ediff configuration.
|
||||
|
||||
;;; Commentary:
|
||||
|
||||
;; Basic configuration for ediff.
|
||||
|
||||
;;; Code:
|
||||
|
||||
(defun ediff-copy-both-to-C ()
|
||||
"Copy both A and B variants to C."
|
||||
(interactive)
|
||||
(ediff-copy-diff
|
||||
ediff-current-difference nil 'C nil
|
||||
(concat
|
||||
(ediff-get-region-contents ediff-current-difference 'A ediff-control-buffer)
|
||||
(ediff-get-region-contents ediff-current-difference 'B ediff-control-buffer))))
|
||||
|
||||
(defun add-B-to-ediff-mode-map ()
|
||||
"Assign B key to copy both A and B variants to C."
|
||||
(define-key ediff-mode-map "B" 'ediff-copy-both-to-C))
|
||||
|
||||
(add-hook 'ediff-keymap-setup-hook 'add-B-to-ediff-mode-map)
|
||||
|
||||
(provide 'siren-ediff)
|
||||
;;; siren-ediff.el ends here
|
||||
15
modules/version-control/siren-git-timemachine.el
Normal file
15
modules/version-control/siren-git-timemachine.el
Normal file
@@ -0,0 +1,15 @@
|
||||
;;; siren-git-timemachine.el --- jimeh's Emacs Siren: git-timemachine configuration.
|
||||
|
||||
;;; Commentary:
|
||||
|
||||
;; Basic configuration for git-timemachine.
|
||||
|
||||
;;; Code:
|
||||
|
||||
(use-package git-timemachine
|
||||
:defer t
|
||||
:init
|
||||
(defalias 'gt 'git-timemachine))
|
||||
|
||||
(provide 'siren-git-timemachine)
|
||||
;;; siren-git-timemachine.el ends here
|
||||
13
modules/version-control/siren-github.el
Normal file
13
modules/version-control/siren-github.el
Normal file
@@ -0,0 +1,13 @@
|
||||
;;; siren-github.el --- jimeh's Emacs Siren: Github related stuff.
|
||||
|
||||
;;; Commentary:
|
||||
|
||||
;; Basic configuration for various Github related packages.
|
||||
|
||||
;;; Code:
|
||||
|
||||
(use-package github-browse-file
|
||||
:defer t)
|
||||
|
||||
(provide 'siren-github)
|
||||
;;; siren-github.el ends here
|
||||
51
modules/version-control/siren-magit.el
Normal file
51
modules/version-control/siren-magit.el
Normal file
@@ -0,0 +1,51 @@
|
||||
;;; siren-magit.el --- jimeh's Emacs Siren: magit configuration.
|
||||
|
||||
;;; Commentary:
|
||||
|
||||
;; Basic configuration for magit.
|
||||
|
||||
;;; Code:
|
||||
|
||||
(require 'siren-fci)
|
||||
(require 'siren-flyspell)
|
||||
|
||||
(use-package magit
|
||||
:bind
|
||||
("C-x g". magit-status)
|
||||
|
||||
:hook
|
||||
(siren-magit-mode . siren-magit-mode-setup)
|
||||
(git-commit-mode . siren-git-commit-mode-setup)
|
||||
|
||||
:init
|
||||
(defalias 'bl 'magit-blame)
|
||||
|
||||
(defun siren-magit-mode-setup ())
|
||||
|
||||
(defun siren-git-commit-mode-setup ()
|
||||
(subword-mode)
|
||||
(setq tab-width 2)
|
||||
(fci-mode t)
|
||||
;; (flyspell-mode) ;; in GUI causes git-commit-mode to lock up emacs
|
||||
(linum-mode t)
|
||||
(auto-fill-mode))
|
||||
|
||||
:config
|
||||
(require 'magit)
|
||||
|
||||
(setq magit-completing-read-function 'magit-ido-completing-read
|
||||
magit-status-buffer-switch-function 'switch-to-buffer
|
||||
magit-bury-buffer-function 'bury-buffer
|
||||
magit-restore-window-configuration nil
|
||||
magit-revert-buffers 'silent
|
||||
magit-default-tracking-name-function 'magit-default-tracking-name-branch-only
|
||||
magit-repository-directories '("~/Projects" "~/src" "~/.emacs.d" "~/.dotfiles")
|
||||
magit-display-buffer-function 'magit-display-buffer-same-window-except-diff-v1))
|
||||
|
||||
(use-package magit-gh-pulls
|
||||
:hook (magit-mode . turn-on-magit-gh-pulls)
|
||||
:config
|
||||
(setq gh-use-local-git-config t))
|
||||
|
||||
(provide 'siren-magit)
|
||||
;;; siren-magit.el ends here
|
||||
Reference in New Issue
Block a user