X-Git-Url: https://iankelling.org/git/?p=dot-emacs;a=blobdiff_plain;f=init.el;h=6b9094f3983550ebbb26f913042eacc58772cff5;hp=5ba8428531ba7fe76d244bcc98e56f2947ab84e5;hb=a26bf7fee70786c51a4a0a9485212c6430d02f6b;hpb=ce22c70988875fcbcdf4dccaf2855770926d087d diff --git a/init.el b/init.el index 5ba8428..6b9094f 100644 --- a/init.el +++ b/init.el @@ -39,8 +39,8 @@ ;; emacs -f benchmark-init/show-durations-tree ;; to catch things post-init ;; emacs -f benchmark-init/deactivate - ;;(require 'benchmark-init) - ;;(add-hook 'after-init-hook 'benchmark-init/deactivate) + (require 'benchmark-init) + (add-hook 'after-init-hook 'benchmark-init/deactivate) ;; ;; these need to be done before the hook in order to satisfy the byte compiler or batch mode @@ -481,7 +481,7 @@ Fourth argument TYPE is the custom option type." ;; mu4e has a bug right now, undo breaks when saving drafts (not (string= (buffer-file-name) "*draft*")) (buffer-modified-p) - (not (org-src-edit-buffer-p))) + (not (and (boundp 'org-src-edit-buffer-p) (org-src-edit-buffer-p)))) ;; serial is incremented on each save, so let's do a bit less of them (not (derived-mode-p 'dns-mode)) (setq my-auto-save-last last) @@ -969,7 +969,7 @@ and Ian Kelling as the name" ;; and git will automatically remove it unless i manually disable it. mail-signature " --- +-- Ian Kelling | Senior Systems Administrator, Free Software Foundation GPG Key: B125 F60B 7B28 7FF6 A2B7 DF8F 170A F0E2 9542 95DF https://fsf.org | https://gnu.org @@ -1433,7 +1433,7 @@ https://fsf.org | https://gnu.org (defun gtags-update-hook() "Update GTAGS file incrementally upon saving a file" - (when (and ggtags-mode ggtags-project-root) + (when (and (boundp 'ggtags-mode) ggtags-mode ggtags-project-root) (gtags-update-current-file))) (add-hook 'after-save-hook 'gtags-update-hook) @@ -1506,7 +1506,7 @@ https://fsf.org | https://gnu.org ;; show the name of the current function definition in the modeline - (require 'which-func) + ;;(require 'which-func) (setq which-func-modes t) (which-function-mode 1) @@ -1560,19 +1560,7 @@ https://fsf.org | https://gnu.org (define-key Info-mode-map [mouse-4] nil) (define-key Info-mode-map [mouse-5] nil)) - (eval-after-load "info" '(my-info-init)) - - (require 'smooth-scroll) - ;; long gnus summary buffers lags too much with this, - ;; but I like it enough to leave it enabled by default - ;; and crank up the step size to be faster - ;; and it doesn't have a way to enable it only for certain modes etc. - ;; todo sometime, make it work for certain modes only - (smooth-scroll-mode t) - ;; its too slow with the default of 2 - (setq smooth-scroll/vscroll-step-size 7) - ;; sublimity doesn't work as good going fast by default - ;; smooth-scrolling.el, does not do smooth scrolling. its about cursor location + (add-hook 'info-mode-hook 'my-info-init) (setq sh-here-document-word "'EOF'") @@ -1671,6 +1659,18 @@ https://fsf.org | https://gnu.org imenu-auto-rescan t indicate-empty-lines t) ; mark end of buffer + (require 'smooth-scroll) + ;; long gnus summary buffers lags too much with this, + ;; but I like it enough to leave it enabled by default + ;; and crank up the step size to be faster + ;; and it doesn't have a way to enable it only for certain modes etc. + ;; todo sometime, make it work for certain modes only + (smooth-scroll-mode t) + ;; its too slow with the default of 2 + (setq smooth-scroll/vscroll-step-size 7) + ;; sublimity doesn't work as good going fast by default + ;; smooth-scrolling.el, does not do smooth scrolling. its about cursor location + (blink-cursor-mode '(-4)) (menu-bar-mode -1) @@ -2224,7 +2224,9 @@ indent yanked text (with prefix arg don't indent)." ;; todo, testout these mode specific settings from graphene. ;; Ruby-specific pairs and handlers - (require 'smartparens-ruby) + + (eval-after-load "ruby" + '(require 'smartparens-ruby)) ;; Markdown (sp-local-pair '(markdown-mode gfm-mode) "*" "*" @@ -2235,13 +2237,8 @@ indent yanked text (with prefix arg don't indent)." (sp-local-pair 'html-mode "\"" nil :unless '(:rem sp-point-after-word-p)) -;;; smex - ;; todo; check out smex-show-unbound-commands shows frequently used commands that have no key bindings. - ; these must be before smex-initialize - (setq - smex-save-file "~/.emacs.d/.smex-items") - (smex-initialize) + ;;; spell correction (setq ispell-program-name "hunspell" @@ -2363,6 +2360,7 @@ indent yanked text (with prefix arg don't indent)." (dolist (r `( (?i (file . ,"~/.emacs.d/init.el")) + (?w (file . ,"/a/work.org")) (?t (file . ,"/a/t.org")) (?x (file . ,"/a/x.txt")) )) @@ -2375,6 +2373,12 @@ indent yanked text (with prefix arg don't indent)." ;;; keybinds ;;;; misc + + (define-prefix-command 'terminal-key-map) + (global-set-key (kbd "\e[") 'terminal-key-map) + + + (global-set-key (kbd "C-x C-b") 'ibuffer) @@ -2806,8 +2810,10 @@ modes like org-mode which have their own yank function." (global-set-key (kbd "C-M-q") 'quoted-insert) -;;;;; C-w --- - ;; in terminal, it's ctrl-backspace, duplicate keybind. +;;;;; C-w + + (global-set-key (kbd "C-w") 'counsel-find-file) + ;;;;; M-w org-clock-in (global-set-key (kbd "M-w") 'org-clock-in) @@ -2990,9 +2996,16 @@ modes like org-mode which have their own yank function." (global-set-key (kbd "C-s") 'kill-region) -;;;;; M-x - smex +;;;;; M-x - counsel-m-x - (global-set-key (kbd "M-x") 'smex) + + ;; todo; check out smex-show-unbound-commands shows frequently used commands that have no key bindings. + ;; this must be before smex-initialize + (setq + smex-save-file "~/.emacs.d/.smex-items") + + ;; this uses smex + (global-set-key (kbd "M-x") 'counsel-M-x) ;;;;; C-M-x - cut-to-register @@ -3126,6 +3139,9 @@ modes like org-mode which have their own yank function." ;;;;; C-backspace - backward-kill-symbol + (define-key terminal-key-map (kbd "4b") 'backward-kill-symbol) ;c-backspace in my konsole + + ;; c-w is duplicate in terminal (global-set-key (kbd "") 'backward-kill-symbol) (add-hook 'comint-mode-hook (lambda () @@ -3196,7 +3212,8 @@ modes like org-mode which have their own yank function." (delete-windows-on "*Help*") )) -;;;;; C-i - ----- +;;;;; C-i - + (define-key input-decode-map [?\C-i] [C-i]) ;;;;; C-M-i - query-replace-regexp (global-set-key (kbd "C-M-i") 'query-replace-regexp) @@ -3233,9 +3250,10 @@ modes like org-mode which have their own yank function." (org-show-context 'mark-goto))) (global-set-key (kbd "C-j") 'my-pop-to-mark-command) - (define-key ido-common-completion-map (kbd "C-j") 'ido-select-text) (add-hook 'ido-setup-hook - (lambda () (define-key ido-common-completion-map (kbd "C-j") 'ido-select-text))) + (lambda () + (define-key ido-common-completion-map (kbd "C-j") 'ido-select-text) + )) (add-hook 'lisp-interaction-mode-hook (lambda () (define-key lisp-interaction-mode-map (kbd "C-j") nil))) @@ -3286,13 +3304,16 @@ modes like org-mode which have their own yank function." (move-beginning-of-line 2)) (global-set-key (kbd "C-M-;") 'comment-current-line-dwim) +;;;;; C-m +(define-key input-decode-map [?\C-m] [C-m]) ;;;;; C-M-m - recursive grep (define-key global-map (kbd "C-M-m") 'rgrep) -;;;;; C-, - counsel-find-file +;;;;; C-, - --- +;; not recognized by terminal, can't get konsole keydef file to recognize comma, +;; todo: dig into konsole sources, or try newer version than t8 - (global-set-key (kbd "C-,") 'counsel-find-file) (add-hook 'flyspell-mode-hook (lambda () (define-key flyspell-mode-map (kbd "C-,") nil))) @@ -3325,6 +3346,7 @@ modes like org-mode which have their own yank function." (add-hook 'flyspell-mode-hook (lambda () (define-key flyspell-mode-map (kbd "C-.") nil))) (define-key dot-mode-map (kbd "C-.") nil) + (define-key terminal-key-map (kbd "4c") 'recentf-ido-find-file) (global-set-key (kbd "C-.") 'recentf-ido-find-file) (add-hook 'php-mode-hook (lambda () (define-key php-mode-map (kbd "C-.") nil))) @@ -3426,6 +3448,7 @@ modes like org-mode which have their own yank function." ;;;;; C-S-down-arrow - m-x for major mode +;; todo, update this for ivy (global-set-key (kbd "") 'smex-major-mode-commands) ;;;;; C-lbracket - ---- @@ -3459,15 +3482,6 @@ modes like org-mode which have their own yank function." (global-set-key (kbd "") 'plain-newline) -;;;;; C-M-return - newline-anywhere-previous - (defun newline-anywhere-previous () - "Add a newline from anywhere in the line." - (interactive) - (forward-line -1) - (end-of-line) - (newline-and-indent)) - (global-set-key (kbd "") 'newline-anywhere-previous) - ;;;;; C-space - org-edit-special ;; commented due to new keyboard needing ctrl-space for mark