Skip to content

Commit

Permalink
updates!
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeremy Zawodny committed Apr 2, 2013
1 parent dd616b3 commit a2544df
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 10 deletions.
20 changes: 18 additions & 2 deletions .emacs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
;; 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.
'(default ((t (:inherit nil :stipple nil :background "White" :foreground "#333333" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 160 :width normal :foundry "apple" :family "Monaco")))))
'(default ((t (:inherit nil :stipple nil :background "White" :foreground "#333333" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 140 :width normal :foundry "apple" :family "Monaco")))))

;; perltidy note: select region; M-1; M-|; perltidy

Expand All @@ -152,5 +152,21 @@
;(load-file (concat prelude-dir "init.el"))
;(require 'zenburn-theme)

(require 'tomorrow-theme)
;(require 'tomorrow-theme)
(put 'narrow-to-region 'disabled nil)

;; setup C-c t for ansi-term shortcut
;;
;; http://emacsredux.com/blog/2013/03/29/terminal-at-your-fingertips/

(defun visit-term-buffer ()
"Create or visit a terminal buffer."
(interactive)
(if (not (get-buffer "*ansi-term*"))
(progn
(split-window-sensibly (selected-window))
(other-window 1)
(ansi-term (getenv "SHELL")))
(switch-to-buffer-other-window "*ansi-term*")))

(global-set-key (kbd "C-c t") 'visit-term-buffer)
15 changes: 11 additions & 4 deletions .tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ bind-key C-RIGHT select-pane -R
# unbind-key -n C-h
# unbind-key -n C-l

# Use Meta (Alt) + h/j/k/l to select panes

# bind-key -n M-k select-pane -U
# bind-key -n M-j select-pane -D
# bind-key -n M-h select-pane -L
# bind-key -n M-l select-pane -R

bind H resize-pane -L 5
bind J resize-pane -D 5
bind K resize-pane -U 5
Expand All @@ -33,10 +40,10 @@ bind C-\ last-window

# w is bound to choose-window

setw -g mode-mouse on
set -g mouse-select-pane on
set -g mouse-resize-pane on
set -g mouse-select-window on
# setw -g mode-mouse on
# set -g mouse-select-pane on
# set -g mouse-resize-pane on
# set -g mouse-select-window on

set -g default-terminal "screen-256color"

Expand Down
8 changes: 4 additions & 4 deletions .vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ let mapleader = ","

set tabstop=4 " tabs defualt to 4 spaces
set softtabstop=4 " tabs default to 4 spaces
"set expandtab " make them spaces
set noexpandtab " don't make them spaces
set expandtab " make them spaces
"set noexpandtab " don't make them spaces
set shiftwidth=4 " indent level
set textwidth=72 " for text files, wrap here
set hlsearch " hilight search matches
Expand Down Expand Up @@ -81,10 +81,10 @@ if has('gui_running')
else
set t_Co=256 " force 256 color mode(s)
set background=dark
"set background=light
set background=light
"colorscheme darkblue
highlight LineNr term=bold cterm=NONE ctermfg=DarkGrey ctermbg=NONE gui=NONE guifg=DarkGrey guibg=NONE
endif

highlight LineNr term=bold cterm=NONE ctermfg=DarkGrey ctermbg=NONE gui=NONE guifg=DarkGrey guibg=NONE

" e scp://user@vmdev/git/clol/lib/perl/CLOL/Indexer/LiveSphinx.pm

0 comments on commit a2544df

Please sign in to comment.