summaryrefslogtreecommitdiff
path: root/init.el
diff options
context:
space:
mode:
Diffstat (limited to 'init.el')
-rw-r--r--init.el53
1 files changed, 1 insertions, 52 deletions
diff --git a/init.el b/init.el
index f48bb69..9d3c9c3 100644
--- a/init.el
+++ b/init.el
@@ -217,9 +217,6 @@
(desktop-save-mode t)
-;; use cat as the pager in shell mode, because shell-mode is not an ANSI terminal
-(setenv "PAGER" "cat")
-
;; ediff settings
(setq ediff-diff-options "-w")
@@ -291,59 +288,11 @@
;; delete up to non-whitespace character
(global-set-key (kbd "C-c C-d") 'hungry-delete-forward)
-(require 'eshell)
-(require 'shell-switcher)
-(setq shell-switcher-mode t)
-(add-hook 'eshell-mode-hook 'shell-switcher-manually-register-shell)
-(setq eshell-history-size 10000)
-
(load "email.el")
(require 'rekado-mode)
(rekado-mode 1)
-;; author: KaiGrossjohann on EmacsWiki
-(defun eshell/ff (&rest args)
- "Invoke `find-file' on the file.
- \"ff +42 foo\" also goes to line 42 in the buffer."
- (while args
- (if (string-match "\\`\\+\\([0-9]+\\)\\'" (car args))
- (let* ((line (string-to-number (match-string 1 (pop args))))
- (file (pop args)))
- (find-file file)
- (goto-line line))
- (find-file (pop args)))))
-
-
-;; convenience functions to input the remote root/home dir when in a
-;; directory on a remote host
-(defun my/tramp-root ()
- "Print root directory on the remote host."
- (interactive)
- (let ((pieces (split-string (eshell/pwd) ":/")))
- (insert-string (if (> (length pieces) 1)
- (concat (car pieces) ":/")
- "/"))))
-
-(defun my/tramp-home ()
- "Print home directory path on the remote host."
- (interactive)
- (let ((pieces (split-string (eshell/pwd) ":/")))
- (insert-string (if (> (length pieces) 1)
- (concat (car pieces) ":~/")
- "~/"))))
-
-(add-hook 'eshell-mode-hook
- '(lambda () (define-key eshell-mode-map (kbd "C-c /") 'my/tramp-root)))
-(add-hook 'eshell-mode-hook
- '(lambda () (define-key eshell-mode-map (kbd "C-c ~") 'my/tramp-home)))
-
-
-
-;; start a hidden eshell on startup
-(add-hook 'emacs-startup-hook #'(lambda ()
- (let ((default-directory (getenv "HOME")))
- (command-execute 'eshell)
- (bury-buffer))))
+(load "init-eshell.el")
;; start in fullscreen mode
(add-hook 'emacs-startup-hook (lambda () (fullscreen-mode-fullscreen)))