diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-27 15:24:05 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-27 15:24:05 -0400 |
commit | 674efbf431f2c1c879c9bfed05f7ed6adce22351 (patch) | |
tree | b873ec80e45fb1bd9a414bb25c4e27d68c8861cf | |
parent | de9c3e08412ae13cc8a2d1e4418d9e9257f67518 (diff) |
pre-merge move
-rw-r--r-- | .bootstrap.min.sh | 7 | ||||
-rw-r--r-- | .config/X11/clientrc (renamed from .xinitrc) | 0 | ||||
-rw-r--r-- | .config/X11/defaults (renamed from .Xdefaults) | 0 | ||||
-rw-r--r-- | .config/X11/login (renamed from .xsession) | 0 | ||||
-rw-r--r-- | .config/bash/aliases.sh (renamed from .bash_aliases) | 0 | ||||
-rw-r--r-- | .config/bash/logout.sh (renamed from .bash_logout) | 0 | ||||
-rw-r--r-- | .config/bash/rc.d/emacs.sh (renamed from .bash.d/emacs.sh) | 0 | ||||
-rw-r--r-- | .config/bash/rc.sh (renamed from .bashrc) | 0 | ||||
-rw-r--r-- | .config/bazaar/ignore (renamed from .bazaar/ignore) | 0 | ||||
-rw-r--r-- | .config/conkeror (renamed from .conkerorrc) | 0 | ||||
-rw-r--r-- | .config/cron/.crontab (renamed from .crontab) | 0 | ||||
-rw-r--r-- | .config/cron/.crontab.local (renamed from .crontab.local) | 0 | ||||
-rw-r--r-- | .config/emacs/.gitignore (renamed from .emacs.d/.gitignore) | 0 | ||||
-rw-r--r-- | .config/emacs/custom.el (renamed from .emacs.d/custom.el) | 0 | ||||
-rw-r--r-- | .config/emacs/emacsutils.el (renamed from .emacs.d/emacsutils.el) | 0 | ||||
-rw-r--r-- | .config/emacs/init.el | 180 | ||||
-rw-r--r-- | .config/git/config (renamed from .gitconfig) | 0 | ||||
-rw-r--r-- | .config/hgrc (renamed from .hgrc) | 0 | ||||
-rw-r--r-- | .config/irbrc (renamed from .irbrc) | 0 | ||||
-rw-r--r-- | .config/login.local.sh (renamed from .login-daemons) | 0 | ||||
-rw-r--r-- | .config/login.sh (renamed from .profile) | 0 | ||||
-rw-r--r-- | .config/maildirproc/default.rc (renamed from .maildirproc/default.rc) | 0 | ||||
-rw-r--r-- | .config/offlineimaprc (renamed from .offlineimaprc) | 0 | ||||
-rw-r--r-- | .config/ssh/config (renamed from .ssh/config) | 0 | ||||
-rwxr-xr-x | .config/wmii/autostart (renamed from .wmii/autostart) | 0 | ||||
-rw-r--r-- | .config/wmii/include.sh (renamed from .wmii/include.sh) | 0 | ||||
-rwxr-xr-x | .config/wmii/quit (renamed from .wmii/quit) | 0 | ||||
-rwxr-xr-x | .config/wmii/rbar_battery (renamed from .wmii/rbar_battery) | 0 | ||||
-rwxr-xr-x | .config/wmii/rbar_clock (renamed from .wmii/rbar_clock) | 0 | ||||
-rwxr-xr-x | .config/wmii/rbar_cpu (renamed from .wmii/rbar_cpu) | 0 | ||||
-rwxr-xr-x | .config/wmii/rbar_wifi (renamed from .wmii/rbar_wifi) | 0 | ||||
-rw-r--r-- | .config/wmii/theme-solarized (renamed from .wmii/theme-solarized) | 0 | ||||
-rw-r--r-- | .config/wmii/theme-solarized-dark (renamed from .wmii/theme-solarized-dark) | 0 | ||||
-rwxr-xr-x | .config/wmii/wmiirc (renamed from .wmii/wmiirc) | 0 | ||||
-rw-r--r-- | .emacs | 12 | ||||
l--------- | .wicd/WHEREAREMYFILES | 1 |
36 files changed, 180 insertions, 20 deletions
diff --git a/.bootstrap.min.sh b/.bootstrap.min.sh deleted file mode 100644 index eed85b5..0000000 --- a/.bootstrap.min.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -files='.bashrc .bash_aliases .gitconfig .profile' -for file in $files; do - rm -f $file - wget http://gitorious.org/lukeshu-dotfiles/lukeshu-dotfiles/blobs/raw/master/$file; -done diff --git a/.xinitrc b/.config/X11/clientrc index 9c5ce55..9c5ce55 100644 --- a/.xinitrc +++ b/.config/X11/clientrc diff --git a/.Xdefaults b/.config/X11/defaults index ceabc5c..ceabc5c 100644 --- a/.Xdefaults +++ b/.config/X11/defaults diff --git a/.xsession b/.config/X11/login index a16dc0b..a16dc0b 100644 --- a/.xsession +++ b/.config/X11/login diff --git a/.bash_aliases b/.config/bash/aliases.sh index de1a321..de1a321 100644 --- a/.bash_aliases +++ b/.config/bash/aliases.sh diff --git a/.bash_logout b/.config/bash/logout.sh index a8b88c1..a8b88c1 100644 --- a/.bash_logout +++ b/.config/bash/logout.sh diff --git a/.bash.d/emacs.sh b/.config/bash/rc.d/emacs.sh index f484bbb..f484bbb 100644 --- a/.bash.d/emacs.sh +++ b/.config/bash/rc.d/emacs.sh diff --git a/.bashrc b/.config/bash/rc.sh index ed5d87e..ed5d87e 100644 --- a/.bashrc +++ b/.config/bash/rc.sh diff --git a/.bazaar/ignore b/.config/bazaar/ignore index 0e498f2..0e498f2 100644 --- a/.bazaar/ignore +++ b/.config/bazaar/ignore diff --git a/.conkerorrc b/.config/conkeror index e33add1..e33add1 100644 --- a/.conkerorrc +++ b/.config/conkeror diff --git a/.crontab b/.config/cron/.crontab index e69de29..e69de29 100644 --- a/.crontab +++ b/.config/cron/.crontab diff --git a/.crontab.local b/.config/cron/.crontab.local index e69de29..e69de29 100644 --- a/.crontab.local +++ b/.config/cron/.crontab.local diff --git a/.emacs.d/.gitignore b/.config/emacs/.gitignore index ef4ec20..ef4ec20 100644 --- a/.emacs.d/.gitignore +++ b/.config/emacs/.gitignore diff --git a/.emacs.d/custom.el b/.config/emacs/custom.el index 5a3e67f..5a3e67f 100644 --- a/.emacs.d/custom.el +++ b/.config/emacs/custom.el diff --git a/.emacs.d/emacsutils.el b/.config/emacs/emacsutils.el index 966d16e..966d16e 100644 --- a/.emacs.d/emacsutils.el +++ b/.config/emacs/emacsutils.el diff --git a/.config/emacs/init.el b/.config/emacs/init.el new file mode 100644 index 0000000..3cd2ea3 --- /dev/null +++ b/.config/emacs/init.el @@ -0,0 +1,180 @@ +;; Preliminary settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(set-face-attribute 'default nil :height 80) +(setq notify-method 'notify-via-libnotify) +(add-to-list 'load-path "~/.emacs.d/") +(add-to-list 'load-path "~/.emacs.d/el-get/el-get") +(setq custom-file "~/.emacs.d/custom.el") + +; derived from ELPA installation +; http://tromey.com/elpa/install.html +(defun eval-url (url) + (let ((buffer (url-retrieve-synchronously url))) + (save-excursion + (set-buffer buffer) + (goto-char (point-min)) + (re-search-forward "^$" nil 'move) + (eval-region (point) (point-max)) + (kill-buffer (current-buffer))))) + + ;; ELPA stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(unless (require 'package nil t) + (eval-url "http://tromey.com/elpa/package-install.el")) + +(setq package-archives '(("ELPA" . "http://tromey.com/elpa/") + ("marmalade" . "http://marmalade-repo.org/packages/") + ("gnu" . "http://elpa.gnu.org/packages/"))) + +;; el-get stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(setq el-get-install-branch "master") ;; live life on the edge +(unless (require 'el-get nil t) + (eval-url "https://github.com/dimitri/el-get/raw/master/el-get-install.el")) + +(setq el-get-sources '( + (:name nxhtml + :type http + :url "http://ourcomments.org/Emacs/DL/elisp/nxhtml/zip/nxhtml-2.08-100425.zip" + :build ("unzip nxhtml-2.08-100425.zip") + :load "nxhtml/autostart.el") + )) + +(setq my-el-get-packages + '(el-get +; nxhtml + apel flim semi wanderlust + smarttabs + )) + +;; Now load all of that ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;; ELPA +(package-initialize) +;; el-get +(when (require 'el-get nil t) (el-get 'sync my-el-get-packages)) +;; custom +(load custom-file 'noerror) + +;; General settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;(load "mdmua") +(load "emacsutils") + +(tool-bar-mode -1) +(ido-mode t) +(show-paren-mode 1) +(setq org-hide-leading-stars t) +(setq org-log-done 'time) +;(xclip-mode 1) + +(load "whitespace") +(setq whitespace-style '( + tab-mark + space-mark + newline-mark + empty +)) + + +;; These are my preferred settings; we let dtrt-indent detect when we play with other's files +(setq-default tab-width 8) +(setq-default c-basic-offset 8) +(setq-default indent-tabs-mode t) + + +(setq + backup-by-copying t ;; don't clobber symlinks + backup-directory-alist '(("." . "~/.emacs.d/saves")) ;; don't litter my fs tree + delete-old-versions t + kept-new-versions 6 + kept-old-versions 2 + version-control t ;; use versioned backups +) + +(setq column-number-mode t + inhibit-startup-screen t + line-number-mode t + server-use-tcp t + server-mode t + show-paren-mode t) + +(setq browse-url-generic-program (executable-find "v-www-browser") + browse-url-browser-function 'browse-url-generic) + + +(defun toggle-fullscreen (&optional f) + (interactive) + (let ((current-value (frame-parameter nil 'fullscreen))) + (set-frame-parameter nil 'fullscreen + (if (equal 'fullboth current-value) + (if (boundp 'old-fullscreen) old-fullscreen nil) + (progn (setq old-fullscreen current-value) + 'fullboth))))) + +;; Custom keybindings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(global-set-key [f11] 'toggle-fullscreen) +(global-set-key "\C-cw" 'global-whitespace-mode) + +;; mode-hooks ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(add-hook 'text-mode-hook 'turn-on-auto-fill) + +; for term-mode +;; (add-hook 'after-make-frame-functions +;; (lambda (frame) +;; (set-variable 'term-default-fg-color +;; (face-foreground 'default)) +;; (set-variable 'term-default-bg-color +;; (face-background 'default))) +;; t) + +(add-hook 'lisp-mode-hook + '(lambda () + (set (make-local-variable 'indent-tabs-mode) nil) + )) + +(add-hook 'emacs-lisp-mode-hook + '(lambda () + (set (make-local-variable 'indent-tabs-mode) nil) + )) + +(add-hook 'coffee-mode-hook + '(lambda () + (set (make-local-variable 'tab-width) 2) + )) + +(add-hook 'term-mode-hook + '(lambda () + (setq term-prompt-regexp "^[^#$%>\n]*[#$%>] *") + (make-local-variable 'mouse-yank-at-point) + ;(make-local-variable 'transient-mark-mode) + (setq mouse-yank-at-point t) + ;(setq transient-mark-mode nil) + (auto-fill-mode -1) + (setq tab-width 8 ) + (setq autopair-dont-activate t) ;; Don't let autopair break ansi-term + )) + +(add-hook 'ruby-mode-hook + '(lambda () + (set (make-local-variable 'indent-tabs-mode) t) + (set (make-local-variable 'ruby-indent-level) 4) + (set (make-local-variable 'tab-width) 4) + )) + +(add-hook 'coffee-mode-hook + '(lambda () + (set (make-local-variable 'indent-tabs-mode) nil) + )) + +(add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode)) + +;(require 'flymake) +;(add-hook 'php-mode-hook (lambda() (flymake-mode 1))) +;(define-key php-mode-map '[M-S-up] 'flymake-goto-prev-error) +;(define-key php-mode-map '[M-S-down] 'flymake-goto-next-error) + +;(setq tramp-debug-buffer t) +;(setq tramp-verbose 10) diff --git a/.gitconfig b/.config/git/config index 9846d72..9846d72 100644 --- a/.gitconfig +++ b/.config/git/config diff --git a/.login-daemons b/.config/login.local.sh index 1da7aa7..1da7aa7 100644 --- a/.login-daemons +++ b/.config/login.local.sh diff --git a/.profile b/.config/login.sh index 377dc9b..377dc9b 100644 --- a/.profile +++ b/.config/login.sh diff --git a/.maildirproc/default.rc b/.config/maildirproc/default.rc index 71bc00c..71bc00c 100644 --- a/.maildirproc/default.rc +++ b/.config/maildirproc/default.rc diff --git a/.offlineimaprc b/.config/offlineimaprc index 319593c..319593c 100644 --- a/.offlineimaprc +++ b/.config/offlineimaprc diff --git a/.ssh/config b/.config/ssh/config index bb876ba..bb876ba 100644 --- a/.ssh/config +++ b/.config/ssh/config diff --git a/.wmii/autostart b/.config/wmii/autostart index aae23f4..aae23f4 100755 --- a/.wmii/autostart +++ b/.config/wmii/autostart diff --git a/.wmii/include.sh b/.config/wmii/include.sh index 36f8f3e..36f8f3e 100644 --- a/.wmii/include.sh +++ b/.config/wmii/include.sh diff --git a/.wmii/quit b/.config/wmii/quit index 54f64e7..54f64e7 100755 --- a/.wmii/quit +++ b/.config/wmii/quit diff --git a/.wmii/rbar_battery b/.config/wmii/rbar_battery index 7a7f24f..7a7f24f 100755 --- a/.wmii/rbar_battery +++ b/.config/wmii/rbar_battery diff --git a/.wmii/rbar_clock b/.config/wmii/rbar_clock index 8e7d2a4..8e7d2a4 100755 --- a/.wmii/rbar_clock +++ b/.config/wmii/rbar_clock diff --git a/.wmii/rbar_cpu b/.config/wmii/rbar_cpu index 7f891da..7f891da 100755 --- a/.wmii/rbar_cpu +++ b/.config/wmii/rbar_cpu diff --git a/.wmii/rbar_wifi b/.config/wmii/rbar_wifi index 608b164..608b164 100755 --- a/.wmii/rbar_wifi +++ b/.config/wmii/rbar_wifi diff --git a/.wmii/theme-solarized b/.config/wmii/theme-solarized index 5dc830d..5dc830d 100644 --- a/.wmii/theme-solarized +++ b/.config/wmii/theme-solarized diff --git a/.wmii/theme-solarized-dark b/.config/wmii/theme-solarized-dark index 83285ba..83285ba 100644 --- a/.wmii/theme-solarized-dark +++ b/.config/wmii/theme-solarized-dark diff --git a/.wmii/wmiirc b/.config/wmii/wmiirc index 92adb8b..92adb8b 100755 --- a/.wmii/wmiirc +++ b/.config/wmii/wmiirc @@ -1,12 +0,0 @@ -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(asm-comment-char 35)) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) diff --git a/.wicd/WHEREAREMYFILES b/.wicd/WHEREAREMYFILES deleted file mode 120000 index 5e06b02..0000000 --- a/.wicd/WHEREAREMYFILES +++ /dev/null @@ -1 +0,0 @@ -/var/lib/wicd/WHEREAREMYFILES
\ No newline at end of file |