diff --git a/amigaterm.sh b/amigaterm.sh index 6321635..756a2e7 100755 --- a/amigaterm.sh +++ b/amigaterm.sh @@ -1,2 +1,2 @@ -#!/bin/sh -~/bin/amigaterm2.sh 12 navy 80 orange green $@ +#!/bin/zsh +~/bin/amigaterm2.sh 10 navy 80 orange green $@ diff --git a/amigaterm2.sh b/amigaterm2.sh index 69cd576..d52a761 100755 --- a/amigaterm2.sh +++ b/amigaterm2.sh @@ -1,10 +1,10 @@ -#!/bin/bash +#!/bin/zsh # help shit if [[ $1 == '-h' ]]; then echo Help: $0 fontsize tintcolor fadepercent fadecolor cursorcolor extrashit else -#TP="xft:TopazPlus a600a1200a4000-$1" - TP="xft:TopazPlus a600a1200a4000 for Powerline-$1:antialias=false" +#TP="TopazPlus a600a1200a4000 for Powerline-$1" + TP="xft:TopazPlus a600a1200a4000 for Powerline-$1:antialias=false,xft:Symbola-$1:antialias=false" PN="xft:P0T\-NOoDLE for Powerline-$1" MS="xft:mOsOul for Powerline-$1" MK="xft:MicroKnightPlus for Powerline-$1" diff --git a/amigaterm3.sh b/amigaterm3.sh index 2912832..a78c8b6 100644 --- a/amigaterm3.sh +++ b/amigaterm3.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/zsh # help shit if [[ $1 == '-h' ]]; then echo Help: $0 fontsize tintcolor fadepercent fadecolor cursorcolor extrashit diff --git a/genrandmac.sh b/genrandmac.sh new file mode 100755 index 0000000..e9154bd --- /dev/null +++ b/genrandmac.sh @@ -0,0 +1,5 @@ +#!/bin/zsh +# oddball mac won't work - it's multicast (: +# 5ca1ab1e +printf '5C:A1:AB:1E:%02X:%02X\n' $((RANDOM%256)) $((RANDOM%256)) + diff --git a/pickfontst.sh b/pickfontst.sh index 3da36ce..8aba191 100755 --- a/pickfontst.sh +++ b/pickfontst.sh @@ -1,12 +1,11 @@ -#!/bin/bash -# this may not work any longer with the way that arch has -# redone the fc-list bit, if that's the case and you feel -# like fixing it, fix it... +#!/bin/zsh +# now uses a list I have made of available fonts that work well -PICK=`fc-list | sort |dmenu -i -l 25 -fn mOsOul -p Font` -if [ "$PICK" ]; then - FONT=`echo $PICK | cut -d: -f2` - echo st -f \"$FONT:pixelsize=16:antialias=false:autohint=false\" - st -f "$FONT:pixelsize=16:antialias=false:autohint=false" +PICK=`cat ~/bin/shellfonts.list |dmenu -i -l 25 -fn "ProggySquareTTSZ" -p "ST: Pick Font"` +SIZE=`echo 16,12,14,10,9,8,72 | sed s/,/\\\n/g | dmenu -p Size -fn mOsOul-16 -sb orange -sf navy` +if [[ $PICK ]]; then + FONT=$PICK:pixelsize="$SIZE":antialias=false:autohint=false + echo st -f $FONT + st -f $FONT fi diff --git a/pickfontterm.sh b/pickfontterm.sh index 60a582d..c83e470 100755 --- a/pickfontterm.sh +++ b/pickfontterm.sh @@ -1,9 +1,10 @@ -#!/bin/bash +#!/bin/zsh # this may not work any longer with the way that arch has # redone the fc-list bit, if that's the case and you feel # like fixing it, fix it... PICK=`fc-list | sort |dmenu -i -l 25 -fn mOsOul -p Font` +SIZE=`echo 10,12,14,16,9,8,72 | sed s/,/\\\n/g | dmenu -p Size -fn mOsOul-16 -sb orange -sf navy` if [ "$PICK" ]; then FONT=`echo $PICK | cut -d: -f2 | sed -e "s/^ /xft:/"` @@ -24,9 +25,6 @@ if [ "$PICK" ]; then # echo \ urxvtc -bc -rv -tr -sb +sr -g 80x42 -tint "$DACOL" -fade "$DAFADE" \ -fadecolor "$FADECOLOR" -tn xterm-256color -cr green -sh "$DASHADE" \ - -fn "$FONT" + -fn "$FONT-$SIZE" fi - - - diff --git a/randterm.sh b/randterm.sh index 89a4d9b..58579f1 100755 --- a/randterm.sh +++ b/randterm.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/zsh COLORS=("dodgerblue" "chartreuse" "aliceblue" "forestgreen" "burlywood" "dark goldenrod" "indian red" "firebrick" "Gainsboro" "Misty Rose" "Peach Puff" "Seashell" "Slate Gray" "Tan" "Tomato") DACOLN=$(( $RANDOM % ${#COLORS} )) DACOL=${COLORS[$DACOLN]} @@ -13,4 +13,4 @@ DASHP=$(( $DASHP + 10 )) #DAFADE=$(( $DAFADE + 50 )) #Help: /home/andrew/bin//amigaterm2.sh fontsize tintcolor fadepercent fadecolor cursorcolor extrashit -~/bin/amigaterm2.sh 12 "$DACOL" "$DAFADE" "$DAFCOL" green -sh "$DASHP" "$@" +~/bin/amigaterm2.sh 12 "$DACOL" "$DAFADE" "$DAFCOL" green -sh "$DASHP" -pe selection-to-clipboard "$@" diff --git a/shellfonts.list b/shellfonts.list new file mode 100644 index 0000000..cc992d5 --- /dev/null +++ b/shellfonts.list @@ -0,0 +1,76 @@ +MicroKnightPlus for Powerline +TopazPlus a500a1000a2000 for Powerline +TopazPlus a600a1200a4000 for Powerline +mOsOul for Powerline +Code New Roman +Monofur +Aurulent Sans Mono +Dina ttf 10px-14 +Envy Code R +Fantasque Sans Mono +Hermit +Luculent +Monoid + +CodingFontTobi +Clean +Crisp +Sudo +MonteCarlo Fixed 12 +ProggyCleanTT +ProggyCleanTTSZBP +ProggySmallTT +ProggySquareTT +ProggySquareTTSZ +ProggyTinySZ +ProggyTinyTT +ProggyTinyTTSZ +progsole + +P0T\-NOoDLE for Powerline +CPMono_v07,CPMono_v07 Bold +CPMono_v07,CPMono_v07 Plain +Cutive Mono-16 +Meslo LG M DZ +Metrickal +PixelCarnageMonoTT:autohint=true:antialias=true:pixelsize=16 +Share\-TechMonoTrue +Ubuntu Mono +Verily Serif Mono + +AverageMono +BPmono +ElroNet Monospace +monoOne +Bront +CamingoCode +Anonymous Pro +Office Code Pro +Office Code Pro D +Office Code Pro D,Office Code Pro D Bold +Consola Mono +Edlo +Oxygen Mono +Fira Mono +Hack +Inconsolata\-dz +LucidaTypewriter +MonoMMM_5 +Panic Sans +NotCourierSans +MonoSpatial +NanumGothic_Coding,\353\202\230\353\210\224\352\263\240\353\224\225_\354\275\224\353\224\251 +saxmono +SmallTypeWriting +Source Code Prog +Source Code Pro,Source Code Pro Black +SV Basic Manual,SVI Basic Manual +Whois + +Times +Fixed +Terminus +DejaVu Sans Mono +Bitstream Vera Sans Mono +Liberation Mono +ProFontWindows diff --git a/solarizedterm.sh b/solarizedterm.sh index 59d677c..8f7d3c8 100755 --- a/solarizedterm.sh +++ b/solarizedterm.sh @@ -1,8 +1,15 @@ +#!/bin/zsh xrdb ~/xresources/solorized_xresources urxvtc -fn "xft:TopazPlus a600a1200a4000 for Powerline-12:antialias=false" \ -fi "xft:P0T\-NOoDLE" -fb "xft:mOsOul" -fbi "xft:Microknight" \ +is -cr "#cb4b16" -xrdb ~/xresources/standard_xresources +if [[ $? != 0 ]]; then + urxvtd -f -o -q + urxvtc -fn "xft:TopazPlus a600a1200a4000 for Powerline-12:antialias=false" \ + -fi "xft:P0T\-NOoDLE" -fb "xft:mOsOul" -fbi "xft:Microknight" \ + +is -cr "#cb4b16" +fi +xrdb ~/xresources/standard_xresources diff --git a/tmux.conf b/tmux.conf index e879ba2..bf8af56 100644 --- a/tmux.conf +++ b/tmux.conf @@ -38,10 +38,12 @@ 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 +#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 @@ -83,17 +85,11 @@ set -g status-justify left # anyway. toggle mousemode on/off bind m \ - set -g mode-mouse on \; \ - set -g mouse-resize-pane on \; \ - set -g mouse-select-pane on \; \ - set -g mouse-select-window on \; \ + set -g mouse on\; \ display 'M: ON' bind M \ - set -g mode-mouse off \; \ - set -g mouse-resize-pane off \; \ - set -g mouse-select-pane off \; \ - set -g mouse-select-window off \; \ + set -g mouse off \; \ display 'M: OFF' bind C-v command-prompt -p compose "if '~/bin/tmuxcompose/compose.py \\%% | tmux load-buffer -' 'pasteb -d' 'display notfound'" diff --git a/xresources/solorized_xresources b/xresources/solorized_xresources deleted file mode 100644 index 682a6d4..0000000 --- a/xresources/solorized_xresources +++ /dev/null @@ -1,71 +0,0 @@ -! Solarized color scheme for the X Window System -! -! http://ethanschoonover.com/solarized - - -! Common - -#define S_yellow #b58900 -#define S_orange #cb4b16 -#define S_red #dc322f -#define S_magenta #d33682 -#define S_violet #6c71c4 -#define S_blue #268bd2 -#define S_cyan #2aa198 -#define S_green #859900 - - -! Dark - -#define S_base03 #002b36 -#define S_base02 #073642 -#define S_base01 #586e75 -#define S_base00 #657b83 -#define S_base0 #839496 -#define S_base1 #93a1a1 -#define S_base2 #eee8d5 -#define S_base3 #fdf6e3 - - -! Light - -! #define S_base03 #fdf6e3 -! #define S_base02 #eee8d5 -! #define S_base01 #93a1a1 -! #define S_base00 #839496 -! #define S_base0 #657b83 -! #define S_base1 #586e75 -! #define S_base2 #073642 -! #define S_base3 #002b36 - - -! To only apply colors to your terminal, for example, prefix -! the color assignment statement with its name. Example: -! -! URxvt*background: S_base03 - -*background: S_base03 -*foreground: S_base0 -*fading: 40 -*fadeColor: S_base03 -*cursorColor: S_base1 -*pointerColorBackground: S_base01 -*pointerColorForeground: S_base1 - -*color0: S_base02 -*color1: S_red -*color2: S_green -*color3: S_yellow -*color4: S_blue -*color5: S_magenta -*color6: S_cyan -*color7: S_base2 -*color8: S_base03 -*color9: S_orange -*color10: S_base01 -*color11: S_base00 -*color12: S_base0 -*color13: S_violet -*color14: S_base1 -*color15: S_base3 - diff --git a/xresources/standard_xresources b/xresources/standard_xresources deleted file mode 100644 index e154023..0000000 --- a/xresources/standard_xresources +++ /dev/null @@ -1,31 +0,0 @@ -! Black -*color0: #000000 -*color8: #666666 - -! Red -*color1: rgb:B0/00/00 -*color9: rgb:FF/00/00 - -! Green -*color2: #00B000 -*color10: #00FF00 - -! Yellow -*color3: rgb:B0/B0/00 -*color11: rgb:ff/ff/00 - -! Blue -*color4: #0000B0 -*color12: #0000FF - -! Magenta -*color5: #B000B0 -*color13: #FF00FF - -! Cyan -*color6: #00B0B0 -*color14: #00FFFF - -! White -*color7: #B0B0B0 -*color15: #ffffff diff --git a/zshrc b/zshrc index 06476e7..cebd3d9 100644 --- a/zshrc +++ b/zshrc @@ -4,19 +4,22 @@ source ~/bin/zgen/zgen.zsh source ~/bin/fixcolors HIST_STAMPS="yyyy-mm-dd" HISTFILE=~/.histfile -HISTSIZE=1000 -SAVEHIST=1000 +HISTSIZE=2000 +SAVEHIST=2000 setopt appendhistory autocd extendedglob -xset -b + +#xset -b + unsetopt beep bindkey -e export LESS="-X -R -F" -alias stp="st -f 'TopazPlus a500a1000a2000-14'" alias http='python -m http.server' -export PATH=$HOME/bin:/usr/local/bin:$PATH -alias truckedit=subl + +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) @@ -29,9 +32,10 @@ if ! zgen saved; then 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/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 @@ -41,13 +45,21 @@ if ! zgen saved; then zgen load Tarrasch/zsh-bd zgen load Tarrasch/zsh-colors zgen load supercrabtree/k - zgen load caiogondim/bullet-train-oh-my-zsh-theme bullet-train +# 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 -source ~/bin/bullettrain - unsetopt share_history +setopt NO_SHARE_HISTORY +setopt HIST_EXPIRE_DUPS_FIRST + +#. ~/bin/bullettrain +#. ~/bin/aliases + +theme linuxonly + yellow All Done!