1 files changed, 2 insertions, 57 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 587b023..9cbb79d 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -15,6 +15,8 @@
   (require 'magit)
   (require 'yasnippet))
 
+(load (concat user-emacs-directory "init2"))
+
 ;;;; Autoloads
 
 (autoload 'jabber-connect "jabber" nil t)
@@ -110,24 +112,6 @@ MODE1 is enabled and vice-versa."
        (add-hook ',(intern (concat mode1-name "-hook"))
                  #',function-name))))
 
-(defmacro oni:stumpwm (&rest body)
-  "Execute BODY in stumpwm."
-  (declare (indent 0))
-  `(call-process oni:stumpish-program nil nil nil
-                 ,(format "eval '%S'" `(progn ,@body))))
-
-(defmacro oni:turn-off (&rest modes)
-  "Turn off each mode in MODES."
-  (declare (indent 0))
-  `(progn ,@(mapcar (lambda (m) `(,m -1)) modes)))
-
-;;;; Variables
-
-(defvar oni:stumpish-program
-  (expand-file-name
-   "~/.local/share/quicklisp/local-projects/stumpwm/contrib/stumpish")
-  "The location of the stumpish executable.")
-
 ;;;;; Vacuous
 
 (defvar elnode-do-init)
@@ -195,11 +179,6 @@ MODE1 is enabled and vice-versa."
         (funcall regfunc (point) (- (point) num))
       (funcall wordfunc -1))))
 
-(defun oni:close-client-window ()
-  "Close a client's frames."
-  (interactive)
-  (server-save-buffers-kill-terminal nil))
-
 (defun oni:css-mode-func ()
   "Function for `css-mode-hook'."
   (local-set-key "\C-j" 'oni:newline-and-indent))
@@ -769,10 +748,6 @@ If no direction is given, don't split."
   (interactive)
   (kill-process "python-test-mail-server"))
 
-(defun oni:stumpwm-command (cmd)
-  "Execute CMD in stumpwm."
-  (call-process oni:stumpish-program nil nil nil cmd))
-
 (defun oni:switch-to-other-buffer ()
   "Switch to the most recently viewed buffer."
   (interactive)
@@ -814,26 +789,6 @@ If no direction is given, don't split."
       (when (file-exists-p loaddefs)
         (load loaddefs)))))
 
-;;;;; Advice
-
-(defadvice org-agenda-redo (after ext:org-agenda-redo-add-appts)
-  "Pressing `r' on the agenda will also add appointments."
-  (progn
-    (setq appt-time-msg-list nil)
-    (org-agenda-to-appt)))
-
-(defadvice term-handle-exit (after oni:kill-buffer-after-exit activate)
-  "Kill the term buffer if the process finished."
-  (kill-buffer (current-buffer)))
-
-(defadvice windmove-do-window-select
-    (around oni:windmove-stumpwm activate)
-  "If no window can be moved to, move stumpwm."
-  (condition-case err
-      ad-do-it
-    (error (oni:stumpwm-command
-            (format "move-focus %s" (ad-get-arg 0))))))
-
 ;;;; Modes
 
 ;; Copied from electric.el, modified from `electric-indent-local-mode'.
@@ -1384,21 +1339,11 @@ If no direction is given, don't split."
 (global-set-key (kbd "\"") 'oni:self-insert-dwim)
 (global-set-key [remap move-beginning-of-line] #'oni:move-beginning-of-dwim)
 
-(if (daemonp)
-    (global-set-key "\C-x\C-c" 'oni:close-client-window))
-
-(when (or window-system (daemonp))
-  (global-unset-key "\C-z"))
-
 ;;;; Misc modes
 
 (oni:enable '(downcase-region narrow-to-page narrow-to-region scroll-left
               upcase-region))
 
-(oni:turn-off
-  menu-bar-mode scroll-bar-mode tool-bar-mode blink-cursor-mode
-  column-number-mode line-number-mode tooltip-mode)
-
 (oni:link-modes outline-minor-mode persistent-outline-mode)
 (oni:exclude-modes magit-blame-mode fci-mode)