Merge branch 'home' into 'master'

Update to latest 'home' for base pulling



See merge request !1
This commit is contained in:
Howland Owl 2016-10-29 13:44:52 +03:00
commit b7ad7baa8e
9 changed files with 79 additions and 102 deletions

16
README
View file

@ -1,16 +0,0 @@
Stuff.
Stuff I use, which I continue to update
* and then have to recreate on another box
* or have to copy from the work box
* or all sorts of similar loss of time/debugging.
DMG's fonts are here also ( http://www.trueschool.se ) - Powerline versions are just patched versions of these.
my "randterm" and "amigaterm2" term scripts (urxvt) + a few other term launches (awesome menu/keylaunch)
zshrc bits... now with zgen! \o/
- this generally gets put in ~/bin/ - some bits (like zshrc) needs to be moved to ~ . Fonts to .fonts obviously.
and as I add stuff I may comment...

30
README.md Normal file
View file

@ -0,0 +1,30 @@
HOME (x/wayland) VERSION
---
Stuff.
Stuff I use, which I continue to update
* and then have to recreate on another box
* or have to copy from the work box
* or all sorts of similar loss of time/debugging.
DMG's fonts are here also ( http://www.trueschool.se )
- Powerline versions are just patched versions of these.
Other fonts from Codeface project as well, PLUS the fonts from Viler's Px IBM
font series.
my "randterm" and "amigaterm2" term scripts (urxvt and st)
- a few other term launches (awesome menu/keylaunch)
- a script to launch surf from awesome with a list of url's
zshrc bits... now with zgen! \o/
- optional powerline for status (not included, install via pip --user )
- git clone repo to ~/bin
- some bits (like zshrc) needs to be moved to ~ . Fonts to .fonts obviously.
tmux has been redone, and can optionally use powerline as the status.

View file

@ -1,16 +0,0 @@
BULLETTRAIN_VIRTUALENV_PREFIX=µ
BULLETTRAIN_VIRTUALENV_BG=45
BULLETTRAIN_VIRTUALENV_FG=17
BULLETTRAIN_GIT_FG=31
BULLETTRAIN_GIT_BG=14
BULLETTRAIN_TIME_FG=147
BULLETTRAIN_TIME_BG=27
BULLETTRAIN_DIR_FG=237
BULLETTRAIN_DIR_BG=39
BULLETTRAIN_PROMPT_CHAR="»"
BULLETTRAIN_PROMPT_ROOT=true

12
geturl.sh Executable file
View file

@ -0,0 +1,12 @@
#!/bin/sh
URL=`dmenu -fn 'mOsOul for Powerline-10' -nb navy -nf chartreuse -sb black -sf orange -p "Url>" -l 8 < ~/bin/urllist`
if [ $URL ]; then
if [ "$URL" = "clipboard" ]; then
URL=`xclip -o`
fi
export http_proxy=192.168.42.5:8118
tabbed -r2 surf -e -a@Aa -BDfg $URL
fi

10
gitconfig Normal file
View file

@ -0,0 +1,10 @@
[alias]
tree = !"git lg1"
lg = !"git lg1"
lg1 = !"git lg1-specific --all"
lg2 = !"git lg2-specific --all"
lg3 = !"git lg3-specific --all"
lg1-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'
lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'

View file

@ -12,6 +12,13 @@ Hermit
Luculent
Monoid
Px437 AT&T PC6300
Px437 TandyOld 225\-2y
Px437 ToshibaLCD 8x16
Px437 Verite 8x14
Px437 IBM PS/2thin4
Px437 AmstradPC1512\-2y
CodingFontTobi
Clean
Crisp

3
worssh Executable file
View file

@ -0,0 +1,3 @@
#!/bin/zsh
ssh -D 9944 -o "ProxyCommand /usr/bin/nc -X 5 -x 127.0.0.1:9000 %h %p" -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "${@}"

22
zshrc
View file

@ -1,19 +1,29 @@
echo "Loading zgen..."
source ~/bin/zgen/zgen.zsh
source ~/bin/fixcolors
HIST_STAMPS="yyyy-mm-dd"
HISTFILE=~/.histfile
HISTSIZE=2000
SAVEHIST=2000
setopt appendhistory autocd extendedglob
xset -b
if [ -x /usr/bin/xset ]; then
xset -b
fi
if [[ ${TERM} == st* ]]; then
if [ ! -e /usr/share/terminfo/s/st-256color ]; then
export TERM=xterm-256color
fi
fi
unsetopt beep
bindkey -e
export LESS="-X -R -F"
alias http='python -m http.server'
export PATH=$HOME/bin:/usr/local/bin:$PATH
alias t=todo.sh
export EDITOR=mg
autoload insert-composed-char
@ -50,8 +60,10 @@ fi
prompt fire 125 234 084 054 020
# powerline (arch location)
#. /usr/share/zsh/site-contrib/powerline.zsh
# powerline
#source ~/.local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh
alias t=todo.sh
unalias rm
unalias mv

View file

@ -1,65 +0,0 @@
echo "Loading zgen..."
source ~/bin/zgen/zgen.zsh
source ~/bin/fixcolors
HIST_STAMPS="yyyy-mm-dd"
HISTFILE=~/.histfile
HISTSIZE=2000
SAVEHIST=2000
setopt appendhistory autocd extendedglob
#xset -b
unsetopt beep
bindkey -e
export LESS="-X -R -F"
alias http='python -m http.server'
alias t=todo.sh
export EDITOR=mg
export PATH=$HOME/bin:/usr/local/bin:$PATH
autoload insert-composed-char
zle -N insert-composed-char
# bind it to some key (Ctrl+x in this example)
bindkey  insert-composed-char
if ! zgen saved; then
echo "creating zgen save..."
zgen oh-my-zsh
zgen oh-my-zsh plugins/sudo
zgen oh-my-zsh plugins/tmux
zgen oh-my-zsh plugins/themes
zgen oh-my-zsh plugins/rsync
# zgen oh-my-zsh plugins/archlinux
zgen oh-my-zsh plugins/git
zgen oh-my-zsh plugins/mosh
zgen oh-my-zsh plugins/vagrant
zgen oh-my-zsh plugins/virtualenv
zgen oh-my-zsh plugins/history
zgen oh-my-zsh plugins/pip
zgen oh-my-zsh plugins/python
zgen oh-my-zsh plugins/systemd
zgen load zsh-users/zsh-syntax-highlighting
zgen load Tarrasch/zsh-bd
zgen load Tarrasch/zsh-colors
zgen load supercrabtree/k
# zgen load jplitza/zsh-virsh-autocomplete
zgen load truck/zsh-virsh-autocomplete
# zgen load caiogondim/bullet-train-oh-my-zsh-theme bullet-train
zgen save
fi
unsetopt share_history
setopt NO_SHARE_HISTORY
setopt HIST_EXPIRE_DUPS_FIRST
#. ~/bin/bullettrain
#. ~/bin/aliases
theme linuxonly
yellow All Done!