Conditionalize emacs startup snippets

[dotfiles/emacs.git] / config / general.el

diff --git a/config/general.el b/config/general.el
index 969afe7cf076121782d1050b56d2186dc4121e88..76eba1a07e4266cd9d35449ff25d172f9ad2726c 100644 (file)
--- a/config/general.el
+++ b/config/general.el
@@ -1,5 +1,9 @@
 (message "General emacs setup")
 
+(if window-system
+    (tool-bar-mode -1))
+(setq inhibit-startup-message t)
+
 ;; Indentation
 (setq tab-width 4)
 (setq-default tab-width 4)
@@ -14,9 +18,11 @@
 (require 'uniquify)
 (setq uniquify-buffer-name-style 'post-forward)
 
-(require 'auto-complete)
+(if (locate-library "auto-complete")
+    (require 'auto-complete))
 
-(require 'magit)
+(if (locate-library "auto-complete")
+    (require 'magit))
 
 ;; Ido mode
 (require 'ido)
@@ -52,3 +58,9 @@
     (yank)))
 (global-set-key (kbd "<XF86Paste>") 'paste-x-selection)
 (global-set-key (kbd "C-S-<insert>") 'paste-x-selection)
+
+
+(if (locate-library "dired-narrow")
+    (progn
+      (require 'dired-narrow)
+      (define-key dired-mode-map "/" 'dired-narrow)))