From a37e669816c811e787c869ebf86ef11333401a45 Mon Sep 17 00:00:00 2001
From: Mari <mstaib.git@reya.zone>
Date: Mon, 18 May 2020 21:26:10 -0400
Subject: [PATCH] Autocommitted updated scripts from mari-wovn

---
 nvim/init.vim                       | 3 +++
 per-host/Adversary/.config/nvim     | 1 +
 per-host/EarthDaughter/.config/nvim | 1 +
 per-host/EarthDaughter/.vim         | 1 +
 per-host/MoonMother/.config/nvim    | 1 +
 per-host/blocky-cafe/.config/nvim   | 1 +
 per-host/mari-wovn/.bash_aliases    | 3 ---
 per-host/mari-wovn/.config/nvim     | 1 +
 per-host/rock64/.config/nvim        | 1 +
 per-host/template/.config/nvim      | 1 +
 tmux.conf                           | 4 ++--
 vim/.vim                            | 1 +
 12 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 nvim/init.vim
 create mode 120000 per-host/Adversary/.config/nvim
 create mode 120000 per-host/EarthDaughter/.config/nvim
 create mode 120000 per-host/EarthDaughter/.vim
 create mode 120000 per-host/MoonMother/.config/nvim
 create mode 120000 per-host/blocky-cafe/.config/nvim
 create mode 120000 per-host/mari-wovn/.config/nvim
 create mode 120000 per-host/rock64/.config/nvim
 create mode 120000 per-host/template/.config/nvim
 create mode 120000 vim/.vim

diff --git a/nvim/init.vim b/nvim/init.vim
new file mode 100644
index 0000000..f182e5b
--- /dev/null
+++ b/nvim/init.vim
@@ -0,0 +1,3 @@
+set runtimepath^=~/.vim runtimepath+=~/.vim/after
+let &packpath = &runtimepath
+source ~/.vimrc
diff --git a/per-host/Adversary/.config/nvim b/per-host/Adversary/.config/nvim
new file mode 120000
index 0000000..90f57e4
--- /dev/null
+++ b/per-host/Adversary/.config/nvim
@@ -0,0 +1 @@
+../../../nvim
\ No newline at end of file
diff --git a/per-host/EarthDaughter/.config/nvim b/per-host/EarthDaughter/.config/nvim
new file mode 120000
index 0000000..90f57e4
--- /dev/null
+++ b/per-host/EarthDaughter/.config/nvim
@@ -0,0 +1 @@
+../../../nvim
\ No newline at end of file
diff --git a/per-host/EarthDaughter/.vim b/per-host/EarthDaughter/.vim
new file mode 120000
index 0000000..3a26453
--- /dev/null
+++ b/per-host/EarthDaughter/.vim
@@ -0,0 +1 @@
+../../vim
\ No newline at end of file
diff --git a/per-host/MoonMother/.config/nvim b/per-host/MoonMother/.config/nvim
new file mode 120000
index 0000000..90f57e4
--- /dev/null
+++ b/per-host/MoonMother/.config/nvim
@@ -0,0 +1 @@
+../../../nvim
\ No newline at end of file
diff --git a/per-host/blocky-cafe/.config/nvim b/per-host/blocky-cafe/.config/nvim
new file mode 120000
index 0000000..90f57e4
--- /dev/null
+++ b/per-host/blocky-cafe/.config/nvim
@@ -0,0 +1 @@
+../../../nvim
\ No newline at end of file
diff --git a/per-host/mari-wovn/.bash_aliases b/per-host/mari-wovn/.bash_aliases
index 7364ad0..ff1dabd 100644
--- a/per-host/mari-wovn/.bash_aliases
+++ b/per-host/mari-wovn/.bash_aliases
@@ -85,9 +85,6 @@ function wovn_update() {
     set -o pipefail
     wovn_pull
     printf "=== Updating the branch...\n"
-    if get_remote_branch_name >&/dev/null; then
-      git pull --rebase || exit "$?"
-    fi
     git rebase develop_front || exit "$?"
     printf "=== Checking dependencies...\n"
     wovn_install
diff --git a/per-host/mari-wovn/.config/nvim b/per-host/mari-wovn/.config/nvim
new file mode 120000
index 0000000..90f57e4
--- /dev/null
+++ b/per-host/mari-wovn/.config/nvim
@@ -0,0 +1 @@
+../../../nvim
\ No newline at end of file
diff --git a/per-host/rock64/.config/nvim b/per-host/rock64/.config/nvim
new file mode 120000
index 0000000..90f57e4
--- /dev/null
+++ b/per-host/rock64/.config/nvim
@@ -0,0 +1 @@
+../../../nvim
\ No newline at end of file
diff --git a/per-host/template/.config/nvim b/per-host/template/.config/nvim
new file mode 120000
index 0000000..90f57e4
--- /dev/null
+++ b/per-host/template/.config/nvim
@@ -0,0 +1 @@
+../../../nvim
\ No newline at end of file
diff --git a/tmux.conf b/tmux.conf
index 9b8a22a..c545684 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,5 +1,4 @@
 # link destination: $HOME/.bash_aliases
-
 ##############
 # Key Bindings
 ##############
@@ -13,7 +12,9 @@ set-option -g mouse on
 #####################
 # Terminal Properties
 #####################
+set-option -sa terminal-overrides ',xterm:RGB'
 set-option -g default-terminal screen-256color-bce
+set-option -sg escape-time 10
 
 ############################
 # Status/Title Configuration
@@ -59,7 +60,6 @@ set-option -g history-limit 99999
 # set-option -ug repeat-time
 # set-option -ug set-remain-on-exit
 # set-option -ug status-right-length
-# set-option -ug terminal-overrides
 # set-option -ug update-environment
 # set-option -ug visual-activity
 # set-option -ug visual-bell
diff --git a/vim/.vim b/vim/.vim
new file mode 120000
index 0000000..1b1d3ff
--- /dev/null
+++ b/vim/.vim
@@ -0,0 +1 @@
+/home/marissa/.common-configs/per-host/mari-wovn/.vim
\ No newline at end of file