From f397c7ad9e9cc8272ee572ff287a46c1d21036cf Mon Sep 17 00:00:00 2001 From: Darth Joulupukki Date: Sun, 23 Oct 2016 11:31:00 +0300 Subject: [PATCH 01/12] Move 'ruler' to 'aliases' so we can have more aliases and not edit .zshrc --- ruler => aliases | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ruler => aliases (100%) diff --git a/ruler b/aliases similarity index 100% rename from ruler rename to aliases From d8fd53e6117479a2c232a7a4e5e2b6890de8da55 Mon Sep 17 00:00:00 2001 From: Darth Joulupukki Date: Sun, 23 Oct 2016 12:49:37 +0300 Subject: [PATCH 02/12] Fix tmux.conf again. Several options have changed. --- tmux.conf | 78 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 32 deletions(-) diff --git a/tmux.conf b/tmux.conf index bf8af56..774f750 100644 --- a/tmux.conf +++ b/tmux.conf @@ -1,4 +1,4 @@ -# Truck's tmux config, started with the tmux productive book. +# Truck's updated 2016 tmux config # fix the prefix to control-a and remap control-a to work like screen set -g prefix C-a @@ -24,55 +24,69 @@ bind | split-window -h bind - split-window -v # I dunno about this vi shit, yeah fuck that, be more awesome. -# this not only is ijkm, proper movement, but adds tab and enter to the mix. -bind C-i select-pane -U -bind C-j select-pane -L -bind C-k select-pane -R -bind C-m select-pane -D +# wasd. cuz. +bind C-w select-pane -U +bind C-a select-pane -L +bind C-s select-pane -D +bind C-d select-pane -R + +# Resize +bind -r W resize-pane -U 5 +bind -r A resize-pane -L 5 +bind -r S resize-pane -D 5 +bind -r D resize-pane -R 5 + +# now that messed up d/D, so redo them on e/E +bind -r E choose-client +bind -r e detach-client # cycle thru windows, which seems... no. bullshit. that is p and n. period. -# what I _do_ want is resize on those, like in awesome. -bind -r H resize-pane -L 5 -bind -r L resize-pane -R 5 -bind -r I resize-pane -U 5 -bind -r M resize-pane -D 5 - -set -g mouse-utf8 on +#initial mouse on set -g mouse on -#mouse select-resize -#set -g mouse-select-pane on -#set -g mouse-resize-pane on -#set -g mouse-select-window on - # choose colors wisely! why the fuck did I say that set -g status-fg colour202 set -g status-bg colour17 set -g window-status-fg colour184 set -g window-status-bg colour234 -set -g pane-border-fg colour53 -set -g pane-border-bg colour233 -set -g pane-active-border-fg colour47 -set -g pane-active-border-bg colour22 -#set -g message-fg colour190 -#set -g message-bg colour18 -set -g message-bg colour160 -set -g message-fg colour252 +# pane colors + +set -g pane-border-bg colour238 +set -g pane-border-fg colour249 +set -g pane-active-border-bg colour029 +set -g pane-active-border-fg colour023 + +# message colors + +set -g message-bg colour214 +set -g message-fg colour022 #status bar # H-hostname, h, hostname without domain ##- a # # Window: # F - Flag, I - Index T- Title W - Name -# Pane index: P Screen index: S +# Pane index: P Screen index: S # #(shell command result line 1) #[colorchangestuffs] -set -g status-utf8 on -set -g status-left "#[fg=colour83]#S ䷀#[bg=colour22]#I#[bg=colour156,fg=colour20]𝕡#P#[fg=colour150,bg=colour55] ≋ #W" +# if not using powerline + set -g status-left-length 40 -set -g status-right "%Y/%m/%e %H:%M %Z" +set-window-option -g status-left "Sn:#S " +set-window-option -g status-left-fg colour166 +set-window-option -g status-left-bg colour239 +set-window-option -g status-right "[#F] #H %H:%M %Y/%m/%e %Z" +set-window-option -g status-right-fg colour254 +set-window-option -g status-right-bg colour236 +set-window-option -g window-status-format " #I: {#D-#W} " +set-window-option -g window-status-current-format " #I: {#D-#W} " +set-window-option -g window-status-current-fg green +set-window-option -g window-status-current-bg black + +# if using powerline +#include ~/.local/lib/python2.7/site-packages/powerline/tmux/powerline.conf setw -g monitor-activity on set -g visual-activity on @@ -81,8 +95,7 @@ set -g status-justify left # mouse fixin's -# the blog where this came from is fuckign bullshit with it's copy paste blocking -# anyway. toggle mousemode on/off +# toggle mousemode on/off bind m \ set -g mouse on\; \ @@ -92,4 +105,5 @@ bind M \ set -g mouse off \; \ display 'M: OFF' +# my compose script bind C-v command-prompt -p compose "if '~/bin/tmuxcompose/compose.py \\%% | tmux load-buffer -' 'pasteb -d' 'display notfound'" From 3538b1dad29d83b66b6cf04b7db7abf2f3fbd1aa Mon Sep 17 00:00:00 2001 From: Darth Joulupukki Date: Sun, 23 Oct 2016 12:59:15 +0300 Subject: [PATCH 03/12] 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 04/12] 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 05/12] 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 06/12] 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 07/12] 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 08/12] 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 09/12] 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 10/12] 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 11/12] 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" From 512c3ac67cd5c118d94e7029e05cbf9fa8e012ea Mon Sep 17 00:00:00 2001 From: Howland Owl Date: Fri, 9 Dec 2016 20:12:01 +0200 Subject: [PATCH 12/12] updates to the prompt --- powerline-shell-init | 2 +- zshrc | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/powerline-shell-init b/powerline-shell-init index 3f09359..75be4c2 100644 --- a/powerline-shell-init +++ b/powerline-shell-init @@ -1,5 +1,5 @@ function powerline_precmd() { - PS1="$(/home/truck/stuff/powerline-shell/powerline-shell.py $? --shell zsh 2> /dev/null)" + PS1="$(/home/truck/sturf/powerline-shell/powerline-shell.py $? --shell zsh 2> /dev/null)" } function install_powerline_precmd() { diff --git a/zshrc b/zshrc index 55585b1..7da7fc7 100644 --- a/zshrc +++ b/zshrc @@ -58,12 +58,10 @@ fi . ~/bin/aliases -prompt fire 125 234 084 054 020 - -# powerline +#prompt fire 125 234 084 054 020 +# powerline #source ~/.local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh - -alias t=todo.sh +source ~/bin/powerline-shell-init unalias rm unalias mv