From e1c394df327fb2da2eafc44275ecac76a892eac7 Mon Sep 17 00:00:00 2001
From: Mari <mstaib.git@reya.zone>
Date: Fri, 15 May 2020 14:19:33 -0400
Subject: [PATCH] Autocommitted updated scripts from mari-wovn

---
 .gitmodules                      |  2 +-
 per-host/mari-wovn/.bash_aliases | 24 ++++++++++++------------
 vim/{ => bundle}/ale             |  0
 vimrc                            |  3 +++
 4 files changed, 16 insertions(+), 13 deletions(-)
 rename vim/{ => bundle}/ale (100%)

diff --git a/.gitmodules b/.gitmodules
index 66b4154..3f5c57e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,5 +14,5 @@
 	path = git-aware-prompt
 	url = https://github.com/jimeh/git-aware-prompt.git
 [submodule "vim/ale"]
-	path = vim/ale
+	path = vim/bundle/ale
 	url = https://github.com/dense-analysis/ale.git
diff --git a/per-host/mari-wovn/.bash_aliases b/per-host/mari-wovn/.bash_aliases
index 31431ea..03ffb4f 100644
--- a/per-host/mari-wovn/.bash_aliases
+++ b/per-host/mari-wovn/.bash_aliases
@@ -14,7 +14,7 @@ function wovn_start() {
     set -o pipefail
     branch=${1:?}
     branch=${branch#feature/}
-    tmux -2 new-window -t "Main Screen" -n "$branch" -c ~/branches -e BRANCH_NAME="$branch" 'bash -ic "_start_branch \"\$BRANCH_NAME\"; exec bash"'
+    tmux -2 new-window -t "Main Screen" -n "$branch" -c ~/equalizer -e BRANCH_NAME="$branch" 'bash -ic "_start_branch \"\$BRANCH_NAME\"; exec bash"'
   )
 }
 
@@ -25,23 +25,23 @@ function _start_branch() {
     # set -o errexit # Can't do this inside a function
     set -o nounset
     set -o pipefail
-    if [[ ! -d ~/branches/"$branch" ]]; then
+    if [[ ! -d ~/equalizer/"$branch" ]]; then
       printf "=== Setting up a branch named ${branch}...\n"
-      cd ~/equalizer.git || exit "$?"
+      cd ~/equalizer/master || exit "$?"
       wovn_pull
-      printf "=== Checking out the branch named feature/${branch} in a new working tree at ~/branches/${branch}...\n"
-      git worktree add -b "feature/${branch}" ~/branches/"${branch}" develop_front || git worktree add ~/branches/"${branch}" "feature/${branch}" || exit "$?"
+      printf "=== Checking out the branch named feature/${branch} in a new working tree at ~/equalizer/${branch}...\n"
+      git worktree add -b "feature/${branch}" ../"${branch}" develop_front || git worktree add ../"${branch}" "feature/${branch}" || exit "$?"
     else
       printf "=== Accessing an existing branch named ${branch}...\n"
     fi
-    cd ~/branches/"${branch}" || exit "$?"
+    cd ~/equalizer/"${branch}" || exit "$?"
     wovn_update || exit "$?"
     printf "\a=== Your branch ${branch} is ready!\n"
   )
-  if [[ -d ~/branches/"$branch" ]]; then
-    cd ~/branches/"${branch}"
+  if [[ -d ~/equalizer/"$branch" ]]; then
+    cd ~/equalizer/"${branch}"
   else
-    cd ~/equalizer.git
+    cd ~/equalizer/
   fi
 }
 
@@ -56,11 +56,11 @@ function get_remote_branch_name() {
 function wovn_pull() {
   (
     printf "=== Retrieving the latest data from the repository...\n"
-    cd ~/branches/master || exit "$?"
+    cd ~/equalizer/master || exit "$?"
     git pull || exit "$?"
-    cd ~/branches/develop || exit "$?"
+    cd ~/equalizer/develop || exit "$?"
     git pull || exit "$?"
-    cd ~/branches/develop_front || exit "$?"
+    cd ~/equalizer/develop_front || exit "$?"
     git pull || exit "$?"
   )
 }
diff --git a/vim/ale b/vim/bundle/ale
similarity index 100%
rename from vim/ale
rename to vim/bundle/ale
diff --git a/vimrc b/vimrc
index 3f9c446..1cb0b51 100644
--- a/vimrc
+++ b/vimrc
@@ -30,6 +30,9 @@ let g:ale_fixers = {'javascript': ['standard']}
 let g:ale_lint_on_save = 1
 let g:ale_fix_on_save = 1
 let g:ale_sign_column_always = 1
+let g:airline#extensions#ale#enabled = 1
+hi ALEError ctermbg=DarkRed ctermfg=White
+hi ALEWarning ctermbg=106 ctermfg=Black
 
 let g:airline#extensions#tabline#enabled = 1
 set modeline