From 38b625763be58dfa3e89b4e4a04692a96a8486ee Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Fri, 29 Aug 2014 09:46:43 -0400 Subject: [PATCH] Made changes --- i3/config | 5 ++- i3/sleep.sh | 0 i3/xsession | 0 shells/af-magic.zsh-theme | 3 +- shells/zshrc | 94 +++++++++++---------------------------- 5 files changed, 29 insertions(+), 73 deletions(-) mode change 100755 => 100644 i3/sleep.sh mode change 100755 => 100644 i3/xsession diff --git a/i3/config b/i3/config index c41a0ce..65ce12f 100644 --- a/i3/config +++ b/i3/config @@ -1,3 +1,4 @@ +bindsym $mod+d exec i3-input -F 'rename workspace to "%s"' -P 'Rename to: ' #exec xrandr --output HDMI3 --left-of HDMI1 & #exec xmodmap ~/.Xmodmap & @@ -11,7 +12,7 @@ exec --no-startup-id xautolock -time 3 -locker 'i3lock -i `shuf -n1 -e ~/.i3/wal #startup exec --no-startup-id i3-msg 'workspace 10; exec /home/stonewareslord/xmodmap.sh&/usr/bin/owncloud&/usr/bin/redshift t -l 36.3:-80.3 -t 6500:4000&wicd-gtk&' -exec --no-startup-id i3-msg 'workspace 10; exec /home/stonewareslord/applications/Telegram/Telegram&' +#exec --no-startup-id i3-msg 'workspace 10; exec /home/stonewareslord/applications/Telegram/Telegram&' exec --no-startup-id i3-msg 'workspace 2; exec /usr/bin/firefox&' exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/konsole -e wemux&' exec --no-startup-id i3-msg 'nitrogen --restore' @@ -215,4 +216,4 @@ bindsym $mod+m focus mode_toggle #bar { # #status_command i3status #} -exec feh --bg-scale "`shuf -n1 -e ~/ownCloud/wallpaper/{std,mlp}/*`" +exec --no-startup-id feh --bg-scale "`shuf -n1 -e ~/.i3/wall/*`" diff --git a/i3/sleep.sh b/i3/sleep.sh old mode 100755 new mode 100644 diff --git a/i3/xsession b/i3/xsession old mode 100755 new mode 100644 diff --git a/shells/af-magic.zsh-theme b/shells/af-magic.zsh-theme index d0e7bb9..f7657d8 100644 --- a/shells/af-magic.zsh-theme +++ b/shells/af-magic.zsh-theme @@ -10,8 +10,7 @@ else fi # primary prompt -PROMPT='$FG[237]------------------------------------------------------------%{$reset_color%} -$FG[032]%~\ +PROMPT='$FG[032]%~\ $(git_prompt_info) \ $FG[105]%(!.#.ยป)%{$reset_color%} ' PROMPT2='%{$fg[red]%}\ %{$reset_color%}' diff --git a/shells/zshrc b/shells/zshrc index 88b3c0e..7f74da7 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -1,88 +1,34 @@ -# Path to your oh-my-zsh installation. export ZSH=$HOME/.oh-my-zsh - -# Set name of the theme to load. -# Look in ~/.oh-my-zsh/themes/ -# Optionally, if you set this to "random", it'll load a random theme each -# time that oh-my-zsh is loaded. ZSH_THEME="af-magic" - -# Uncomment the following line to use case-sensitive completion. -# CASE_SENSITIVE="true" - -# Uncomment the following line to disable bi-weekly auto-update checks. -# DISABLE_AUTO_UPDATE="true" - -# Uncomment the following line to change how often to auto-update (in days). -# export UPDATE_ZSH_DAYS=13 -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - # Uncomment the following line to enable command auto-correction. # ENABLE_CORRECTION="true" - -# Uncomment the following line to display red dots whilst waiting for completion. -# COMPLETION_WAITING_DOTS="true" - -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. -# DISABLE_UNTRACKED_FILES_DIRTY="true" - +COMPLETION_WAITING_DOTS="true" # Uncomment the following line if you want to change the command execution time # stamp shown in the history command output. # The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -HIST_STAMPS="mm/dd/yyyy" +HIST_STAMPS="dd/mm/yyyy" +setopt APPEND_HISTORY +HISTSIZE=12000 +SAVEHIST=10000000 +setopt HIST_EXPIRE_DUPS_FIRST +setopt EXTENDED_HISTORY + +export PAGER=/usr/local/bin/vimpager +alias less=$PAGER +alias zless=$PAGER + # Would you like to use another custom folder than $ZSH/custom? # ZSH_CUSTOM=/path/to/new-custom-folder - -# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) -# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. plugins=(git) - source $ZSH/oh-my-zsh.sh source /etc/zsh_command_not_found - -# User configuration - export PATH="/home/stonewareslord/.autojump/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games" -# export MANPATH="/usr/local/man:$MANPATH" - -# You may need to manually set your language environment -# export LANG=en_US.UTF-8 - -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='mvim' -# fi - -# Compilation flags -# export ARCHFLAGS="-arch x86_64" - -# ssh -# export SSH_KEY_PATH="~/.ssh/dsa_id" - -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. -# For a full list of active aliases, run `alias`. -# -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" +export EDITOR='vim' alias ls='ls --color=always -F' alias ehistory='cat ~/.bash_eternal_history|grep $@' alias bat='upower -i /org/freedesktop/UPower/devices/battery_BAT0| grep -E "state|to\ full|percentage"' 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' @@ -90,7 +36,7 @@ alias l='ls -CF' alias logout='sudo pkill -u $USER' alias fixsh='ssh-keygen -R' alias tmux='tmux -2' -alias less='less -r' +#alias less='less -r' alias tree='tree -C' alias grep="grep --color=auto" alias skim="(head -5; tail -5) <" @@ -124,11 +70,21 @@ alias ...............='k ../../../../../../../../../../../../../..' alias ytdl="youtube-dl $@ -x --audio-format mp3 --audio-quality 0 -c -o '%(title)s.%(ext)s'" alias tux="wemux" alias rmgit="git remote rm origin;git remote rm https;git remote rm oOrigin;git remote rm oHttps" -alias rname="while true;do echo -n \"Rename: \";read a;echo -n \"To: \";read b;i3-msg \"rename workspace $a to $b\";done" +alias rname="while true;do echo -n \"Rename: \";read A;echo -n \"To: \";read B;i3-msg 'rename workspace $A to $B';done" alias g="git $@" +alias echip="curl ifconfig.me" +alias vpn="cd ~/.openvpn;sudo openvpn config.ovpn;cd -" alias -s html="firefox" alias -s log="less -MN" alias -g nify=" > /dev/null 2>&1 &" +function dnstest(){ + echo "Testing ping:" + ping -c 3 8.8.8.8 + echo "Testing IP curl:" + curl -k https://98.26.78.121/b/ + echo "Testing DNS" + curl -k https://austenwares.com/b/ +} function cinitify(){ mkdir $2 cd $2