aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshmibs <shmibs@gmail.com>2014-05-30 10:20:48 -0700
committershmibs <shmibs@gmail.com>2014-05-30 10:20:48 -0700
commit333b873ee6d27c6b42c2426f14591177bed08146 (patch)
tree3f64456489eacadec1ba98247ad3e6dde4d09311
parent4ffad3ac6c5259b975650cf1aeaaecb1fd255be3 (diff)
downloaddotfiles-333b873ee6d27c6b42c2426f14591177bed08146.tar.gz
bash -> zsh
-rw-r--r--.bash_aliases46
-rw-r--r--.bash_profile29
-rw-r--r--.bashrc33
-rw-r--r--.pentadactylrc5
-rw-r--r--.vimrc3
-rw-r--r--.zshrc72
6 files changed, 78 insertions, 110 deletions
diff --git a/.bash_aliases b/.bash_aliases
deleted file mode 100644
index 6d1796d..0000000
--- a/.bash_aliases
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-export EDITOR="vim"
-export PAGER="less -R"
-
-alias ls='ls --color=auto'
-alias grep='grep --color=auto'
-alias diff='colordiff'
-alias less='less -R'
-
-alias vmount='udevil mount'
-alias vumount='udevil umount'
-alias def='sdcv'
-
-send() {
- if [ "$1" ]; then
- scp $@ shmibbles.me:/srv/http/tmp/
- if [ $? -eq 0 ]; then
- for name in "$@"
- do
- name=$(echo "http://shmibbles.me/tmp/$(basename $name)" | sed 's/ /%20/g')
- echo $name | tr -d '\n' | xclip -i -selection clipboard
- echo $name | tr -d '\n' | xclip -i -selection primary
- done
- fi
- else
- echo "specify at least one file to send"
- fi
-}
-
-sendi() {
- if [ "$1" ]; then
- scp $@ shmibbles.me:/srv/http/img/
- if [ $? -eq 0 ]; then
- for name in "$@"
- do
- name=$(echo "http://shmibbles.me/img/$(basename $name)" | sed 's/ /%20/g')
- echo $name | tr -d '\n' | xclip -i -selection clipboard
- echo $name | tr -d '\n' | xclip -i -selection primary
- done
- fi
- else
- echo "specify at least one file to send"
- fi
-}
-
diff --git a/.bash_profile b/.bash_profile
deleted file mode 100644
index f42c6a0..0000000
--- a/.bash_profile
+++ /dev/null
@@ -1,29 +0,0 @@
-# /home/shmibs/.bash_profile
-
-#Set our umask
-umask 022
-
-# Set our default path
-PATH="/usr/local/sbin:/usr/local/bin:/usr/bin"
-export PATH
-
-# Load profiles from /etc/profile.d
-if test -d /etc/profile.d/; then
- for profile in /etc/profile.d/*.sh; do
- test -r "$profile" && . "$profile"
- done
- unset profile
-fi
-
-# Source global bash config
-if test "$PS1" && test "$BASH" && test -r /etc/bash.bashrc; then
- . /etc/bash.bashrc
-fi
-
-# Termcap is outdated, old, and crusty, kill it.
-unset TERMCAP
-
-# Man is much better than us at figuring this out
-unset MANPATH
-
-source ~/.bash_aliases
diff --git a/.bashrc b/.bashrc
deleted file mode 100644
index 9eca7d3..0000000
--- a/.bashrc
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# /home/shmibs/.bashrc
-#
-
-# coloured
-# PS1="$(if [[ ${EUID} == 0 ]]; then echo '\033[1;31m'; else echo '\033[1;32m'; fi)\u@\h\033[1;34m[\W]\$\033[0m "
-
-# plain
-# PS1='[\u@\h \W]\$ '
-
-# If not running interactively, don't do anything
-
-[[ $- != *i* ]] && return
-
-shopt -s checkwinsize
-
-PS1='[\u@\h \W]\$ '
-PS2='> '
-PS3='> '
-PS4='+ '
-
-case ${TERM} in
- xterm*|rxvt*|Eterm|aterm|kterm|gnome*|mate*)
- PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
- ;;
- screen)
- PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
- ;;
-esac
-
-[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
-
-source ~/.bash_aliases
diff --git a/.pentadactylrc b/.pentadactylrc
index 738875a..5de3545 100644
--- a/.pentadactylrc
+++ b/.pentadactylrc
@@ -1,11 +1,12 @@
-"hg6981
+"hg7092
loadplugins '\.(js|penta)$'
group user
highlight Hint font: bold 12px "Droid Sans Mono", monospace !important; margin: -.2ex; padding: 0 0 0 1px; outline: 1px solid rgba(0, 0, 0, .5); background: rgba(255, 248, 231, .8); color: black; text-transform: uppercase;
+map -count -modes=n,v ! <count>:tabopen<Space>duckduckgo<Space>!
map -count -modes=n,v s <count>:tabopen<Space>duckduckgo<Space>
map -count -modes=n,v S <count>:open<Space>duckduckgo<Space>
-map -count -modes=n,v ! <count>:tabopen<Space>duckduckgo<Space>!
+map -count -modes=n,v <C-g> -builtin <count>\b
set hintkeys=sldkfjgh
" vim: set ft=pentadactyl:
diff --git a/.vimrc b/.vimrc
index a571715..39559e6 100644
--- a/.vimrc
+++ b/.vimrc
@@ -10,6 +10,9 @@ set background=dark
"enable status-line
set laststatus=2
+"hide mode in cmd
+set noshowmode
+
"allow edited background buffers
set hidden
diff --git a/.zshrc b/.zshrc
new file mode 100644
index 0000000..6ecfdc6
--- /dev/null
+++ b/.zshrc
@@ -0,0 +1,72 @@
+zstyle ':completion:*' completer _complete _ignored
+zstyle :compinstall filename '/home/shmibs/.zshrc'
+setopt completealiases
+
+autoload -U compinit
+compinit
+autoload -U colors
+colors
+
+HISTFILE=~/.histfile
+HISTSIZE=1000
+SAVEHIST=1000
+setopt HIST_IGNORE_DUPS
+[[ -n "${key[PageUp]}" ]] && bindkey "${key[PageUp]}" history-beginning-search-backward
+[[ -n "${key[PageDown]}" ]] && bindkey "${key[PageDown]}" history-beginning-search-forward
+
+# urxvt does visual mode just fine, and i don't compose
+# any large strings in a shell, so treating it as always
+# insert mode is more sensible
+bindkey -e
+setopt notify
+unsetopt beep
+#%(?..%{$fg[red]%}[e]%{$fg[white]%})
+PROMPT="%{%B$fg[white]%}[%{%(!.$fg[red].$fg[magenta])%}%n@%M %{$fg[blue]%}%~%{$fg[white]%}]: %{%b$reset_color%}"
+
+alias ls='ls --color=auto'
+alias grep='grep --color=auto'
+alias diff='colordiff'
+alias less='less -R'
+
+alias vmount='udevil mount'
+alias vumount='udevil umount'
+alias def='sdcv'
+
+export EDITOR="vim"
+export PAGER="less -R"
+
+################## FUNCTIONS ##################
+send() {
+ if [ "$1" ]; then
+ scp $@ shmibbles.me:/srv/http/tmp/
+ if [ $? -eq 0 ]; then
+ for name in "$@"
+ do
+ name=$(echo "http://shmibbles.me/tmp/$(basename $name)"\
+ | sed 's/ /%20/g')
+ echo $name | tr -d '\n' | xclip -i -selection clipboard
+ echo $name | tr -d '\n' | xclip -i -selection primary
+ done
+ fi
+ else
+ echo "specify at least one file to send"
+ fi
+}
+
+sendi() {
+ if [ "$1" ]; then
+ scp $@ shmibbles.me:/srv/http/img/
+ if [ $? -eq 0 ]; then
+ for name in "$@"
+ do
+ name=$(echo "http://shmibbles.me/img/$(basename $name)"\
+ | sed 's/ /%20/g')
+ echo $name | tr -d '\n' | xclip -i -selection clipboard
+ echo $name | tr -d '\n' | xclip -i -selection primary
+ done
+ fi
+ else
+ echo "specify at least one file to send"
+ fi
+}
+