Commit f86911c5 authored by Victor A. Stoichiţă's avatar Victor A. Stoichiţă
Browse files

fixup! replace disputed keys for windmove

parent 1be73f4b
......@@ -5,15 +5,6 @@
("org" . "https://orgmode.org/elpa/")))
(package-initialize)
;;;; External configs
(add-to-list 'load-path (directory-file-name "~/.emacs.d/site-lisp"))
(cd (expand-file-name "~/.emacs.d"))
(load-file "orgmode_init.el")
(load-file "mu4e_init.el")
(load-file "bib_init.el")
(load-file (expand-file-name "python_init.el"))
(load-file (expand-file-name "web_init.el"))
;;;; Put variables set by customize out of the way
(setq custom-file (expand-file-name "customize.el" user-emacs-directory))
(when (file-exists-p custom-file)
......@@ -235,12 +226,9 @@ deleted or iconified, according to option `frame-auto-hide-function'."
(quit-window-delete))
;;;; Window shortcuts
(global-set-key (kbd "<insert>") 'delete-other-windows)
;; Need to restate it for mu which otherwise overwrites it
(with-eval-after-load 'mu4e
(define-key 'mu4e-headers-mode-map (kbd "<insert>") 'delete-other-windows))
(global-set-key (kbd "C-%") 'delete-other-windows)
(winner-mode 1)
(global-set-key (kbd "S-<insert>") 'winner-undo)
(global-set-key (kbd "C-=") 'winner-undo)
(global-set-key (kbd "C-«") 'split-window-below)
(global-set-key (kbd "C-»") 'split-window-right)
(global-set-key (kbd "S-<f12>") 'quit-next-window-delete)
......@@ -248,9 +236,11 @@ deleted or iconified, according to option `frame-auto-hide-function'."
(global-set-key (kbd "<home>") (lambda () (interactive) (other-window -1)))
(global-set-key (kbd "<end>") (lambda () (interactive) (other-window 1)))
;;;; Windmove
(when (fboundp 'windmove-default-keybindings)
(windmove-default-keybindings))
(setq org-replace-disputed-keys t) ; must set this BEFORE org-mode is loaded
;;;; Buffer shortcuts
(global-set-key (kbd "C-ê") 'previous-buffer)
......@@ -287,11 +277,6 @@ deleted or iconified, according to option `frame-auto-hide-function'."
(tool-bar-mode -1) ;turn off toolbar
(scroll-bar-mode -1) ;turn off scrollbar
;;;; Olivetti mode
(define-key org-mode-map (kbd "C-x <f11>") 'olivetti-mode)
(define-key mu4e-view-mode-map (kbd "C-x <f11>") 'olivetti-mode)
(define-key mu4e-compose-mode-map (kbd "C-x <f11>") 'olivetti-mode)
;;; OUTLINE MODE
(add-hook 'emacs-lisp-mode-hook (lambda ()
(set (make-local-variable 'outline-regexp) ";;;[;]*")))
......@@ -397,7 +382,6 @@ deleted or iconified, according to option `frame-auto-hide-function'."
(global-set-key (kbd "C-c t") 'counsel-load-theme)
(global-set-key (kbd "C-c F") 'counsel-org-file)
;;;; Ivy-bibtex
(autoload 'ivy-bibtex "ivy-bibtex" "" t)
;; ivy-bibtex requires ivy's `ivy--regex-ignore-order` regex builder, which
......@@ -518,6 +502,22 @@ deleted or iconified, according to option `frame-auto-hide-function'."
(setq eww-search-prefix "https://duckduckgo.com/?q=")
;;; FINALLY
;;;; Load External configs
(add-to-list 'load-path (directory-file-name "~/.emacs.d/site-lisp"))
(cd (expand-file-name "~/.emacs.d"))
(load-file "orgmode_init.el")
(load-file "mu4e_init.el")
(load-file "bib_init.el")
(load-file (expand-file-name "python_init.el"))
(load-file (expand-file-name "web_init.el"))
;;;; Olivetti mode
;; Loaded here for maps in external configs
(define-key org-mode-map (kbd "C-x <f11>") 'olivetti-mode)
(define-key mu4e-view-mode-map (kbd "C-x <f11>") 'olivetti-mode)
(define-key mu4e-compose-mode-map (kbd "C-x <f11>") 'olivetti-mode)
(cd (expand-file-name "~"))
;; Local Variables:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment