From f40f31bb783352ce199839ad72b04c0d573581c0 Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Fri, 5 Feb 2016 00:18:49 -0500 Subject: [PATCH] Tons of fixes --- i3/Xmodmap | 8 -- i3/config | 4 +- i3/i3status.conf | 8 +- i3/run.sh | 4 +- shells/bashrc | 280 +---------------------------------------------- shells/zshrc | 8 +- 6 files changed, 14 insertions(+), 298 deletions(-) diff --git a/i3/Xmodmap b/i3/Xmodmap index c896533..b275bf8 100644 --- a/i3/Xmodmap +++ b/i3/Xmodmap @@ -1,13 +1,5 @@ clear Lock keysym Caps_Lock = Escape -remove mod1 = Alt_R -clear mod4 -keycode 108 = Super_L -add mod4 = Super_L -remove mod1 = Alt_L -clear mod4 -keycode 64 = Super_L -add mod4 = Super_L keysym Escape = Caps_Lock add Lock = Caps_Lock keycode 248 = diff --git a/i3/config b/i3/config index 0cbfa8b..dd09644 100644 --- a/i3/config +++ b/i3/config @@ -48,9 +48,7 @@ bar { mode dock #position top modifier Mod4 - tray_output primary - tray_output LVDS1 - #tray_output HDMI3 + tray_output eDP1 colors { background $bg statusline $fg diff --git a/i3/i3status.conf b/i3/i3status.conf index 3907caf..a8779ed 100644 --- a/i3/i3status.conf +++ b/i3/i3status.conf @@ -11,16 +11,16 @@ general { interval = 1 } order += "disk /" -order += "wireless wlo1" -order += "ethernet eno1" +order += "wireless wlp2s0" +order += "ethernet enp1s0" order += "volume master" order += "battery 1" order += "tztime local" -wireless wlo1 { +wireless wlp2s0 { format_up = "%essid : %ip @ %quality" format_down = "!W" } -ethernet eno1 { +ethernet enp1s0 { # if you use %speed, i3status requires root privileges format_up = "%ip (%speed)" format_down = "!E" diff --git a/i3/run.sh b/i3/run.sh index 939bafe..7e0818e 100755 --- a/i3/run.sh +++ b/i3/run.sh @@ -33,8 +33,8 @@ if [ "$1" = "screensaver" ];then fi if [ "$1" = "wall" ];then #if [[ -d ~/.i3/wallOM ]];then feh --bg-scale "`shuf -n1 -e ~/.i3/wallOM/*`";else feh --bg-scale "`shuf -n1 -e ~/.i3/wall/*`";fi; - feh --bg-scale "$(shuf -n1 -e ~/.i3/wallOM/*)" - #feh --bg-scale ~/.i3/wall/fbfKNDk.png + #feh --bg-scale "$(shuf -n1 -e ~/.i3/wallOM/*)" + feh --bg-scale ~/.i3/image.png fi if [ "$1" = "swap" ];then python << EOF diff --git a/shells/bashrc b/shells/bashrc index 859a23c..23c26d0 100644 --- a/shells/bashrc +++ b/shells/bashrc @@ -1,280 +1,2 @@ -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 - export PATH=/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 - -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 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' -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='2>/dev/null 1>&2 /home/stonewareslord/applications/adk/bin/studio.sh &' -alias resource='. ~/.bashrc' -alias install='sudo apt-get install' -alias search='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 ..........='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="wemux" -alias rmgit="git remote rm origin;git remote rm https;git remote rm oOrigin;git remote rm oHttps" -alias g="git $@" -function gco(){ - git co "$@" -} -function gi(){ - git i -} -function gpush(){ - git push "$@" -} -function gpull(){ - git pull "$@" -} -function gup(){ - git up -} -function grm(){ - git rm $@ -} -function gci(){ - git ci "$@" -} -function ga(){ - git a "$@" -} -function gd(){ - gid d "$@" -} -function greset(){ - git reset "$@" -} -complete -f ga -function mcl(){ mkdir "$@"&&cl "$@"; } -function cl(){ cd "$@" && ls; } -function k(){ - if [[ $# > 1 ]] ; then - vim "$@" - elif [ -d "$@" ] ; then - cd "$@" && ls - elif [ "$@" == "-" ] ; then - cd - && ls - elif [ -f "$@" ] ; 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 ;; - *) vim $1 - esac - 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 - if [[ ! $3 == "-r" ]] ; then - echo -n "Pull from: " - read from - git pull $from - git checkout master - fi -} -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 - if [[ ! $3 == "-r" ]] ; then - echo -n "Pull from: " - read from - git pull $from - git checkout master - fi -} -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 - -[ -f ~/.fzf.bash ] && source ~/.fzf.bash -[ -f ~/.antigen/repos/https-COLON--SLASH--SLASH-github.com-SLASH-stonewareslord-SLASH-oh-my-git.git/prompt.sh ]&&source ~/.antigen/repos/https-COLON--SLASH--SLASH-github.com-SLASH-stonewareslord-SLASH-oh-my-git.git/prompt.sh -[ -f ~/.antigen/repos/https-COLON--SLASH--SLASH-github.com-SLASH-stonewareslord-SLASH-liquidprompt.git/liquidprompt ]&&source ~/.antigen/repos/https-COLON--SLASH--SLASH-github.com-SLASH-stonewareslord-SLASH-liquidprompt.git/liquidprompt -export finally= +PS1="$ " diff --git a/shells/zshrc b/shells/zshrc index 8e2d61c..3200449 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -85,7 +85,7 @@ alias skim="(head -5; tail -5) <" alias cp='rsync --partial -ha --info=progress2 "$@"' mv() { /bin/mv -v "$@" } m() { mv "$@" } -compdef _cp c m mv cp copy +compdef _cp c cfat m mv cp copy 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 & disown' @@ -160,6 +160,7 @@ alias -s odt="libreoffice" alias -s doc="libreoffice" alias -s docx="libreoffice" alias -g c='rsync --partial -ha --info=progress2 "$@"' +alias -g cfat='rsync --partial -hrlc --info=progress2 "$@"' alias -g F='`fzf --no-mouse -m -1 -x`' alias -g nify=" > /dev/null 2>&1 &" alias -g nifyd=" > /dev/null 2>&1 & disown" @@ -258,6 +259,7 @@ rc(){ unmask) sudo vim /etc/portage/package.unmask;; mask) sudo vim /etc/portage/package.mask/package.mask;; accept_keywords) sudo vim /etc/portage/package.accept_keywords/package.accept_keywords;; + license) sudo vim /etc/portage/package.license/package.license;; *) echo "Opts:\nz v i\nuse make unmask mask accept_keywords" esac } @@ -352,7 +354,6 @@ k(){ fi } #source ~/.zsh/*.zsh -[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh # To resize, # :%S/\[([# ]{9})\]/[\1 ] ####echo -ne '[# ]\r' @@ -388,3 +389,6 @@ echo # OPAM configuration . /home/stonewareslord/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true (( $+TMUX )) && unset zle_bracketed_paste + + +[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh