diff --git a/home-manager/software/emacs/emacs.d/init.el b/home-manager/software/emacs/emacs.d/init.el
index a8220c8..39212ea 100644
--- a/home-manager/software/emacs/emacs.d/init.el
+++ b/home-manager/software/emacs/emacs.d/init.el
@@ -4,13 +4,72 @@
 ;; You may delete these explanatory comments.
 (package-initialize)
 
-(setq vc-follow-symlinks t);; always follow symlinks
+;; My details
+(setq user-full-name "Andreas Zweili")
+(setq user-mail-address "andreas@zweili.ch")
 
 ;; keep customize settings in their own file
 (setq custom-file "~/.emacs.d/custom.el")
 (when (file-exists-p custom-file)
   (load custom-file))
 
+;; always follow symlinks
+(setq vc-follow-symlinks t)
+
+;; Spaces instead of TABs
+(setq-default indent-tabs-mode nil)
+(setq-default tab-width 4)
+(setq indent-line-function 'insert-tab)
+
+;; Enable hippie expand on M-Space. It helps with path completion and more
+(global-set-key "\M- " 'hippie-expand)
+
+;; file encodings
+(prefer-coding-system 'utf-8-unix)
+
+;; Save temp files in the OS temp directory. Otherwise they clutter up the
+;; current working directory
+(setq backup-directory-alist
+      `((".*" . ,temporary-file-directory)))
+(setq auto-save-file-name-transforms
+      `((".*" ,temporary-file-directory t)))
+
+;; initial buffers should use text-mode
+(setq-default major-mode 'text-mode)
+
+;; insert only one space after a period
+(setq sentence-end-double-space nil)
+
+;; Enable line wrapping
+(add-hook 'text-mode-hook 'turn-on-auto-fill)
+;; line length
+(setq-default fill-column 79)
+
+;; Supress "ad-handle-definition: `tramp-read-passwd' got redefined" message at
+;; start.
+(setq ad-redefinition-action 'accept)
+
+;; Remove whitespace when saving
+(add-hook 'before-save-hook 'whitespace-cleanup)
+
+;; Refresh buffers if the file changes on disk
+(global-auto-revert-mode t)
+
+(setq history-delete-duplicates t)
+
+;; enable mouse support in the terminal
+(xterm-mouse-mode 1)
+
+;; Disable electric indents
+(add-hook 'text-mode-hook (lambda () (electric-indent-local-mode -1)))
+
+;; Make the tab completion behave like in Bash.
+(add-hook 'eshell-mode-hook
+          (lambda ()
+            (setq pcomplete-cycle-completions nil)))
+
+;; For better performance use "ssh" instead of "scp"
+(setq tramp-default-method "ssh")
 (defun config-path (config)
   (setq emacs-config-dir "~/.nixos/home-manager/software/emacs/emacs.d/lib/")
   (concat emacs-config-dir config))
diff --git a/home-manager/software/emacs/emacs.d/lib/loader.el b/home-manager/software/emacs/emacs.d/lib/loader.el
deleted file mode 100644
index 652e72a..0000000
--- a/home-manager/software/emacs/emacs.d/lib/loader.el
+++ /dev/null
@@ -1,56 +0,0 @@
-;; My details
-(setq user-full-name "Andreas Zweili")
-(setq user-mail-address "andreas@zweili.ch")
-
-;; Spaces instead of TABs
-(setq-default indent-tabs-mode nil)
-(setq-default tab-width 4)
-(setq indent-line-function 'insert-tab)
-
-;; Enable hippie expand on M-Space. It helps with path completion and more
-(global-set-key "\M- " 'hippie-expand)
-
-;; file encodings
-(prefer-coding-system 'utf-8-unix)
-
-;; Save temp files in the OS temp directory. Otherwise they clutter up the
-;; current working directory
-(setq backup-directory-alist
-      `((".*" . ,temporary-file-directory)))
-(setq auto-save-file-name-transforms
-      `((".*" ,temporary-file-directory t)))
-
-;; initial buffers should use text-mode
-(setq-default major-mode 'text-mode)
-
-;; insert only one space after a period
-(setq sentence-end-double-space nil)
-
-;; Enable line wrapping
-(add-hook 'text-mode-hook 'turn-on-auto-fill)
-;; line length
-(setq-default fill-column 79)
-
-;; Supress "ad-handle-definition: `tramp-read-passwd' got redefined" message at
-;; start.
-(setq ad-redefinition-action 'accept)
-
-;; Remove whitespace when saving
-(add-hook 'before-save-hook 'whitespace-cleanup)
-
-;; Refresh buffers if the file changes on disk
-(global-auto-revert-mode t)
-
-(setq history-delete-duplicates t)
-
-;; enable mouse support in the terminal
-(xterm-mouse-mode 1)
-
-(add-hook 'text-mode-hook (lambda () (electric-indent-local-mode -1)))
-
-(add-hook 'eshell-mode-hook
-          (lambda ()
-            (setq pcomplete-cycle-completions nil)))
-
-;; For better performance use "ssh" instead of "scp"
-(setq tramp-default-method "ssh")