Clean up config

diff --git a/config/erc.el b/config/erc.el
index c7268ca428777b13603e1fb2829ed11f3927547b..7fc1ad39f6c18dd350a42eb0095026bfe24f59de 100644 (file)
--- a/config/erc.el
+++ b/config/erc.el
@@ -1,12 +1,6 @@
 (message "Starting ERC IRC Client")
 (require 'erc)
 
-;; Colorfull nicknames
-(and
- (require 'erc-highlight-nicknames)
- (add-to-list 'erc-modules 'highlight-nicknames)
- (erc-update-modules))
-
 (setq erc-autojoin-channels-alist
 ; Uni Erlangen / IRCnet
          '(("uni-erlangen.de"

diff --git a/config/fonts.el b/config/fonts.el
new file mode 100644 (file)
index 0000000..00ade02
--- /dev/null
+++ b/config/fonts.el
@@ -0,0 +1,2 @@
+(add-to-list 'default-frame-alist '(font . "Source Code Pro-9"))
+(set-face-attribute 'default t :font "Source Code Pro-9")

diff --git a/config/general.el b/config/general.el
index 1a80a6d7f473435cf7722caac53a73b0b5789600..969afe7cf076121782d1050b56d2186dc4121e88 100644 (file)
--- a/config/general.el
+++ b/config/general.el
@@ -30,30 +30,19 @@
   (indent-region (point-min) (point-max) nil)
   (untabify (point-min) (point-max)))
 
-(when (>= emacs-major-version 23)
-  (global-linum-mode 1)
-  (setq linum-format "%3d")
-  (modify-all-frames-parameters
-     '((font . "DejaVu Sans Mono-9"))))
-
-;; Django template mode
-(when (locate-library "django-html-mode")
-  (require 'django-html-mode)
-  (message "Django HTML Mode available"))
+(global-linum-mode 1)
+(setq linum-format "%3d")
 
 ;; Some file extensions autoloading
 (add-to-list 'auto-mode-alist '("\\.mdn$" . markdown-mode))
-(add-to-list 'auto-mode-alist '("\\.dtpl$" . django-html-mode))
 
-(setq browse-url-generic-program (executable-find "midori")
+(setq browse-url-generic-program (executable-find "conkeror")
          browse-url-browser-function 'browse-url-generic)
 
 (global-set-key (kbd "C-x d") 'dired)
 
 (set-input-method "german-postfix")
 
-(load-file "/home/christoph/.emacs.d/rudel/rudel-loaddefs.el")
-
 (winner-mode)
 
 (defun paste-x-selection ()
@@ -63,12 +52,3 @@
     (yank)))
 (global-set-key (kbd "<XF86Paste>") 'paste-x-selection)
 (global-set-key (kbd "C-S-<insert>") 'paste-x-selection)
-
-
-(defun paste-x-selection ()
-  (interactive)
-  (let ((x-select-enable-primary t)
-        (x-select-enable-clipboard nil))
-    (yank)))
-(global-set-key (kbd "<XF86Paste>") 'paste-x-selection)
-(global-set-key (kbd "C-S-<insert>") 'paste-x-selection)

diff --git a/config/yas.el b/config/yas.el
index e309c49dc143a7650c7fe1452afd6c5799d21faf..2eb1e1f8281d5789e067a4982c4d8b530b5c8d5c 100644 (file)
--- a/config/yas.el
+++ b/config/yas.el
@@ -1,5 +1,6 @@
 (require 'yasnippet)
-(yas/initialize)
 
-(setq yas/root-directory '("~/proj/snipets"))
-(mapc 'yas/load-directory yas/root-directory)
+(setq yas-snippet-dirs '("~/proj/snippets"))
+
+(yas-global-mode 1)
+

diff --git a/emacs b/emacs
index 8e678e707d4bfd50e575936441a0e3fec6d1d481..f0dab4b877915ceabc8ca5eedaf1b9db8d7940a3 100644 (file)
--- a/emacs
+++ b/emacs
@@ -9,17 +9,16 @@
 (setq custom-file "~/.emacs.d/emacs-custom.el")
 (load custom-file)
 
-(dolist (file-to-load '("yas.el"
+(dolist (file-to-load '("fonts.el"
+                        "yas.el"
                         "python.el"
                         "c.el"
                         "irony.el"
                         "org.el"
-                        "vamos.el"
                         "slime.el"
                         "whitespace.el"
                         "general.el"
                         "jabber.el"
                         "erc.el"
-                        "identica.el"
                         "pastebin.el"))
   (load-file (concat emacs-private-config file-to-load)))