Browse Source

Change quite a bit of stuff. Changing termname in urxvt to 'rxvt' fixes bugs with emacs solarized theming, added rainbow delimiters, and moved some code around

master
Taylor Bockman 10 years ago
parent
commit
75ad87fc73
  1. 2
      dotfiles/Xresources
  2. 3
      dotfiles/emacs.d/eshell/history
  3. 38
      dotfiles/emacs.d/init.el
  4. 2
      dotfiles/emacs.d/package.el

2
dotfiles/Xresources

@ -140,7 +140,7 @@ URxvt*font: xft:Inconsolata:size=8:antialias=true:hinting=true
URxvt*boldFont: xft:Inconsolata:bold URxvt*boldFont: xft:Inconsolata:bold
URxvt.letterSpace: -1 URxvt.letterSpace: -1
URxvt*termName: rxvt-unicode URxvt*termName: rxvt
URxvt.urgentOnBell: true URxvt.urgentOnBell: true
! URxvt*foreground: color ! URxvt*foreground: color

3
dotfiles/emacs.d/eshell/history

@ -0,0 +1,3 @@
ping google.com
clear
exit

38
dotfiles/emacs.d/init.el

@ -79,20 +79,6 @@
(load-file "~/.emacs.d/package.el") (load-file "~/.emacs.d/package.el")
;;-------------------------------------------------------------------------------------- ;;--------------------------------------------------------------------------------------
;; Theme
;;--------------------------------------------------------------------------------------
(set-frame-parameter nil 'background-mode 'dark)
(set-terminal-parameter nil 'background-mode 'dark)
(load-theme 'solarized t)
;; 10 pt font
(set-frame-font "inconsolata")
(set-face-attribute 'default nil :height 100)
(powerline-center-theme)
;;--------------------------------------------------------------------------------------
;; Fill column indicator (currently set to 120 characters) ;; Fill column indicator (currently set to 120 characters)
;;-------------------------------------------------------------------------------------- ;;--------------------------------------------------------------------------------------
@ -176,6 +162,14 @@
(projectile-global-mode) (projectile-global-mode)
;;------------------------------------------------------------------------------------- ;;-------------------------------------------------------------------------------------
;; Rainbow Delimiters (on most programming modes)
;;-------------------------------------------------------------------------------------
(require 'rainbow-delimiters)
(add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
;;-------------------------------------------------------------------------------------
;; Key Bindings ;; Key Bindings
;;------------------------------------------------------------------------------------- ;;-------------------------------------------------------------------------------------
@ -233,6 +227,20 @@
(global-set-key (kbd "C-x C-f") 'helm-find-files) (global-set-key (kbd "C-x C-f") 'helm-find-files)
(global-set-key (kbd "C-s") 'helm-do-ag-this-file) (global-set-key (kbd "C-s") 'helm-do-ag-this-file)
;;--------------------------------------------------------------------------------------
;; Theme
;;--------------------------------------------------------------------------------------
(set-frame-parameter nil 'background-mode 'dark)
(set-terminal-parameter nil 'background-mode 'dark)
(load-theme 'solarized t)
;; 10 pt font
(set-frame-font "inconsolata")
(set-face-attribute 'default nil :height 100)
(powerline-center-theme)
;;------------------------------------------------------------------------------------- ;;-------------------------------------------------------------------------------------
(custom-set-variables (custom-set-variables
@ -248,4 +256,4 @@
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
) '(font-lock-comment-delimiter-face ((t (:foreground "brightgreen" :slant italic)))))

2
dotfiles/emacs.d/package.el

@ -4,7 +4,7 @@
fill-column-indicator flycheck-clojure flycheck-haskell flycheck-rust fill-column-indicator flycheck-clojure flycheck-haskell flycheck-rust
flycheck-pos-tip gitignore-mode haskell-mode helm helm-ag helm-projectile flycheck-pos-tip gitignore-mode haskell-mode helm helm-ag helm-projectile
js2-mode less-css-mode magit neotree paredit scss-mode powerline projectile js2-mode less-css-mode magit neotree paredit scss-mode powerline projectile
rust-mode color-theme-solarized wrap-region) rust-mode color-theme-solarized wrap-region rainbow-delimiters)
"Packages to make sure are installed") "Packages to make sure are installed")
(defun my-packages-installed-p () (defun my-packages-installed-p ()

Loading…
Cancel
Save