a bunch of stuff from Jaseem's init.el

diff --git a/angel-light-theme.el b/angel-light-theme.el
new file mode 100644 (file)
index 0000000..9265cc7
--- /dev/null
+++ b/angel-light-theme.el
@@ -0,0 +1,17 @@
+(deftheme angel-light
+  "A light theme based on angry fruit salad.")
+
+(custom-theme-set-variables
+ 'angel-light
+ '(magit-use-overlays t)
+ '(fci-rule-color "#DFDFDF")
+ '(fci-rule-width 1)
+ '(cursor-type (quote (bar . 2))))
+
+(custom-theme-set-faces
+ 'angel-light
+ '(fringe ((t (:background "White"))))
+ '(magit-item-highlight ((t nil)))
+ '(default ((t (:inherit nil :background "White" :foreground "#333" :foundry "nil")))))
+
+(provide-theme 'angel-light)

diff --git a/init.el b/init.el
index f55784ae49befd24384e8671b653535a6a77c1fe..d59136aaac5b33d3dc76c40cc8df2e0219aec26a 100644 (file)
--- a/init.el
+++ b/init.el
@@ -38,7 +38,7 @@
   (package-refresh-contents))
 
 ;; make sure my list of packages are installed
-(setq package-list '(go-mode rust-mode haskell-mode clojure-mode ghc restclient tangotango-theme cider slime))
+(setq package-list '(go-mode rust-mode haskell-mode clojure-mode ghc restclient tangotango-theme cider fill-column-indicator))
 
 ; install the missing packages
 (dolist (package package-list)
@@ -46,7 +46,9 @@
     (package-install package)))
 
 ;; tangotango
-(load-theme 'tangotango t)
+; (load-theme 'tangotango t)
+
+(load-theme 'angel-light t)
 
 ;; erc
 (require 'erc)
@@ -122,12 +124,24 @@
 
 ;; gofmt
 (add-hook 'before-save-hook #'gofmt-before-save)
-
-
-;; slime/CL
-;; Set your lisp system and, optionally, some contribs
-(setq inferior-lisp-program "~/.nix-profile/bin/sbcl")
-(setq slime-contribs '(slime-fancy))
-(slime-setup '(slime-fancy slime-asdf slime-banner))
-(setq slime-complete-symbol-function 'slime-fuzzy-complete-symbol)
-(setq slime-startup-animation t)
+(add-hook 'go-mode-hook (lambda ()
+                          (local-set-key (kbd "C-c C-r")
+                                         'go-remove-unused-imports)))
+(add-hook 'go-mode-hook (lambda ()
+                          (local-set-key (kbd "C-c i")
+                                         'go-goto-imports)))
+
+;; asp
+(add-to-list 'load-path "~/.emacs.d/asp-mode")
+(autoload 'asp-mode "asp-mode")
+(setq auto-mode-alist
+      (cons '("\\.asp\\'" . asp-mode) auto-mode-alist))
+
+;; line-number-mode
+(global-linum-mode t)
+(global-hl-line-mode t)
+
+;; fci -- fill-column-indicator
+(setq fci-rule-column 81)
+(setq fci-rule-width 1)
+(setq fci-rule-color "darkblue")