From 51b8c32865f5b593e9edc9f012393fa2ac228d81 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Thu, 21 Feb 2019 23:55:16 -0800 Subject: [PATCH] Move Magit settings to emacs-config --- emacs/.emacs.d/init.el | 2 - emacs/.emacs.d/init/oni-magit-init.el | 43 --------------------- emacs/.emacs.d/site-lisp/oni-hydra-magit.el | 36 ----------------- 3 files changed, 81 deletions(-) delete mode 100644 emacs/.emacs.d/init/oni-magit-init.el delete mode 100644 emacs/.emacs.d/site-lisp/oni-hydra-magit.el diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 373be81..f609f77 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -89,7 +89,6 @@ (global-set-key (kbd "M-+") 'mc/mark-next-like-this) (global-set-key (kbd "C-c (") 'embrace-commander) (global-set-key (kbd "C-c o") 'oni-hydra-org/body) -(global-set-key (kbd "C-c v") 'oni-hydra-magit/body) (global-set-key (kbd "C-x f") 'ffap) (global-set-key (kbd "C-x C-b") 'ibuffer) @@ -177,7 +176,6 @@ (with-eval-after-load 'gnus (load "oni-gnus-init")) (with-eval-after-load 'js (load "oni-js-mode-init")) (with-eval-after-load 'lui (load "oni-lui-init")) -(with-eval-after-load 'magit (load "oni-magit-init")) (with-eval-after-load 'ruby-mode (load "oni-ruby-init")) (with-eval-after-load 'scheme (load "oni-scheme-init")) (with-eval-after-load 'sh-mode (load "oni-sh-mode-init")) diff --git a/emacs/.emacs.d/init/oni-magit-init.el b/emacs/.emacs.d/init/oni-magit-init.el deleted file mode 100644 index 17f50da..0000000 --- a/emacs/.emacs.d/init/oni-magit-init.el +++ /dev/null @@ -1,43 +0,0 @@ -;;; oni-magit-init.el --- My magit configuration -*- lexical-binding: t; -*- - -;; Copyright (C) 2018 Tom Willemse - -;; Author: Tom Willemse -;; Keywords: local - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . - -;;; Commentary: - -;; My magit configuration. - -;;; Code: - -(require 'magit) -(require 'magithub) - -(setq magit-diff-refine-hunk 'all) - -(defvar oni:magit-status-rx - (rx bos "*magit: ")) - -(defun oni:display-buffer-in-only-window (buffer alist) - (delete-other-windows) - (display-buffer-same-window buffer alist)) - -(add-to-list 'display-buffer-alist - `(,oni:magit-status-rx oni:display-buffer-in-only-window)) - -(provide 'oni-magit-init) -;;; oni-magit-init.el ends here diff --git a/emacs/.emacs.d/site-lisp/oni-hydra-magit.el b/emacs/.emacs.d/site-lisp/oni-hydra-magit.el deleted file mode 100644 index 80a70b6..0000000 --- a/emacs/.emacs.d/site-lisp/oni-hydra-magit.el +++ /dev/null @@ -1,36 +0,0 @@ -;;; oni-hydra-magit.el --- Hydras for Magit -*- lexical-binding: t; -*- - -;; Copyright (C) 2016 Tom Willemse - -;; Author: Tom Willemse -;; Keywords: convenience, local - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . - -;;; Commentary: - -;; - -;;; Code: - -(require 'hydra) - -;;;###autoload(autoload 'oni-hydra-magit/body "oni-hydra-magit") -(defhydra oni-hydra-magit (:color blue) - "Magit" - ("s" magit-status "Status") - ("i" magit-init "Init")) - -(provide 'oni-hydra-magit) -;;; oni-hydra-magit.el ends here