From 0440bdc0dd952bdcd7fb56d1257c9782504cf170 Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Thu, 15 Mar 2018 10:50:49 -0400 Subject: [PATCH] Move files to skel --- shells/af-magic.zsh-theme | 44 --- shells/tmprc | 257 ------------------ .../.vimperator/colors}/vimPgray.vimp | 0 .../vimperatorrc => skel.old/.vimperatorrc | 0 i3/Xmodmap => skel/.Xmodmap | 0 shells/Xresources => skel/.Xresources | 0 shells/bashrc => skel/.bashrc | 0 dunst/dunstrc => skel/.config/.dunstrc | 0 {shells => skel/.config}/liquidpromptrc | 0 {i3 => skel/.config/synapse}/gtkrc | 0 git/gitconfig => skel/.gitconfig | 0 {i3 => skel/.i3}/config | 0 python/pylintrc => skel/.pylintrc | 0 tmux/tmux.conf => skel/.tmux.conf | 0 vim/vimrc => skel/.vimrc | 0 i3/xsession => skel/.xsession | 0 shells/zshrc => skel/.zshrc | 0 17 files changed, 301 deletions(-) delete mode 100644 shells/af-magic.zsh-theme delete mode 100644 shells/tmprc rename {vimperator => skel.old/.vimperator/colors}/vimPgray.vimp (100%) rename vimperator/vimperatorrc => skel.old/.vimperatorrc (100%) rename i3/Xmodmap => skel/.Xmodmap (100%) rename shells/Xresources => skel/.Xresources (100%) rename shells/bashrc => skel/.bashrc (100%) rename dunst/dunstrc => skel/.config/.dunstrc (100%) rename {shells => skel/.config}/liquidpromptrc (100%) rename {i3 => skel/.config/synapse}/gtkrc (100%) rename git/gitconfig => skel/.gitconfig (100%) rename {i3 => skel/.i3}/config (100%) rename python/pylintrc => skel/.pylintrc (100%) rename tmux/tmux.conf => skel/.tmux.conf (100%) rename vim/vimrc => skel/.vimrc (100%) rename i3/xsession => skel/.xsession (100%) rename shells/zshrc => skel/.zshrc (100%) diff --git a/shells/af-magic.zsh-theme b/shells/af-magic.zsh-theme deleted file mode 100644 index 6294de1..0000000 --- a/shells/af-magic.zsh-theme +++ /dev/null @@ -1,44 +0,0 @@ -# af-magic.zsh-theme -# Repo: https://github.com/andyfleming/oh-my-zsh -# Direct Link: https://github.com/andyfleming/oh-my-zsh/blob/master/themes/af-magic.zsh-theme - -if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi -if [ -z "$SSH_TTY" ] && [ -z "$SSH_CONNECTION" ] && [ -z "$SSH_CLIENT" ] ; then - local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" -else - local return_code="%(?..%{$fg[green]%}%? ↵%{$reset_color%})" -fi - -# primary prompt -PROMPT='$FG[032]%~\ -$(git_prompt_info) \ -$FG[105]%(!.#.$)%{$reset_color%} ' -PROMPT2='%{$fg[red]%}\ %{$reset_color%}' -RPS1='${return_code}' -# » - -# color vars -eval my_gray='$FG[237]' -eval my_orange='$FG[214]' - -# right prompt -if type "virtualenv_prompt_info" > /dev/null -then - if [[ $EUID -ne 0 ]] && [ -z "$SSH_TTY" ] && [ -z "$SSH_CONNECTION" ] && [ -z "$SSH_CLIENT" ]; then - RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%' - else - RPROMPT='$(virtualenv_prompt_info)$my_red%n@%m%{$reset_color%}%' - fi -else - if [[ $EUID -ne 0 ]] && [ -z "$SSH_TTY" ] && [ -z "$SSH_CONNECTION" ] && [ -z "$SSH_CLIENT" ]; then - RPROMPT='$my_gray%n@%m%{$reset_color%}%' - else - RPROMPT='$my_red%n@%m%{$reset_color%}%' - fi -fi - -# git settings -ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:" -ZSH_THEME_GIT_PROMPT_CLEAN="" -ZSH_THEME_GIT_PROMPT_DIRTY="$my_orange*%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="$FG[075])%{$reset_color%}" diff --git a/shells/tmprc b/shells/tmprc deleted file mode 100644 index 92b3565..0000000 --- a/shells/tmprc +++ /dev/null @@ -1,257 +0,0 @@ -case $- in - *i*) ;; - *) return;; -esac -HISTCONTROL=ignoreboth -shopt -s histappend -shopt -s checkwinsize -[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" -if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi -case "$TERM" in - xterm-color) color_prompt=yes;; -esac -if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - color_prompt=yes - else - color_prompt= - fi -fi -if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' -else - PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' -fi -unset color_prompt force_color_prompt -# If this is an xterm set the title to user@host:dir -case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" - ;; -*) - ;; -esac -if ! shopt -oq posix; then - if [ -f /usr/share/bash-completion/bash_completion ]; then - . /usr/share/bash-completion/bash_completion - elif [ -f /etc/bash_completion ]; then - . /etc/bash_completion - fi -fi -[ -f /usr/share/autojump/autojump.sh ] && . /usr/share/autojump/autojump.sh - -[[ -s /home/stonewareslord/.autojump/etc/profile.d/autojump.sh ]] && source /home/stonewareslord/.autojump/etc/profile.d/autojump.sh -export PATH=/home/stonewareslord/.autojump/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/home/stonewareslord/tmp/ucpp/ucpp/:/home/stonewareslord/tmp/ucpp/ucpp/:/home/stonewareslord/hitchhikers/bin/ucpp/ucpp:/home/stonewareslord/hitchhikers/bin/ucpp/ucpp -alias bat='upower -i /org/freedesktop/UPower/devices/battery_BAT0| grep -E "state|to\ full|percentage"' - -complete -cf sudo man - -#Alias definitions. -if [ "$(uname)" != "Darwin" ] ; then - alias ls='ls --color=always -F' -fi -if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' -fi -alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' -#alias vim='vim +"au BufWritePost .vimrc so ~/.vimrc" +"au BufWritePost vimrc so ~/.vimrc"' -alias disphost='export DISPLAY=:0.0' -alias ll='ls -alF' -alias la='ls -A' -alias l='ls -CF' -alias logout='sudo pkill -u $USER' -alias fixsh='ssh-keygen -R' -alias tmux='tmux -2' -alias less='less -r' -alias tree='tree -C' -alias grep="grep --color=auto" -alias skim="(head -5; tail -5) <" -alias cp="cp -v" -alias mv="mv -v" -alias la='ls -lah $LS_COLOR' -alias dt='date "+%F %T"' -alias awake='disphost; while true; do xdotool mousemove 0 0; sleep 60; done' -alias adk='/home/stonewareslord/applications/adk/bin/studio.sh&>/dev/null' -alias resource='. ~/.bashrc' -alias install='sudo apt-get install' -alias search='sudo apt-cache search' -alias remove='sudo apt-get remove' -alias update='sudo apt-get update' -alias upgrade='sudo apt-get upgrade' -alias autoremove='sudo apt-get autoremove' -alias ..='k ..' -alias ...='k ../..' -alias ....='k ../../..' -alias .....='k ../../../..' -alias ......='k ../../../../..' -alias .......='k ../../../../../..' -alias ........='k ../../../../../../..' -alias .........='k ../../../../../../../..' -alias ytdl="youtube-dl $@ -x --audio-format mp3 --audio-quality 0 -c -o '%(title)s.%(ext)s'" -alias tux="tmux a||tmux" -alias rmgit="git remote rm origin;git remote rm https;git remote rm oOrigin;git remote rm oHttps" -alias g="git $@" -function mcl(){ mkdir "$@"&&cl "$@"; } -function cl(){ cd "$@" && ls; } -function k(){ - if [ -d "$@" ] ; then - cd "$@" && ls - elif [ "$@" == "-" ] ; then - cd - && ls - elif [ -f "$@" ] ; then - vim "$@" - else - echo -n "Create? " - read a - if [ ! -z $a ] ; then - vim "$@" - fi - fi -} -complete -f k -function ovim(){ vim +"SessionOpen $@"; } -function ogvim(){ gvim +"SessionOpen $@"; } -function tsh(){ - ssh $* -X - if which ponysay >/dev/null; then - ponysay "Connection closed!" - else - echo "\n\n\n\n\n\n\n\n\n\nSESSION CLOSED\n\n\n\n\n\n\n\n\n\n" - fi -} - - -#Functions -extract () { - if [ -f $1 ] ; then - case $1 in - *.tar.xz) tar xvf $1 ;; - *.tar.bz2) tar xvjf $1 ;; - *.tar.gz) tar xvzf $1 ;; - *.bz2) bunzip2 $1 ;; - *.rar) rar x $1 ;; - *.gz) gunzip $1 ;; - *.tar) tar xvf $1 ;; - *.tbz2) tar xvjf $1 ;; - *.tgz) tar xvzf $1 ;; - *.zip) unzip $1 ;; - *.Z) uncompress $1 ;; - *.7z) 7z x $1 ;; - *) echo "don't know how to extract '$1'..." ;; - esac - else - echo "'$1' is not a valid file!" - fi -} -export -f extract -function cinitify(){ - mkdir $2 - cd $2 - git init - git remote add origin git@austenwares.com:$1/$2.git - git remote add https https://austenwares.com/gitlab/$1/$2.git - #Offline mode - git remote add oOrigin git@10.0.1.200:$1/$2.git - git remote add oHttps https://10.0.1.200/gitlab/$1/$2.git - git remote -v - echo -n "Pull from: " - read from - git pull $FROM - git co master -} -export -f cinitify -function initify(){ - git init - git remote add origin git@austenwares.com:$1/$2.git - git remote add https https://austenwares.com/gitlab/$1/$2.git - #Offline mode - git remote add oOrigin git@10.0.1.200:$1/$2.git - git remote add oHttps https://10.0.1.200/gitlab/$1/$2.git - git remote -v - echo -n "Pull from: " - read from - git pull $FROM - git co master -} -export -f initify - -#Color definitions -txtblk='\[\e[0;30m\]' # Black - Regular -txtred='\[\e[0;31m\]' # Red -txtgrn='\[\e[0;32m\]' # Green -txtylw='\[\e[0;33m\]' # Yellow -txtblu='\[\e[0;34m\]' # Blue -txtpur='\[\e[0;35m\]' # Purple -txtcyn='\[\e[0;36m\]' # Cyan -txtwht='\[\e[0;37m\]' # White - -bldblk='\[\e[1;30m\]' # Black - Bold -bldred='\[\e[1;31m\]' # Red -bldgrn='\[\e[1;32m\]' # Green -bldylw='\[\e[1;33m\]' # Yellow -bldblu='\[\e[1;34m\]' # Blue -bldpur='\[\e[1;35m\]' # Purple -bldcyn='\[\e[1;36m\]' # Cyan -bldwht='\[\e[1;37m\]' # White - -unkblk='\[\e[4;30m\]' # Black - Underline -undred='\[\e[4;31m\]' # Red -undgrn='\[\e[4;32m\]' # Green -undylw='\[\e[4;33m\]' # Yellow -undblu='\[\e[4;34m\]' # Blue -undpur='\[\e[4;35m\]' # Purple -undcyn='\[\e[4;36m\]' # Cyan -undwht='\[\e[4;37m\]' # White - -bakblk='\[\e[40m\]' # Black - Background -bakred='\[\e[41m\]' # Red -badgrn='\[\e[42m\]' # Green -bakylw='\[\e[43m\]' # Yellow -bakblu='\[\e[44m\]' # Blue -bakpur='\[\e[45m\]' # Purple -bakcyn='\[\e[46m\]' # Cyan -bakwht='\[\e[47m\]' # White - -txtrst='\[\e[0m\]' # Text Reset - -#History control -if [ "$BASH" ]; then - parse_git_branch() { - git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ \1/' | grep -oE '[^ ]+$' - } - prompt(){ - a=`parse_git_branch` - hn=`hostname` - hn=${hn:0:3} - who=`whoami` - who=${who:0:3} - if [ -z $a ] ; then - printf "{$txtgrn%s@%s$txtrst}{$txtred%s$txtrst}>" $who $hn "$PWD" - else - printf "{$txtgrn%s@%s$txtrst}{$txtred%s$txtrst}{$txtblu%s$txtrst}>" $who $hn "$PWD" $(parse_git_branch) - fi - } - PS1="" - PROMPT_COMMAND='PS1=`prompt`' - export PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND ; }"'echo "`date +'%y.%m.%d-%H:%M:%S:'`" $USER "$(pwd)" "$(history 1 | cut -c8-)" >> ~/.bash_eternal_history' - #PROMPT_COMMAND='PS1="\(\033[0;33m\][\!]\`if [[ \$? = "0" ]]; then echo "\\[\\033[32m\\]"; else echo "\\[\\033[31m\\]"; fi\`[\u.\h: \`if [[ `pwd|wc -c|tr -d " "` > 18 ]]; then echo "\\W"; else echo "\\w"; fi\`]\$\[\033[0m\] "; echo -ne "\033]0;`hostname -s`:`pwd`\007"' - - export HISTFILESIZE= - export HISTSIZE= - export HISTTIMEFORMAT="%Y-%m-%d_%H:%M:%S " - export HISTFILE=~/.bash_eternal_history - - alias ehistory='cat ~/.bash_eternal_history|grep $@' - readonly HOME - readonly HISTIGNORE - #readonly PROMPT_COMMAND - #readonly HISTSIZE - #readonly HISTFILE - #readonly HISTCONTROL -fi diff --git a/vimperator/vimPgray.vimp b/skel.old/.vimperator/colors/vimPgray.vimp similarity index 100% rename from vimperator/vimPgray.vimp rename to skel.old/.vimperator/colors/vimPgray.vimp diff --git a/vimperator/vimperatorrc b/skel.old/.vimperatorrc similarity index 100% rename from vimperator/vimperatorrc rename to skel.old/.vimperatorrc diff --git a/i3/Xmodmap b/skel/.Xmodmap similarity index 100% rename from i3/Xmodmap rename to skel/.Xmodmap diff --git a/shells/Xresources b/skel/.Xresources similarity index 100% rename from shells/Xresources rename to skel/.Xresources diff --git a/shells/bashrc b/skel/.bashrc similarity index 100% rename from shells/bashrc rename to skel/.bashrc diff --git a/dunst/dunstrc b/skel/.config/.dunstrc similarity index 100% rename from dunst/dunstrc rename to skel/.config/.dunstrc diff --git a/shells/liquidpromptrc b/skel/.config/liquidpromptrc similarity index 100% rename from shells/liquidpromptrc rename to skel/.config/liquidpromptrc diff --git a/i3/gtkrc b/skel/.config/synapse/gtkrc similarity index 100% rename from i3/gtkrc rename to skel/.config/synapse/gtkrc diff --git a/git/gitconfig b/skel/.gitconfig similarity index 100% rename from git/gitconfig rename to skel/.gitconfig diff --git a/i3/config b/skel/.i3/config similarity index 100% rename from i3/config rename to skel/.i3/config diff --git a/python/pylintrc b/skel/.pylintrc similarity index 100% rename from python/pylintrc rename to skel/.pylintrc diff --git a/tmux/tmux.conf b/skel/.tmux.conf similarity index 100% rename from tmux/tmux.conf rename to skel/.tmux.conf diff --git a/vim/vimrc b/skel/.vimrc similarity index 100% rename from vim/vimrc rename to skel/.vimrc diff --git a/i3/xsession b/skel/.xsession similarity index 100% rename from i3/xsession rename to skel/.xsession diff --git a/shells/zshrc b/skel/.zshrc similarity index 100% rename from shells/zshrc rename to skel/.zshrc