From 1d486dbfa54f5fa4874816b0ecafa49cfde06bc6 Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Sun, 5 Oct 2014 15:30:26 -0400 Subject: [PATCH] Added hiding feature for i3status. Removed autojump from bashrc. Fixed grep for regular expressions. Matched colors with i3 colrscheme --- git/gitconfig | 2 ++ i3/config | 13 +++++++++---- i3/xsession | 1 + scripts/desktop.txt | 2 +- scripts/server.txt | 6 ++++++ shells/bashrc | 4 +--- shells/zshrc | 5 +++-- vim/vimrc | 2 ++ vimperator/vimPgray.vimp | 20 ++++++++++---------- 9 files changed, 35 insertions(+), 20 deletions(-) diff --git a/git/gitconfig b/git/gitconfig index 5442c3b..8f05eb6 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -31,3 +31,5 @@ keepBackup = false [http] sslVerify = false +[credential] + helper = cache diff --git a/i3/config b/i3/config index 358ce62..a90f16c 100644 --- a/i3/config +++ b/i3/config @@ -35,6 +35,9 @@ client.urgent $rd $rd $tx # finds out, if available) bar { status_command i3status --config ~/.i3/i3status.conf + mode hide + modifier Mod4 + tray_output HDMI3 colors { background $bg statusline $fg @@ -74,6 +77,7 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 floating_modifier $mod bindsym $mod+Return exec xterm bindsym $mod+Shift+c kill +bindsym $mod+c move absolute position center # dmenu_run -nb '#000000' -nf '#ffffff' -sb '#474747' -sf '#ffffff' # dmenu_run -nb '#2c2c2c' -nf '#dcdccc' -sb '#3f3f3f' -sf '#9ab8d7' bindsym $mod+p exec dmenu_run -nb '#2c2c2c' -nf '#dcdccc' -sb '#3f3f3f' -sf '#9ab8d7' @@ -125,10 +129,11 @@ bindsym $mod+Shift+8 move container to workspace 8 bindsym $mod+Shift+9 move container to workspace 9 bindsym $mod+Shift+0 move container to workspace 10 bindsym $mod+Shift+r reload -bindsym $mod+Shift+minus exec banshee --previous -bindsym $mod+Shift+equal exec banshee --next -bindsym $mod+minus exec banshee --pause -bindsym $mod+equal exec banshee --play +bindsym $mod+Shift+minus exec --no-startup-id banshee --previous +bindsym $mod+Shift+equal exec --no-startup-id banshee --next +bindsym $mod+minus exec --no-startup-id banshee --pause +bindsym $mod+equal exec --no-startup-id banshee --play + # To initialize wallpapers, run: # export DISPLAY=:0.0;mkdir -p ~/.i3/wall;cp ~/ownCloud/wallpaper/std/* ~/.i3/wall;cd ~/.i3/wall;rename -v 's/(.* )+//' *;mogrify -resize `xrandr -q|perl -F'\s|,' -lane "/^Sc/&&print join '',@F[8..10]"`^ -verbose -gravity center -format png *;rm *.jpg;rm *.jpeg bindsym $mod+grave exec "i3lock -di `echo $(shuf -n1 -e ~/.i3/wall/*) | tee /tmp/wall`; sleep 60; pgrep i3lock && xset dpms force off" diff --git a/i3/xsession b/i3/xsession index 750014d..0c0b2b0 100644 --- a/i3/xsession +++ b/i3/xsession @@ -1,3 +1,4 @@ exec i3 exec numlockx +exec syndaemon -i .5 -d exec xrandr --output HDMI1 --mode 1920x1080 --primary --output HDMI3 --mode 1920x1080 --left-of HDMI1 diff --git a/scripts/desktop.txt b/scripts/desktop.txt index bfb5760..dbc0fa8 100644 --- a/scripts/desktop.txt +++ b/scripts/desktop.txt @@ -21,7 +21,6 @@ cplay ubuntu-restricted-extras kdenlive gparted -pidgin diodon mysql-workbench synergy @@ -70,3 +69,4 @@ numlockx virtualbox x11vnc xvnc4viewer +ntop diff --git a/scripts/server.txt b/scripts/server.txt index 1fa7a8c..12218af 100644 --- a/scripts/server.txt +++ b/scripts/server.txt @@ -1,4 +1,5 @@ #sudo add-apt-repository ppa:vincent-c/ponysay +sudo software-properties-common tasksel #tasksel install lamp-server @@ -63,3 +64,8 @@ mysql-server apache2 php5 libapache2-mod-php5 +node +npm +bsdgames +sshuttle +nethogs diff --git a/shells/bashrc b/shells/bashrc index 496ecc6..9123d7d 100644 --- a/shells/bashrc +++ b/shells/bashrc @@ -40,10 +40,8 @@ if ! shopt -oq posix; 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 +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 diff --git a/shells/zshrc b/shells/zshrc index c00d677..e17aad8 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -18,6 +18,7 @@ alias zless=$PAGER source "$HOME/.antigen/antigen.zsh" antigen bundle stonewareslord/oh-my-git +#antigen bundle arialdomartini/oh-my-git antigen use oh-my-zsh antigen theme stonewareslord/oh-my-git-themes af-magic antigen apply @@ -31,7 +32,7 @@ source /etc/zsh_command_not_found export PATH="/home/stonewareslord/.autojump/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games" export EDITOR='vim' alias ls='ls --color=always -F' -alias ehistory='cat ~/.bash_eternal_history|grep $@' +alias ehistory='cat ~/.bash_eternal_history|egrep -iP $@' 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 disphost='export DISPLAY=:0.0' @@ -43,7 +44,7 @@ alias fixsh='ssh-keygen -R' alias tmux='tmux -2' #alias less='less -r' alias tree='tree -C' -alias grep="grep --color=auto" +alias grep="egrep -i --color=auto" alias skim="(head -5; tail -5) <" alias cp="cp -v" alias mv="mv -v" diff --git a/vim/vimrc b/vim/vimrc index f16ef2b..7a1c389 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -311,6 +311,8 @@ Bundle 'morhetz/gruvbox' " |https://github.com/morhetz/gruvbox Bundle 'superbrothers/vim-vimperator' " |https://github.com/superbrothers/vim-vimperator +Bundle 'Rykka/colorv.vim' + " |https://github.com/Rykka/colorv.vim " | "DO NOT DELETE LINE ABOVE OR \bun WILL BREAK filetype plugin indent on diff --git a/vimperator/vimPgray.vimp b/vimperator/vimPgray.vimp index d8857ae..9b1d7ac 100644 --- a/vimperator/vimPgray.vimp +++ b/vimperator/vimPgray.vimp @@ -22,11 +22,11 @@ hi CompItem[selected] background: #666; " Used in Command Line " Entire bottom line -hi CmdLine color: #aaa; background: #333; font-family: Inconsolata; font-size: 12px; padding: 0px; vertical-align: middle; border: none; +hi CmdLine color: #aaa; background: #121212; font-family: Inconsolata; font-size: 12px; padding: 0px; vertical-align: middle; border: none; " Used in the URL column of `bmarks` hi CompResult color: #aaa; width: 45%; overflow: hidden; -hi CompTitle color: #ddc; background: #333; font-weight: bold; +hi CompTitle color: #ddc; background: #121212; font-weight: bold; hi CompTitle>* color: #aaa; font-weight: bold; border-top: 1px solid gray; border-bottom: 1px solid #BBB; padding: 1px 0.5ex; " " Hints! @@ -37,19 +37,19 @@ hi CompTitle>* color: #aaa; font-weight: bold; border-top: 1px solid gray; bo " hi HintImage opacity: .5; " Used also in wrapping error messages as the background, simple speaking -hi InfoMsg color: #ddc; background: #333; +hi InfoMsg color: #ddc; background: #121212; " Used when error on syntax error in vimperatorrc, etc. -hi LineNr color: orange; background-color: #333; +hi LineNr color: orange; background-color: #121212; -hi ErrorMsg color: #c22; background-color: #333; font-weight: bold; +hi ErrorMsg color: #c22; background-color: #121212; font-weight: bold; " Used in CARET or COMMAND modes -hi ModeMsg color: #ddc; background: #333; +hi ModeMsg color: #ddc; background: #121212; hi MoreMsg color: #080; background: #222; font-weight: bold; -moz-border-radius: 5px; padding-left: 5px; -hi Normal color: #ddc; background: #333; +hi Normal color: #ddc; background: #121212; " Used in :`js tr` hi Boolean color: #f00; @@ -62,15 +62,15 @@ hi String color: #0c0; " Used in "Press ENTER..." of `jumps` or `bmarks`, or "Follow Hint..." or `f` hi Question color: #080; background: #222; font-weight: bold; -moz-border-radius: 5px; padding-left: 5px; -"hi Search color: #333; background-color: #cc0; font-size: inherit; padding: 0; padding: 0; +"hi Search color: #121212; background-color: #cc0; font-size: inherit; padding: 0; padding: 0; -hi StatusLine color: #ddc; background: #333; font-family: Inconsolata; font-size: 14px; margin-top: 1px; +hi StatusLine color: #ddc; background: #121212; font-family: Inconsolata; font-size: 14px; margin-top: 1px; " Firefox's tabs hi TabNumber color: #ddc; font-weight: bold; margin: 0; padding-right: .3ex; text-shadow: #000 -1px 0 0, #000 0 1px 0, #000 1px 0 0, #000 0 -1px 0; " Used in `pageinfo` or `jumps` -hi Title color: #ddc; background: #333; font-weight: bold; +hi Title color: #ddc; background: #121212; font-weight: bold; " Used in items of Info field of `bmarks` hi Keyword color: #CC0;