Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: ryankinderman/dotfiles
base: e85c4bee3e
...
head fork: ryankinderman/dotfiles
compare: e33a08cce0
Checking mergeability… Don't worry, you can still create the pull request.
  • 4 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
2  bash/local.bash
@@ -7,7 +7,7 @@
define_cd_with_bash_local() {
local cmd=$1
eval $cmd'_with_bash_local() {
- '$cmd'_without_bash_local $@
+ '$cmd'_without_bash_local "$@"
local filename=.bash_local
local script=${BASH_SOURCE[0]}
View
4 bash/utils.bash
@@ -30,7 +30,7 @@ decorate_function() {
eval "$(echo "$undecorated_func_name()" ; echo "$prev_declaration" | tail -n +2)"
elif [ "$command_type" == "builtin" ]; then
eval $undecorated_func_name'() {
- builtin '$func' $@
+ builtin '$func' "$@"
}'
else
echo "unrecognized type of original $func: $command_type"
@@ -39,7 +39,7 @@ decorate_function() {
local decorated_func_name=$func"_with_"$feature
eval $func'() {
- '$decorated_func_name' $@
+ '$decorated_func_name' "$@"
}'
}
View
8 bashrc
@@ -36,8 +36,12 @@ fi
if [[ -s "$DOTFILES/bash/git-completion.bash" ]] ; then source "$DOTFILES/bash/git-completion.bash" ; fi
if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
- source "$HOME/.rvm/scripts/rvm"
- rvm use default
+ if [[ "$(which rvm)" != "" ]]; then
+ rvm reload
+ else
+ source "$HOME/.rvm/scripts/rvm"
+ rvm use default
+ fi
fi
platform='unknown'
View
106 my.cnf.rails
@@ -1,104 +1,20 @@
-# Example MySQL config file for small systems.
-#
-# This is for a system with little memory (<= 64M) where MySQL is only used
-# from time to time and it's important that the mysqld daemon
-# doesn't use much resources.
-#
-# You can copy this file to
-# /etc/my.cnf to set global options,
-# mysql-data-dir/my.cnf to set server-specific options (in this
-# installation this directory is /usr/local/mysql/data) or
-# ~/.my.cnf to set user-specific options.
-#
-# In this file, you can use all long options that a program supports.
-# If you want to know which options a program supports, run the program
-# with the "--help" option.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password = your_password
-port = 3306
-socket = /tmp/mysql.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
[mysqld]
-port = 3306
-socket = /tmp/mysql.sock
-skip-external-locking
-key_buffer = 16M
-#key_buffer_size = 16K
-max_allowed_packet = 16M
-#table_open_cache = 4
-#sort_buffer_size = 64K
-#read_buffer_size = 256K
-#read_rnd_buffer_size = 256K
-#net_buffer_length = 2K
-thread_stack = 256K
-thread_cache_size = 8
-#lower_case_table_names = 1
-default-storage-engine = INNODB
-query_cache_limit = 1M
-query_cache_size = 16M
-# Don't listen on a TCP/IP port at all. This can be a security enhancement,
-# if all processes that need to connect to mysqld run on the same host.
-# All interaction with mysqld must be made via Unix sockets or named pipes.
-# Note that using this option without enabling named pipes on Windows
-# (using the "enable-named-pipe" option) will render mysqld useless!
-#
#skip-networking
-server-id = 1
+bind-address=127.0.0.1
##############################################
-# Ryan: Modifications for speedy development
+# Modifications for speedy development
##############################################
-query_cache_type = 1 # keeps it from executing duplicate queries
-# give as much as you can to the buffer pool
-innodb_buffer_pool_size = 1000M
-innodb_additional_mem_pool_size = 200M
+# keeps it from executing duplicate queries
+query_cache_type = 1
-# helps speed up for lots of short write transactions
-# only use when you can stand to lose the last couple seconds
-# in the case of an OS crash
+# innodb options
+innodb_additional_mem_pool_size=200M
+innodb_buffer_pool_size=1000M
+innodb_checksums=0
+innodb_doublewrite=0
innodb_flush_log_at_trx_commit=2
-innodb_thread_concurrency=8
-
-
-# Uncomment the following if you want to log updates
-#log-bin=mysql-bin
-
-# binary logging format - mixed recommended
-#binlog_format=mixed
-
-# Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = /usr/local/mysql/data/
-#innodb_data_file_path = ibdata1:10M:autoextend
-#innodb_log_group_home_dir = /usr/local/mysql/data/
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 16M
-#innodb_additional_mem_pool_size = 2M
-# Set .._log_file_size to 25 % of buffer pool size
-#innodb_log_file_size = 5M
-#innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-#innodb_lock_wait_timeout = 50
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[myisamchk]
-key_buffer_size = 8M
-sort_buffer_size = 8M
-
-[mysqlhotcopy]
-interactive-timeout
+innodb_log_buffer_size=8M
+innodb_log_file_size=100M
View
6 vimrc
@@ -91,20 +91,22 @@ else
endif " has("autocmd")
+
+" Key mappings ****************************************************************
" Easily open and reload vimrc
"<Leader>v brings up my .vimrc
"<Leader>V reloads it -- making all changes active (have to save first)
map <Leader>v :sp $DOTFILES/vimrc<CR>
map <silent> <Leader>V :source $HOME/.vimrc<CR>:if has("gui")<CR>:source $HOME/.gvimrc<CR>:endif<CR>:filetype detect<CR>:exe ":echo 'vimrc reloaded'"<CR>
-" Key sequence mappings
" In command-mode, typing %/ will replace those chars with the directory of
" the file in the current buffer
cmap %/ <C-r>=expand('%:p:h')<CR>/
+
" execute current line as shell command, and open output in new window
map <Leader>x :silent . w ! sh > ~/.vim_cmd.out<CR>:new ~/.vim_cmd.out<CR>
-" Character mapping
+" Emacs-like command-mode cursor navigation
cnoremap <C-a> <Home>
cnoremap <C-f> <Right>
cnoremap <C-b> <Left>

No commit comments for this range

Something went wrong with that request. Please try again.