From 658093544fedb9e79eafb026af07f08870188138 Mon Sep 17 00:00:00 2001 From: Chizi123 <joelgrun@gmail.com> Date: Fri, 23 Nov 2018 04:29:22 +0000 Subject: [PATCH] fixed workgroups --- init.el | 27 ++++++--------------------- 1 files changed, 6 insertions(+), 21 deletions(-) diff --git a/init.el b/init.el index cb0c2eb..7a94e86 100644 --- a/init.el +++ b/init.el @@ -142,7 +142,7 @@ (auto-package-update-maybe)) ;; workgroups2 -(use-package workgroups +(use-package workgroups2 :ensure t :config (workgroups-mode 1) @@ -248,14 +248,6 @@ (defadvice git-commit-abort (after delete-window activate) (delete-window)) - ;; these two force a new line to be inserted into a commit window, - ;; which stops the invalid style showing up. - ;; From: http://git.io/rPBE0Q - (defun magit-commit-mode-init () - (when (looking-at "\n") - (open-line 1))) - - (add-hook 'git-commit-mode-hook 'magit-commit-mode-init)) :config (progn ;; restore previously hidden windows @@ -276,13 +268,8 @@ (define-key magit-mode-map "c" 'magit-maybe-commit) - ;; major mode for editing `git rebase -i` files - (use-package rebase-mode) - ;; magit settings (setq - ;; use ido to look for branches - magit-completing-read-function 'magit-ido-completing-read ;; don't put "origin-" in front of new branch names by default magit-default-tracking-name-function 'magit-default-tracking-name-branch-only ;; open magit status in same window as current buffer @@ -357,14 +344,12 @@ (setq auto-package-update-hide-results t) (auto-package-update-maybe)) -;; guide-key -(use-package guide-key +;; which-key +(use-package which-key :ensure t :config - (setq guide-key/guide-key-sequence '("C-x" "C-c" "M-g" "C-h")) - (setq guide-key/recursive-key-sequence-flag t) - (setq guide-key/popup-window-position 'bottom) - (guide-key-mode 1) + (which-key-mode) + (which-key-setup-side-window-bottom) (setq auto-package-update-delete-old-versions t) (setq auto-package-update-hide-results t) (auto-package-update-maybe)) @@ -438,7 +423,7 @@ ("ec5f697561eaf87b1d3b087dd28e61a2fc9860e4c862ea8e6b0b77bd4967d0ba" default))) '(package-selected-packages (quote - (company-math latex-preview-pane auctex zenburn-theme org flycheck-pos-tip flycheck rtags racket-mode geiser auto-package-update use-package pdf-tools org-bullets x86-lookup ztree yasnippet workgroups2 volatile-highlights undo-tree srefactor smartparens nyan-mode magit ibuffer-vc helm-projectile guide-key ggtags diff-hl company-c-headers clean-aindent-mode)))) + (company-math latex-preview-pane auctex zenburn-theme org flycheck-pos-tip flycheck rtags racket-mode geiser auto-package-update use-package pdf-tools org-bullets x86-lookup ztree yasnippet workgroups2 volatile-highlights undo-tree srefactor smartparens nyan-mode magit ibuffer-vc helm-projectile ggtags diff-hl company-c-headers clean-aindent-mode)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. -- Gitblit v1.9.3