From 3538b1dad29d83b66b6cf04b7db7abf2f3fbd1aa Mon Sep 17 00:00:00 2001 From: Darth Joulupukki Date: Sun, 23 Oct 2016 12:59:15 +0300 Subject: [PATCH 1/9] Remove unused bullettrain theme for oh-my-zsh --- bullettrain | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 bullettrain diff --git a/bullettrain b/bullettrain deleted file mode 100644 index 90e7c64..0000000 --- a/bullettrain +++ /dev/null @@ -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 - From d4b94e6f169a94f0951ee2968333a439b06fd412 Mon Sep 17 00:00:00 2001 From: Darth Joulupukki Date: Sun, 23 Oct 2016 12:59:34 +0300 Subject: [PATCH 2/9] you know just remove oh-my-zsh too as we're not using it --- zshrc-omz | 65 ------------------------------------------------------- 1 file changed, 65 deletions(-) delete mode 100644 zshrc-omz diff --git a/zshrc-omz b/zshrc-omz deleted file mode 100644 index cebd3d9..0000000 --- a/zshrc-omz +++ /dev/null @@ -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! From 4b5fd8adf2ec17d8af9fafb8857edc264eefb2b9 Mon Sep 17 00:00:00 2001 From: Darth Joulupukki Date: Sun, 23 Oct 2016 13:05:40 +0300 Subject: [PATCH 3/9] update README for home. hmm. should be markdown... --- README | 16 ---------------- README.md | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 16 deletions(-) delete mode 100644 README create mode 100644 README.md diff --git a/README b/README deleted file mode 100644 index 2082711..0000000 --- a/README +++ /dev/null @@ -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... - diff --git a/README.md b/README.md new file mode 100644 index 0000000..6f18c48 --- /dev/null +++ b/README.md @@ -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. + From 2aea10e23d35fb70c14a04a873ccf997821b2772 Mon Sep 17 00:00:00 2001 From: Darth Joulupukki Date: Sun, 23 Oct 2016 13:06:23 +0300 Subject: [PATCH 4/9] worssh script for doing ssh "vpn" via a tunnel. --- worssh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 worssh diff --git a/worssh b/worssh new file mode 100755 index 0000000..2c2a1f0 --- /dev/null +++ b/worssh @@ -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 "${@}" + From c51c8b5e1ad053dfb1807d975b6c6d4b580ceade Mon Sep 17 00:00:00 2001 From: Darth Joulupukki Date: Sun, 23 Oct 2016 13:07:08 +0300 Subject: [PATCH 5/9] add geturl for using surf via awesome quick-pick list --- geturl.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 geturl.sh diff --git a/geturl.sh b/geturl.sh new file mode 100755 index 0000000..3577538 --- /dev/null +++ b/geturl.sh @@ -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 + + From 146edc11619e1e513208e917dac910c76c3a901d Mon Sep 17 00:00:00 2001 From: Darth Joulupukki Date: Sun, 23 Oct 2016 13:11:24 +0300 Subject: [PATCH 6/9] add some of Viler's fonts to the list --- shellfonts.list | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/shellfonts.list b/shellfonts.list index cc992d5..abab3d7 100644 --- a/shellfonts.list +++ b/shellfonts.list @@ -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 From 8be6e3ef0669345f88af3103101b8832a3caa454 Mon Sep 17 00:00:00 2001 From: Howland Owl Date: Sun, 23 Oct 2016 13:13:53 +0300 Subject: [PATCH 7/9] git config (for the tree.) --- gitconfig | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 gitconfig diff --git a/gitconfig b/gitconfig new file mode 100644 index 0000000..18c48c3 --- /dev/null +++ b/gitconfig @@ -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)' From 401bec6b93b5b6daa2359cdb8bd1f4afd653681a Mon Sep 17 00:00:00 2001 From: Howland Owl Date: Sun, 23 Oct 2016 13:47:14 +0300 Subject: [PATCH 8/9] conditional for xset so we don't try to run on a server/without xset --- zshrc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/zshrc b/zshrc index 71befc6..2a3d5a5 100644 --- a/zshrc +++ b/zshrc @@ -1,19 +1,23 @@ 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 + 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 +54,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 From 14f115f6b373de5531647c3da29b7b3c75cc351e Mon Sep 17 00:00:00 2001 From: Howland Owl Date: Tue, 25 Oct 2016 09:12:06 +0300 Subject: [PATCH 9/9] Check if we have st terminfo; change to xterm if we don't --- zshrc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/zshrc b/zshrc index 2a3d5a5..55585b1 100644 --- a/zshrc +++ b/zshrc @@ -12,6 +12,12 @@ 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"