Some bugfixes

3 files changed, 8 insertions, 6 deletions

diff --git a/init-bindings.el b/init-bindings.el
index 17c568c0ea73..9a4157ba193e 100644
--- a/init-bindings.el
+++ b/init-bindings.el
@@ -69,5 +69,7 @@
 (define-key cider-mode-map (kbd "C-c C-d") 'ac-cider-compliment-popup-doc)
 (define-key cider-mode-map (kbd "C-c D") 'cider-doc)
 
+;; Org-mode agenda keys
+(global-set-key (kbd "C-c a") 'org-agenda)
 
 (provide 'init-bindings)
diff --git a/init-custom.el b/init-custom.el
index 99a6876fc493..5ad8ebe983b9 100644
--- a/init-custom.el
+++ b/init-custom.el
@@ -5,12 +5,13 @@
  ;; If there is more than one, they won't work right.
  '(ac-auto-show-menu 0.8)
  '(ac-delay 0.2)
+ '(custom-safe-themes (quote ("6e92ca53a22d9b0577ad0b16e07e2e020c8b621197e39fec454048e51b7954cb" default)))
  '(frame-brackground-mode (quote dark))
  '(global-auto-complete-mode t)
  '(ns-alternate-modifier (quote none))
  '(ns-command-modifier (quote meta))
- '(require-final-newline (quote visit-save))
- '(sml/override-theme nil))
+ '(org-agenda-files (quote ("~/source/spotify-puppet/modules/jira/TODO.org")))
+ '(require-final-newline (quote visit-save)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/init-settings.el b/init-settings.el
index 7f239bbde6d6..d432adb382db 100644
--- a/init-settings.el
+++ b/init-settings.el
@@ -62,10 +62,6 @@
     (setq x-super-keysym 'meta
           x-alt-keysym 'alt))
 
-;; Fix mode line
-(if after-init-time (sml/setup)
-  (add-hook 'after-init-hook 'sml/setup))
-
 (setq smex-save-file (concat user-emacs-directory ".smex-items"))
 (setq smex-key-advice-ignore-menu-bar t)
 (smex-initialize)
@@ -234,4 +230,7 @@
 
 (remove-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function)
 
+;; Set up Java home & path
+(setenv "JAVA_HOME" "/opt/java")
+
 (provide 'init-settings)