summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.el15
-rw-r--r--settings/sane-defaults.el5
-rw-r--r--settings/setup-org-mode.el16
3 files changed, 31 insertions, 5 deletions
diff --git a/init.el b/init.el
index 9eb9f95..79d9ecf 100644
--- a/init.el
+++ b/init.el
@@ -1,11 +1,10 @@
-;; Suppress splash screen
-
;; Added by Package.el. This must come before configurations of
;; installed packages. Don't delete this line. If you don't want it,
;; just comment it out by adding a semicolon to the start of the line.
;; You may delete these explanatory comments.
(package-initialize)
+;; Suppress splash screen
(setq inhibit-startup-message t)
(setq settings-dir
@@ -23,9 +22,14 @@
;; Are we on a mac?
(setq is-mac (equal system-type 'darwin))
+;; Are we in gui or terminal?
+(if (display-graphic-p)
+ (load-theme 'solarized-dark))
+
+
(require 'setup-package)
-(defun init--install-packages()
+(defun init-install-packages()
(packages-install
'(cider
clojure-mode
@@ -57,10 +61,10 @@
yasnippet)))
(condition-case nil
- (init--install-packages)
+ (init-install-packages)
(error
(package-refresh-contents)
- (init--install-packages)))
+ (init-install-packages)))
(require 'sane-defaults)
@@ -93,4 +97,5 @@
(put 'downcase-region 'disabled nil)
(put 'upcase-region 'disabled nil)
(put 'narrow-to-region 'disabled nil)
+
;;; init.el ends here
diff --git a/settings/sane-defaults.el b/settings/sane-defaults.el
index c561381..fa4ca8e 100644
--- a/settings/sane-defaults.el
+++ b/settings/sane-defaults.el
@@ -10,6 +10,11 @@
;; setup eval elsip
(define-key global-map (kbd "C-x C-e") 'eval-last-sexp)
+;; define browsers
+(define-key global-map (kbd "C-x w") 'browse-url-emacs)
+(define-key global-map (kbd "C-x w") 'browse-url-emacs)
+(define-key global-map (kbd "C-x M-w") 'browse-url-chromium)
+
;; Also auto refresh dired, but be quiet about it
(setq global-auto-revert-non-file-buffers t)
(setq auto-revert-verbose nil)
diff --git a/settings/setup-org-mode.el b/settings/setup-org-mode.el
index fe6f944..ff93336 100644
--- a/settings/setup-org-mode.el
+++ b/settings/setup-org-mode.el
@@ -5,6 +5,22 @@
(setq org-log-done 'time)
(setq org-src-fontify-natively t)
(setq org-src-tab-acts-natively t)
+(setq org-todo-keywords
+ '((sequence "TODO" "IN-PROGRESS" "BLOCKED" "DONE")))
+(setq org-tag-alist
+ '((:startgroup . nil)
+ ("blocker" . ?b)
+ ("!critical" . ?u)
+ ("!major" . ?m)
+ ("!minor" . ?n)
+ ("!trivial" . ?t)
+ (:endgroup . nil)
+ ("@home" . ?h)
+ ("@store" . ?s)
+ ("@work" . ?w)
+ ("reading" . ?r)
+ ("studying" . ?s)
+ ("implementation" . ?i)))
(global-set-key (kbd "C-c a") 'org-agenda)