conf/dkellner-company.el

@@ -5,7 +5,7 @@
 (use-package company
   :config
   (global-company-mode)
-  (setq company-idle-delay 0.2)
+  (setq company-idle-delay 0.5)
   (setq company-dabbrev-downcase nil)
   (use-package company-quickhelp
     :config

conf/dkellner-eshell.el

@@ -0,0 +1,11 @@
+;; dkellner-eshell.el --- EShell configuration
+
+(add-hook 'eshell-first-time-mode-hook #'dkellner/setup-eshell)
+
+(defun dkellner/setup-eshell ()
+  (add-to-list 'eshell-visual-commands "mysql")
+  (add-to-list 'eshell-visual-commands "mplayer")
+  (add-to-list 'eshell-visual-commands "mutt-dkellner")
+  (add-to-list 'eshell-visual-commands "mutt-puzzleandplay"))
+
+(provide 'dkellner-eshell)

conf/dkellner-ivy.el

@@ -15,7 +15,9 @@
 (use-package counsel
   :bind (("M-x" . counsel-M-x)
          ("M-y" . counsel-yank-pop)
-         ("C-x C-f" . counsel-find-file)))
+         ("C-x C-f" . counsel-find-file))
+  :config
+  (setcdr (assoc 'counsel-M-x ivy-initial-inputs-alist) ""))
 
 (use-package swiper
   :bind ("C-s" . swiper))

conf/dkellner-misc.el

@@ -6,10 +6,6 @@
 (setq-default indent-tabs-mode nil)
 (setq-default fill-column 79)
 
-;; Keep a scroll margin of 5 lines:
-(setq scroll-conservatively 101)
-(setq scroll-margin 5)
-
 ;; Remove trailing whitespace on save:
 (add-hook 'before-save-hook #'delete-trailing-whitespace)
 
@@ -88,6 +84,11 @@ point reaches the beginning or end of the buffer, stop there."
   :config
   (add-hook 'yaml-mode-hook #'highlight-indentation-current-column-mode))
 
+(use-package which-key
+  :config
+  (which-key-mode)
+  :diminish which-key-mode)
+
 (setq term-ansi-default-program "/usr/bin/zsh")
 (setq browse-url-browser-function #'browse-url-firefox)
 

conf/dkellner-org.el

@@ -117,4 +117,12 @@
 
 (add-hook 'org-mode-hook (lambda () (auto-fill-mode 1)))
 
+(use-package org-pomodoro
+  :bind ("C-c p" . org-pomodoro)
+  :config
+  (setq org-pomodoro-format "● %s"
+        org-pomodoro-short-break-format "◔ %s"
+        org-pomodoro-long-break-format "◕ %s"
+        org-pomodoro-audio-player "aplay"))
+
 (provide 'dkellner-org)

conf/dkellner-ui.el

@@ -18,6 +18,7 @@
 
 (setq visible-bell t)
 (setq inhibit-startup-message t)
+(setq initial-scratch-message nil)
 
 (menu-bar-mode -1)
 (tool-bar-mode -1)

init.el

@@ -1,5 +1,10 @@
 ;; init.el --- Emacs configuration of Dominik Kellner <dkellner@dkellner.de>
 
+;; This file is used to store user customization variables.
+(setq custom-file (expand-file-name "custom.el" user-emacs-directory))
+(when (file-exists-p custom-file)
+  (load custom-file))
+
 ;; Configure the package manager and make sure `use-package' is installed.
 ;; I use it to tidy the rest of my configuration.
 (require 'package)
@@ -10,7 +15,7 @@
 (unless (package-installed-p 'use-package)
   (package-refresh-contents)
   (package-install 'use-package))
-(setq use-package-verbose t)
+(require 'use-package)
 (setq use-package-always-ensure t)
 
 ;; Make sure the following packages are available as I use them in my configs.
@@ -28,9 +33,10 @@
 (require 'dkellner-elisp)
 (require 'dkellner-email)
 (require 'dkellner-engine-mode)
+(require 'dkellner-eshell)
+(require 'dkellner-git)
 (require 'dkellner-haskell)
 (require 'dkellner-ivy)
-(require 'dkellner-git)
 (require 'dkellner-misc)
 (require 'dkellner-nix)
 (require 'dkellner-org)
@@ -45,9 +51,4 @@
 (require 'dkellner-web-mode)
 (require 'dkellner-windows-and-navigation)
 
-;; This file is used to store user customization variables.
-(setq custom-file (expand-file-name "custom.el" user-emacs-directory))
-(when (file-exists-p custom-file)
-  (load custom-file))
-
 (provide 'init)