From a92c39c71087612b91a775cc05b5be9c38b03313 Mon Sep 17 00:00:00 2001 From: Howland Owl Date: Fri, 9 Dec 2016 21:22:01 +0200 Subject: [PATCH] Revert "Merge branch 'home' into 'fixthatshit'" This reverts commit 1639a576f460b721d0538219917eb9f605c4f6cd, reversing changes made to cc75e76c654496d7606725a8308ca34dae80f1a8. --- README | 16 +++++++++ README.md | 30 ----------------- aliases | 13 ++++++++ bullettrain | 16 +++++++++ gitconfig | 10 ------ powerline-shell-init | 2 +- ruler | 1 + tmux.conf | 78 ++++++++++++++++++-------------------------- zshrc | 6 ++-- zshrc-omz | 65 ++++++++++++++++++++++++++++++++++++ 10 files changed, 147 insertions(+), 90 deletions(-) create mode 100644 README delete mode 100644 README.md create mode 100644 bullettrain delete mode 100644 gitconfig create mode 100644 ruler create mode 100644 zshrc-omz diff --git a/README b/README new file mode 100644 index 0000000..2082711 --- /dev/null +++ b/README @@ -0,0 +1,16 @@ +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 deleted file mode 100644 index 6f18c48..0000000 --- a/README.md +++ /dev/null @@ -1,30 +0,0 @@ -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. - diff --git a/aliases b/aliases index 0e4b4b0..a7181c2 100644 --- a/aliases +++ b/aliases @@ -1 +1,14 @@ ruler() { for s in '....^....|' '1234567890'; do w=${#s}; str=$( for (( i=1; $i<=$((($COLUMNS + $w) / $w )) ; i=$i+1 )); do echo -n $s; done ); str=$(echo $str | cut -c -$COLUMNS) ; echo $str; done; } + +surftabbednoads() { + http_proxy=192.168.42.5:8118 tabbed -r2 surf -e -a@Aa -BDfg +} + +surftabbed() { + tabbed -r2 surf -e -a@Aa -BDfg +} + +mktruckdir() { + sudo mkdir ${1} + sudo chown truck:truck ${1} +} diff --git a/bullettrain b/bullettrain new file mode 100644 index 0000000..90e7c64 --- /dev/null +++ b/bullettrain @@ -0,0 +1,16 @@ +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 + diff --git a/gitconfig b/gitconfig deleted file mode 100644 index 18c48c3..0000000 --- a/gitconfig +++ /dev/null @@ -1,10 +0,0 @@ -[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)' diff --git a/powerline-shell-init b/powerline-shell-init index 1747424..c740ea5 100644 --- a/powerline-shell-init +++ b/powerline-shell-init @@ -13,4 +13,4 @@ function install_powerline_precmd() { if [ "$TERM" != "linux" ]; then install_powerline_precmd -fi \ No newline at end of file +fi diff --git a/ruler b/ruler new file mode 100644 index 0000000..0e4b4b0 --- /dev/null +++ b/ruler @@ -0,0 +1 @@ +ruler() { for s in '....^....|' '1234567890'; do w=${#s}; str=$( for (( i=1; $i<=$((($COLUMNS + $w) / $w )) ; i=$i+1 )); do echo -n $s; done ); str=$(echo $str | cut -c -$COLUMNS) ; echo $str; done; } diff --git a/tmux.conf b/tmux.conf index 774f750..bf8af56 100644 --- a/tmux.conf +++ b/tmux.conf @@ -1,4 +1,4 @@ -# Truck's updated 2016 tmux config +# Truck's tmux config, started with the tmux productive book. # fix the prefix to control-a and remap control-a to work like screen set -g prefix C-a @@ -24,69 +24,55 @@ bind | split-window -h bind - split-window -v # I dunno about this vi shit, yeah fuck that, be more awesome. -# 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 +# 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 # cycle thru windows, which seems... no. bullshit. that is p and n. period. -#initial mouse on +# 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 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 -# 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 +#set -g message-fg colour190 +#set -g message-bg colour18 +set -g message-bg colour160 +set -g message-fg colour252 #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] -# if not using powerline - +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" set -g status-left-length 40 -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 +set -g status-right "%Y/%m/%e %H:%M %Z" setw -g monitor-activity on set -g visual-activity on @@ -95,7 +81,8 @@ set -g status-justify left # mouse fixin's -# toggle mousemode on/off +# the blog where this came from is fuckign bullshit with it's copy paste blocking +# anyway. toggle mousemode on/off bind m \ set -g mouse on\; \ @@ -105,5 +92,4 @@ 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'" diff --git a/zshrc b/zshrc index d5cab76..1d3650f 100644 --- a/zshrc +++ b/zshrc @@ -1,7 +1,7 @@ echo "Loading zgen..." source ~/bin/zgen/zgen.zsh -source ~/bin/fixcolors +source ~/bin/fixcolors HIST_STAMPS="yyyy-mm-dd" HISTFILE=~/.histfile HISTSIZE=2000 @@ -25,7 +25,7 @@ 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 @@ -74,4 +74,4 @@ unalias cp setopt NO_SHARE_HISTORY setopt HIST_EXPIRE_DUPS_FIRST -yellow All Done! \ No newline at end of file +yellow All Done! diff --git a/zshrc-omz b/zshrc-omz new file mode 100644 index 0000000..cebd3d9 --- /dev/null +++ b/zshrc-omz @@ -0,0 +1,65 @@ +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!