diff --git a/i3/config b/i3/config index 14feff4..aa3527f 100644 --- a/i3/config +++ b/i3/config @@ -7,7 +7,7 @@ exec --no-startup-id "zsh -c 'xrandr --output LVDS1 --primary || xrandr --output bindsym $mod+shift+d exec i3-input -F 'rename workspace to "%s"' -P 'Rename to: ' bindsym $mod+semicolon exec quickswitch.py -d 'rofi -dmenu $(i3-color-rofi)' #bindsym $mod+semicolon exec rofi -term uxterm -show window $() -bindsym $mod+p exec rofi -term uxterm -show run $(i3-color-rofi) +bindsym $mod+p exec rofi -show run $(i3-color-rofi) bindsym $mod+shift+p exec "~/.i3/run.sh pass" #exec xrandr --output HDMI3 --left-of HDMI1 & #exec xmodmap ~/.Xmodmap & @@ -18,6 +18,7 @@ bindsym Print exec "shutter -r" #bindsym XF86AudioMute exec amixer -q set Master toggle #screensaver +bindsym $mod+backslash exec rofi $(i3-color-rofi) -show ssh bindsym $mod+shift+backslash exec "cat /tmp/noss&&(rm /tmp/noss;notify-send 'Screensaver Enabled' -t 200)||(touch /tmp/noss;notify-send 'Screensaver Disabled' -t 200)" exec --no-startup-id xautolock -time 10 -locker '~/.i3/run.sh screensaver' diff --git a/scripts/gitlabTest.sh b/scripts/gitlabTest.sh index 5c75e18..0aabc75 100755 --- a/scripts/gitlabTest.sh +++ b/scripts/gitlabTest.sh @@ -6,23 +6,33 @@ mkdir -p /tmp/tests echo -e "${green}Making test directories${close}" cd /tmp/tests git init -git remote add iHttp https://98.26.78.121/gitlab/stonewareslord/ExampleProject.git +git remote add iHttp http://98.26.78.121/gitlab/stonewareslord/ExampleProject.git +git remote add iHttps 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 dHttp http://austenwares.com/gitlab/stonewareslord/ExampleProject.git +git remote add dHttps 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}IP HTTPS cloning${close}" -git pull iHttp master +git pull iHttps master echo -e "${green}DNS HTTPS cloning${close}" +git pull dHttps master +echo -e "${green}IP HTTP cloning${close}" +git pull iHttp master +echo -e "${green}DNS HTTP 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}" -git commit --allow-empty -m "iHttps"&&git push iHttp master +git commit --allow-empty -m "iHttps"&&git push iHttps master echo -e "${green}DNS HTTPS pushing${close}" -git commit --allow-empty -m "dHttps"&&git push dHttp master +git commit --allow-empty -m "dHttps"&&git push dHttps master +echo -e "${green}IP HTTP pushing${close}" +git commit --allow-empty -m "iHttp"&&git push iHttp master +echo -e "${green}DNS HTTP pushing${close}" +git commit --allow-empty -m "dHttp"&&git push dHttp master echo -e "${green}IP SSH pushing${close}" git commit --allow-empty -m "iSsh"&&git push iSsh master echo -e "${green}DNS SSH pushing${close}" diff --git a/shells/zshrc b/shells/zshrc index 559ac77..213f417 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -58,7 +58,7 @@ alias la='ls -A' alias l='ls -CF' alias logout='sudo pkill -u $USER' function fixsh(){ - sed -i '' -e $1"d" ~/.ssh/known_hosts + sed -i -e $1"d" ~/.ssh/known_hosts } alias tmux='tmux -2' alias less='less -R'