Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

reorganization, removal of drush stuff

  • Loading branch information...
commit 84271111802caf76e16692defdf4d466d6923cc4 1 parent a9d3341
@dlobraico authored
View
0  uccs-ssh.sh → bin/uccs-ssh.sh
File renamed without changes
View
8 bootstrap.sh
@@ -1,8 +1,12 @@
#!/bin/bash
ln -s $HOME/dotfiles/vimrc $HOME/.vimrc
ln -s $HOME/dotfiles/vim $HOME/.vim
-ln -s $HOME/dotfiles/hgrc $HOME/.hgrc
ln -s $HOME/dotfiles/zshrc $HOME/.zshrc
ln -s $HOME/dotfiles/oh-my-zsh $HOME/.oh-my-zsh
+ln -s $HOME/dotfiles/ackrc $HOME/.ackrc
+ln -s $HOME/dotfiles/hgrc $HOME/.hgrc
+ln -s $HOME/dotfiles/dir_colors $HOME/.dir_colors
+ln -s $HOME/dotfiles/tmux.conf $HOME/.tmux.conf
ln -s $HOME/dotfiles/screenrc $HOME/.screenrc
-
+cp $HOME/dotfiles/simplenotevim $HOME/.simplenotevim
+$EDITOR $HOME/.simplenotevim
View
6 drush/aliases.drushrc.php
@@ -1,6 +0,0 @@
-<?php
-$aliases['scav'] = array(
- 'root' => '/home/dj/www/drupal',
- 'uri' => 'snitchcockscav.com'
-);
-?>
View
1  drush/drush_zsh.drush.inc
View
59 drush_zsh/README.md
@@ -1,59 +0,0 @@
-# Drush zsh completion
-
-Drush autocomplete awesomeness for zsh.
-
-## Demo
-
-- [http://bit.ly/hSq1E7](http://bit.ly/hSq1E7)
-
-## Installation (zsh)
-
-- Clone _drush\_zsh_
-
- git clone --branch master http://git.drupal.org/sandbox/webflo/1113394.git ~/drush_zsh
-
-- Load _drush\_zsh_ in your drush folder.
-
- ln -s ~/drush_zsh/drush/drush_zsh.drush.inc ~/.drush/drush_zsh.drush.inc
-
-- Load _drush\_zsh_ in your ~/.zshrc (or ~/.zshrc.local). Copy & pase the following snippet.
-
- fpath=(~/drush_zsh/zsh $fpath)
- autoload -U compinit
- compinit -i
-
-- Start / restart zsh
-
-- Have fun!
-
-## Installation (oh-my-zsh)
-
-- Clone _drush\_zsh_
-
- git clone --branch master http://git.drupal.org/sandbox/webflo/1113394.git ~/drush_zsh
-
-- Load _drush\_zsh_ in your drush folder.
-
- ln -s ~/drush_zsh/drush/drush_zsh.drush.inc ~/.drush/drush_zsh.drush.inc
-
-- Load _drush\_zsh_ in your oh-my-zsh plugins folder.
-
- ln -s ~/drush_zsh/zsh ~/.oh-my-zsh/plugins/drush
-
-- Load _drush\_zsh_ in your ~/.zshrc. Add 'drush' to plugins()
-
-- Start / restart zsh
-
-- Have fun!
-
-## Updates
-
-- Clone _drush\_zsh_ via git
-
- cd ~/drush_zsh && git pull origin master
-
-## Requirements
-
-- [Drush 4.x](http://drupal.org/project/drush)
-- [zsh](http://www.zsh.org/)
-- Optional: [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh)
View
164 drush_zsh/drush/drush_zsh.drush.inc
@@ -1,164 +0,0 @@
-<?php
-// $Id:
-
-/**
- * @file
- * Some commands for zsh completion
- */
-
-/**
- * Implementation of hook_drush_command().
- *
- * @See drush_parse_command() for a list of recognized keys.
- *
- * @return
- * An associative array describing each command.
- */
-function drush_zsh_drush_command() {
- $items = array();
-
- $items['zsh-commands'] = array(
- 'description' => 'Return all drush commands.',
- 'bootstrap' => DRUSH_BOOTSTRAP_DRUSH,
- 'hidden' => TRUE,
- );
-
- $items['zsh-options'] = array(
- 'description' => 'Return command options.',
- 'bootstrap' => DRUSH_BOOTSTRAP_DRUSH,
- 'hidden' => TRUE,
- );
-
- $items['zsh-features-list'] = array(
- 'description' => 'Return all features',
- 'hidden' => TRUE,
- );
-
- return $items;
-}
-
-/**
- * Drush zsh-commands callback.
- */
-function drush_drush_zsh_zsh_commands() {
- $phases = _drush_bootstrap_phases();
- // For speed, only bootstrap up to DRUSH_BOOTSTRAP_DRUPAL_SITE+1.
- $phases = array_slice($phases, 0, DRUSH_BOOTSTRAP_DRUPAL_SITE+1);
-
- $printed_rows = $rows = array();
- $phase_index = DRUSH_BOOTSTRAP_DRUSH;
-
- foreach ($phases as $phase_index) {
- if (drush_bootstrap_validate($phase_index)) {
- if ($phase_index > drush_get_context('DRUSH_BOOTSTRAP_PHASE')) {
- drush_bootstrap($phase_index);
- }
-
- $commands = drush_get_commands();
- // Filter by command file if specified.
- if ($commandfile = drush_get_option('filter')) {
- foreach ($commands as $key => $candidate) {
- if ($candidate['commandfile'] != $commandfile) {
- unset($commands[$key]);
- }
- }
- }
-
- $rows = array();
- ksort($commands);
- foreach($commands as $key => $command) {
- if (!$command['hidden']) {
- if (!array_key_exists('is_alias', $command) || !$command['is_alias']) {
- if (!array_key_exists($key, $printed_rows)) {
- $name = $command['aliases'] ? $key . ' (' . implode(', ', $command['aliases']) . ')': $key;
- $rows[$key] = array($name, $command['description']);
- $command_completion[] = $key . ':' . $command['description'];
- foreach($command['aliases'] as $alias) {
- $command_completion[] = $alias . ':' . $command['description'];
- }
- }
- }
- }
- }
-
- $printed_rows = array_merge($printed_rows, $rows);
- }
- else {
- break;
- }
- }
-
- // Newline-delimited list for zsh completion. Set the --commands option.
- if (isset($command_completion)) {
- drush_print_pipe($command_completion);
- }
-
- return;
-}
-
-/**
- * Drush zsh-options callback.
- */
-function drush_drush_zsh_zsh_options() {
- $command = func_get_args();
- $completion = array();
-
- if (!empty($command)) {
- // Drush command. Get specific options
- $commandstring = array_shift($command);
-
- $commands = drush_get_commands();
- if (array_key_exists($commandstring, $commands)) {
- $command = $commands[$commandstring];
- $completion = drush_zsh_extract_options($command);
- }
- } else {
- // No drush command. Get global options
- foreach(drush_get_global_options() as $option => $info) {
- if (is_array($info)) {
- switch ($option) {
- case 'root':
- $function = ':directory:_path_files -/';
- $option .= '=';
- break;
- default:
- $function = '';
- }
-
- if ($info['short-form']) {
- $completion[] = '(-' . $info['short-form'] . ')-' . $info['short-form'] . '['. $info['description'] . ']' . $function;
- }
- $completion[] = '(--' . $option . ')--' . $option . '[' . $info['description'] . ']' . $function;
- } else {
- $completion[] = '(--' . $option .')--' . $option . '[' . $info . ']' . $function;
- }
- }
- }
-
- drush_print_pipe($completion);
-}
-
-function drush_zsh_extract_options($command) {
- $row = array();
- if (is_array($command['options'])) {
- foreach($command['options'] as $option => $description) {
- $aliases = explode(',' , $option);
- foreach($aliases as $alias) {
- $row[] = '(--' . trim($alias) .')--' . trim($alias). '['. $description .']';
- }
- }
- }
- return $row;
-}
-
-function drush_drush_zsh_zsh_features_list() {
- module_load_include('inc', 'features', 'features.export');
-
- $rows = array();
- foreach (features_get_features(NULL, TRUE) as $k => $m) {
- $rows[] = $m->name;
- }
-
- $rows = implode(',', $rows);
- drush_print_pipe($rows);
-}
View
60 drush_zsh/zsh/_drush
@@ -1,60 +0,0 @@
-#compdef drush
-#autoload
-
-local ret=1 state
-
-local -a _1st_arguments
-local -a drush_commands
-drush_commands=`drush zsh-commands --pipe`
-
-local -a drush_common_opts
-drush_common_opts=`drush zsh-options --pipe`
-subcommands=(${(f)drush_common_opts});
-
-declare -ga common_opts
-common_opts=(${(f)drush_common_opts})
-
-typeset -A opt_args
-_arguments \
- $common_opts \
- ':subcommand:->subcommand' \
- '*::options:->options' && ret=0
-
-case $state in
- subcommand)
- subcommands=(${(f)drush_commands})
- _describe -t subcommands 'drush subcommand' subcommands && ret=0
- ;;
-
- options)
- declare -a args
- declare -a local_opts
- declare -a drush_local_opts
-
- drush_local_opts=`drush zsh-options --pipe $words[1]`
- local_opts=(${(f)drush_local_opts})
-
- args=(
- $excl_opts
- $local_opts
- )
-
- case $words[1] in
- features-update|fu|feature-revert|fr)
- declare -a drush_features
- declare -a local_features
- drush_features=`drush zsh-features-list --pipe`
- local_features={$drush_features}
-
- args+=(
- '*:feature:('$local_features')'
- )
- ;;
- esac
-
- _arguments $args && ret=0
- ;;
-esac
-
-return ret
-
View
4 drush_zsh/zsh/drush.plugin.zsh
@@ -1,4 +0,0 @@
-# add drush completion function to path
-fpath=($ZSH/plugins/drush $fpath)
-autoload -U compinit
-compinit -i
View
1  oh-my-zsh/plugins/drush
View
2  simplenotevim
@@ -0,0 +1,2 @@
+let g:SimplenoteUsername = "dj@lobraico.com"
+let g:SimplenotePassword = "PASSWORD"
View
8 vim/tmp/backup/bootstrap.sh~
@@ -1,8 +1,12 @@
#!/bin/bash
ln -s $HOME/dotfiles/vimrc $HOME/.vimrc
ln -s $HOME/dotfiles/vim $HOME/.vim
-ln -s $HOME/dotfiles/hgrc $HOME/.hgrc
ln -s $HOME/dotfiles/zshrc $HOME/.zshrc
+ln -s $HOME/dotfiles/ackrc $HOME/.ackrc
+ln -s $HOME/dotfiles/hgrc $HOME/.hgrc
+ln -s $HOME/dotfiles/dir_colors $HOME/.dir_colors
+ln -s $HOME/dotfiles/tmux.conf $HOME/.tmux.conf
ln -s $HOME/dotfiles/oh-my-zsh $HOME/.oh-my-zsh
ln -s $HOME/dotfiles/screenrc $HOME/.screenrc
-
+cp $HOME/dotfiles/simplenotevim $HOME/.simplenotevim
+$EDITOR $HOME/.simplenotevim
View
7 vim/tmp/backup/vimrc~
@@ -376,7 +376,7 @@ map <up> <ESC>:NERDTree<RETURN><ESC><C-W><C-W> " up arrow (normal mode) brings u
map <down> <ESC>:w<RETURN> " down arrow (normal mode) brings up the buffer list
map <A-i> i <ESC>r " alt-i (normal mode) inserts a single char, and then switches back to normal
map <F2> <ESC>ggVG:call SuperRetab()<left>
-map <F12> ggVGg? " encypt the file (toggle)
+map <F12> ggVGg? " encrypt the file (toggle)
"" HTML Filetype Settings
let g:do_xhtml_mappings = 'yes'
@@ -432,3 +432,8 @@ let g:ucs_encode_html = 1
" prevent vim-R from turning _ into <-
let vimrplugin_underscore = 0
+
+" for simplenote.vim
+source ~/.simplenoterc
+
+
View
5 vimrc
@@ -432,3 +432,8 @@ let g:ucs_encode_html = 1
" prevent vim-R from turning _ into <-
let vimrplugin_underscore = 0
+
+" for simplenote.vim
+source ~/.simplenotevim
+
+
View
2  zshrc
@@ -21,7 +21,7 @@ export ZSH_THEME="mrtazz"
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(brew git osx ruby ssh-agent vi-mode pip cap rails autojump bundler compleat deb gem github perl rails3 ruby rvm svn drush)
+plugins=(brew git osx ruby ssh-agent vi-mode pip cap rails autojump bundler compleat deb gem github perl rails3 ruby rvm svn)
source $ZSH/oh-my-zsh.sh
Please sign in to comment.
Something went wrong with that request. Please try again.