diff --git a/scripts/desktop.txt b/scripts/desktop.txt index 9adcea5..f1dca33 100644 --- a/scripts/desktop.txt +++ b/scripts/desktop.txt @@ -67,3 +67,4 @@ feh pm-utils alsa-utils numlockx +virtualbox diff --git a/scripts/gitlabTest.sh b/scripts/gitlabTest.sh index de05d03..5c75e18 100755 --- a/scripts/gitlabTest.sh +++ b/scripts/gitlabTest.sh @@ -1,6 +1,7 @@ #!/bin/bash green='\e[0;32m' close='\e[0m' +rm -rf /tmp/tests mkdir -p /tmp/tests echo -e "${green}Making test directories${close}" cd /tmp/tests @@ -19,11 +20,11 @@ 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 +git commit --allow-empty -m "iHttps"&&git push iHttp master echo -e "${green}DNS HTTPS pushing${close}" -mv `tempfile` .&&git add .&&git commit -m "message"&&git push dHttp master +git commit --allow-empty -m "dHttps"&&git push dHttp master echo -e "${green}IP SSH pushing${close}" -mv `tempfile` .&&git add .&&git commit -m "message"&&git push iSsh master +git commit --allow-empty -m "iSsh"&&git push iSsh master echo -e "${green}DNS SSH pushing${close}" -mv `tempfile` .&&git add .&&git commit -m "message"&&git push dSsh master +git commit --allow-empty -m "dSsh"&&git push dSsh master rm -rf /tmp/tests diff --git a/scripts/server.txt b/scripts/server.txt index 7c3c22b..1fa7a8c 100644 --- a/scripts/server.txt +++ b/scripts/server.txt @@ -59,3 +59,7 @@ libasound2-dev libpam-google-authenticator iodine macchanger +mysql-server +apache2 +php5 +libapache2-mod-php5 diff --git a/shells/Xresources b/shells/Xresources index 4215498..f934661 100644 --- a/shells/Xresources +++ b/shells/Xresources @@ -32,8 +32,8 @@ xterm*eightBitInput: false #define _color6 #0087ff #define _color14 #0087ff !WHT Search -#define _color7 #000000 -#define _color15 #000000 +#define _color7 #ffffff +#define _color15 #ffffff !FMT Include, StatusLine, ErrorMsg #define _colorBD #ffcfaf #define _colorUL #ccdc90 diff --git a/shells/zshrc b/shells/zshrc index 025a7df..6a46631 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -16,11 +16,17 @@ export PAGER=/usr/local/bin/vimpager alias less=$PAGER alias zless=$PAGER +source "$HOME/.antigen/antigen.zsh" +antigen bundle stonewareslord/oh-my-git +antigen use oh-my-zsh +antigen theme stonewareslord/oh-my-git-themes af-magic +antigen apply + # 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 $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" export EDITOR='vim' @@ -81,7 +87,7 @@ alias fh='eval $(([ -n "$ZSH_NAME" ] && fc +c --no-mouse -m -1 -x -l 1 || histor 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 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'