From d17887e34b294f807912ac76eac6b2f15d90284b Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Tue, 23 Sep 2014 18:10:30 -0400 Subject: [PATCH] Changed terminal colors. Added numlockx to startup. Tried fixing gitlabTest.sh. Remove i3status.conf. Added fzf. Fixed vim-colors with my fork. --- i3/config | 9 ++++-- i3/xsession | 1 + scripts/desktop.txt | 7 ++--- scripts/gitlabTest.sh | 39 ++++++++++++------------ scripts/sync.sh | 5 ++-- shells/Xresources | 69 ++++++++++++++++++++++++++++++++----------- shells/bashrc | 1 + shells/zshrc | 11 ++++++- vim/vimrc | 4 ++- 9 files changed, 97 insertions(+), 49 deletions(-) diff --git a/i3/config b/i3/config index 1b28b2d..358ce62 100644 --- a/i3/config +++ b/i3/config @@ -14,7 +14,7 @@ bindsym XF86AudioMute exec "amixer -D pulse set Master 1+ toggle" #screensaver exec --no-startup-id xautolock -time 3 -locker 'i3lock -di `shuf -n1 -e ~/.i3/wall/*`' & -set $bg #2c2c2e +set $bg #121212 set $fg #9f9f9f set $hi #efef8f set $ac #a0afa0 @@ -26,7 +26,7 @@ set $gn #88b090 set $rd #e89393 ## set some nice colors border background text -client.focused #ff0000 #ff0000 $tx +client.focused #a6a6ff #a6a6ff $tx client.unfocused $bg $bg $ia client.focused_inactive $bg $bg $ac client.urgent $rd $rd $tx @@ -159,7 +159,10 @@ exec --no-startup-id i3-msg '/usr/bin/redshift t -l 36.3:-80.3 -t 6500:4000&' exec --no-startup-id i3-msg 'workspace 2; exec /usr/bin/firefox &' exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/xterm &' exec --no-startup-id i3-msg 'workspace 10; exec /usr/bin/shutter --min_at_startup &' -exec --no-startup-id screen -dmS syncthing /home/stonewareslord/Applications/syncthing/syncthing +exec --no-startup-id /usr/bin/screen -dmS syncthing /home/stonewareslord/Applications/syncthing/syncthing exec --no-startup-id /usr/bin/owncloud exec --no-startup-id /usr/bin/nm-applet +exec --no-startup-id /usr/bin/gtk-redshift -l 36.3:-80.3 -t 6500:4000 +exec --no-startup-id /usr/bin/diodon +exec --no-startup-id /usr/bin/numlockx # vim: ts=2:sw=2:et diff --git a/i3/xsession b/i3/xsession index e19a029..750014d 100644 --- a/i3/xsession +++ b/i3/xsession @@ -1,2 +1,3 @@ exec i3 +exec numlockx 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 b403d66..9adcea5 100644 --- a/scripts/desktop.txt +++ b/scripts/desktop.txt @@ -1,12 +1,11 @@ #synapse #IN STARTUP ITEMS: gtk-redshift -l 36.3:-80.3 -t 6500:4000 -#FOR CAFFEINE sudo add-apt-repository ppa:caffeine-developers/ppa -#caffeine +#sudo add-apt-repository ppa:caffeine-developers/ppa;update;install caffeine #variety #openjdk7-jre #python3.2 -#pip install twisted argparse pygments #ffmpeg +#owncloud-client synaptic python-glade2 meld @@ -30,7 +29,6 @@ wireshark shutter gtk-redshift unetbootin -owncloud-client exiv2 xdotool htop @@ -68,3 +66,4 @@ suckless-tools feh pm-utils alsa-utils +numlockx diff --git a/scripts/gitlabTest.sh b/scripts/gitlabTest.sh index 481c968..de05d03 100755 --- a/scripts/gitlabTest.sh +++ b/scripts/gitlabTest.sh @@ -4,25 +4,26 @@ close='\e[0m' mkdir -p /tmp/tests echo -e "${green}Making test directories${close}" cd /tmp/tests -mkdir a -mkdir b -cd /tmp/tests/a git init -git remote add origin git@98.26.78.121:hitchhikers/Zaphod.git -echo -e "${green}SSH cloning${close}" -git pull origin master -echo -e "${green}" -ls -echo -e "${close}" -cd /tmp/tests/b -git init -git remote add origin https://98.26.78.121/gitlab/hitchhikers/Zaphod.git +git remote add iHttp https://98.26.78.121/gitlab/stonewareslord/ExampleProject.git +git remote add iSsh git@98.26.78.121:stonewareslord/ExampleProject.git +git remote add dHttp https://austenwares.com/gitlab/stonewareslord/ExampleProject.git +git remote add dSsh git@austenwares.com:stonewareslord/ExampleProject.git git config http.sslVerify false -echo -e "${green}HTTPS cloning${close}" -git pull origin master -echo -e "${green}" -ls -echo -e "${close}" -echo -e "${green}Removing test directories${close}" +echo -e "${green}IP HTTPS cloning${close}" +git pull iHttp master +echo -e "${green}DNS HTTPS cloning${close}" +git pull dHttp master +echo -e "${green}IP SSH cloning${close}" +git pull iSsh master +echo -e "${green}DNS SSH cloning${close}" +git pull dSsh master +echo -e "${green}IP HTTPS pushing${close}" +mv `tempfile` .&&git add .&&git commit -m "message"&&git push iHttp master +echo -e "${green}DNS HTTPS pushing${close}" +mv `tempfile` .&&git add .&&git commit -m "message"&&git push dHttp master +echo -e "${green}IP SSH pushing${close}" +mv `tempfile` .&&git add .&&git commit -m "message"&&git push iSsh master +echo -e "${green}DNS SSH pushing${close}" +mv `tempfile` .&&git add .&&git commit -m "message"&&git push dSsh master rm -rf /tmp/tests -echo -e "${green}Done testing!${close}" diff --git a/scripts/sync.sh b/scripts/sync.sh index 8a2e8d5..7725125 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -55,9 +55,9 @@ while getopts ":hbsdtclw" VALUE "$@"; do if [ "$VALUE" = "c" ] ; then echo "Syncing config files" if which trash >/dev/null; then - trash ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme ~/.screenrc ~/.Xresources ~/.i3/i3status.conf + trash ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme ~/.screenrc ~/.Xresources else - rm ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme ~/.screenrc ~/.Xresources ~/.i3/i3status.conf + rm ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.vimperator/info/sync/quickmarks ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.oh-my-zsh/themes/af-magic.zsh-theme ~/.screenrc ~/.Xresources fi ln -s $ABSPATH/python/pylintrc ~/.pylintrc ln -s $ABSPATH/vim/vimrc ~/.vimrc @@ -78,7 +78,6 @@ while getopts ":hbsdtclw" VALUE "$@"; do ln -s $ABSPATH/shells/af-magic.zsh-theme ~/.oh-my-zsh/themes/af-magic.zsh-theme mkdir -p ~/.i3 ln -s $ABSPATH/i3/config ~/.i3/config - ln -s $ABSPATH/i3/i3status.conf ~/.i3/i3status.conf ln -s $ABSPATH/i3/wall.sh ~/.i3/wall.sh ln -s $ABSPATH/i3/sleep.sh ~/.i3/sleep.sh ln -s $ABSPATH/i3/Xmodmap ~/.Xmodmap diff --git a/shells/Xresources b/shells/Xresources index e0aef47..4215498 100644 --- a/shells/Xresources +++ b/shells/Xresources @@ -11,37 +11,70 @@ xterm*eightBitInput: false End: string(0x05)\n !BLK Cursor -#define _color0 #000d18 -#define _color8 #000d18 +#define _color0 #ffffff +#define _color8 #ffffff !RED Tag -#define _color1 #e89393 -#define _color9 #e89393 +#define _color1 #ff0000 +#define _color9 #ff0000 !GRN SpecialKey -#define _color2 #9ece9e -#define _color10 #9ece9e +#define _color2 #ff5f00 +#define _color10 #ff5f00 !YEL Keyword -#define _color3 #f0dfaf -#define _color11 #f0dfaf +#define _color3 #ffff00 +#define _color11 #ffff00 !BLU Number -#define _color4 #8cd0d3 -#define _color12 #8cd0d3 +#define _color4 #00d7ff +#define _color12 #00d7ff !MAG Precondit -#define _color5 #c0bed1 -#define _color13 #c0bed1 +#define _color5 #ff0087 +#define _color13 #ff0087 !CYN Float -#define _color6 #dfaf8f -#define _color14 #dfaf8f +#define _color6 #0087ff +#define _color14 #0087ff !WHT Search -#define _color7 #efefef -#define _color15 #efefef +#define _color7 #000000 +#define _color15 #000000 !FMT Include, StatusLine, ErrorMsg #define _colorBD #ffcfaf #define _colorUL #ccdc90 #define _colorIT #80d4aa !TXT Normal, Normal, Cursor -#define _foreground #dcdccc -#define _background #1f1f1f +#define _foreground #ffffff +#define _background #121212 +!#define _background #121212 #define _cursorColor #8faf9f +!!BLK Cursor +!#define _color0 #000d18 +!#define _color8 #000d18 +!!RED Tag +!#define _color1 #e89393 +!#define _color9 #e89393 +!!GRN SpecialKey +!#define _color2 #9ece9e +!#define _color10 #9ece9e +!!YEL Keyword +!#define _color3 #f0dfaf +!#define _color11 #f0dfaf +!!BLU Number +!#define _color4 #8cd0d3 +!#define _color12 #8cd0d3 +!!MAG Precondit +!#define _color5 #c0bed1 +!#define _color13 #c0bed1 +!!CYN Float +!#define _color6 #dfaf8f +!#define _color14 #dfaf8f +!!WHT Search +!#define _color7 #efefef +!#define _color15 #efefef +!!FMT Include, StatusLine, ErrorMsg +!#define _colorBD #ffcfaf +!#define _colorUL #ccdc90 +!#define _colorIT #80d4aa +!!TXT Normal, Normal, Cursor +!#define _foreground #dcdccc +!#define _background #1f1f1f +!#define _cursorColor #8faf9f URxvt*color0 : _color0 URxvt*color1 : _color1 URxvt*color2 : _color2 diff --git a/shells/bashrc b/shells/bashrc index 09dfa7a..496ecc6 100644 --- a/shells/bashrc +++ b/shells/bashrc @@ -308,3 +308,4 @@ if [ "$BASH" ]; then #readonly HISTFILE #readonly HISTCONTROL fi +[ -f ~/.fzf.bash ] && source ~/.fzf.bash diff --git a/shells/zshrc b/shells/zshrc index 236950c..025a7df 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -19,6 +19,7 @@ alias zless=$PAGER # Would you like to use another custom folder than $ZSH/custom? # ZSH_CUSTOM=/path/to/new-custom-folder #plugins=(git) +DISABLE_AUTO_UPDATE="true" source $ZSH/oh-my-zsh.sh 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" @@ -74,14 +75,21 @@ alias echip="curl ifconfig.me" alias vpn="cd ~/.openvpn;sudo openvpn config.ovpn;cd -" alias to="~/.todo/todo.sh" alias stdns="sudo sh -c 'echo \"nameserver 8.8.8.8\\nnameserver 8.8.4.4\" > /etc/resolv.conf'" +alias fvim="vim -u NONE +\"so ~/.vim/bundle/flappyvird-vim/plugin/flappyvird.vim\" +\"so ~/.vim/bundle/flappyvird-vim/autoload/flappyvird.vim\" +\":FlappyVird\" +\":q\"" +alias fk='k `fzf +c --no-mouse -m -1 -x`' +alias fh='eval $(([ -n "$ZSH_NAME" ] && fc +c --no-mouse -m -1 -x -l 1 || history) | fzf +s | sed "s/ *[0-9]* *//")' +alias fkill='ps -ef | sed 1d | fzf +c --no-mouse -m -1 -x | awk "{print $2}" | xargs kill -${1:-9}' alias -s html="firefox" alias -s log="less -MN" +alias -g F="$(fzf +c --no-mouse -m -1 -x)" alias -g nify=" > /dev/null 2>&1 &" +alias -g nifyd=" > /dev/null 2>&1 & disown" alias -g G='|& egrep -i' alias -g AW='austenwares.com' +export FZF_COMPLETION_OPTS='+c --no-mouse -m -1 -x' function dnstest(){ echo "Testing ping:" - ping -c 3 8.8.8.8 + ping -c 2 8.8.8.8 echo "Testing IP curl:" curl -k https://98.26.78.121/b/ echo "\nresolv.conf:" @@ -200,3 +208,4 @@ function k(){ fi fi } +[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh diff --git a/vim/vimrc b/vim/vimrc index ef3f275..f16ef2b 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -263,7 +263,7 @@ Bundle 'scrooloose/nerdtree' "File browser | https://github.com/scrooloose/nerdtree Bundle 'altercation/vim-colors-solarized' "Theme | https://github.com/altercation/vim-colors-solarized -Bundle 'spf13/vim-colors' +Bundle 'stonewareslord/vim-colors' "Theme pack | https://github.com/spf13/vim-colors Bundle 'spf13/PIV' "PHP tools | https://github.com/spf13/PIV @@ -309,6 +309,8 @@ Bundle 'mattn/flappyvird-vim' " |https://github.com/mattn/flappyvird-vim Bundle 'morhetz/gruvbox' " |https://github.com/morhetz/gruvbox +Bundle 'superbrothers/vim-vimperator' + " |https://github.com/superbrothers/vim-vimperator " | "DO NOT DELETE LINE ABOVE OR \bun WILL BREAK filetype plugin indent on