From da496b7f0c41b0cfaa888782ce3773f05096f868 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Mon, 20 Jan 2020 12:43:55 -0600
Subject: [PATCH] Maybe actually fix colors?

---
 apps/neovim/settings.vim                  | 4 ----
 apps/shell/bash/{aliases => aliases.bash} | 0
 apps/shell/bash/rc                        | 4 ++--
 apps/shell/fish/config.fish               | 2 +-
 apps/shell/tmux/conf                      | 4 ++--
 5 files changed, 5 insertions(+), 9 deletions(-)
 rename apps/shell/bash/{aliases => aliases.bash} (100%)

diff --git a/apps/neovim/settings.vim b/apps/neovim/settings.vim
index b8ffbc9..451987d 100644
--- a/apps/neovim/settings.vim
+++ b/apps/neovim/settings.vim
@@ -90,10 +90,6 @@ if has('autocmd')
 	augroup END
 endif
 
-" color scheme
-let base16colorspace=16
-let &t_Co=16
-set background=dark
 syntax enable
 colorscheme base16-donokai
 
diff --git a/apps/shell/bash/aliases b/apps/shell/bash/aliases.bash
similarity index 100%
rename from apps/shell/bash/aliases
rename to apps/shell/bash/aliases.bash
diff --git a/apps/shell/bash/rc b/apps/shell/bash/rc
index 13998a1..83c671a 100644
--- a/apps/shell/bash/rc
+++ b/apps/shell/bash/rc
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+!/usr/bin/env bash
 
 export XDG_CONFIG_HOME="$HOME/.config"
 export DOTFILES_PATH="$XDG_CONFIG_HOME/dotfiles"
@@ -7,7 +7,7 @@ export DOTFILES_PATH="$XDG_CONFIG_HOME/dotfiles"
 
 [[ ! $- == *i* ]] && return # stop parsing on a non-interactive shell
 
-. "$DOTFILES_PATH/apps/shell/bash/aliases"
+. "$DOTFILES_PATH/apps/shell/bash/aliases.bash"
 . "$DOTFILES_PATH/apps/shell/bash/autocompletions"
 . "$DOTFILES_PATH/apps/shell/bash/prompt"
 
diff --git a/apps/shell/fish/config.fish b/apps/shell/fish/config.fish
index 8382bdd..ba1f333 100755
--- a/apps/shell/fish/config.fish
+++ b/apps/shell/fish/config.fish
@@ -4,7 +4,7 @@ set -U XDG_CONFIG_HOME $HOME/.config
 set -U DOTFILES_PATH $XDG_CONFIG_HOME/dotfiles
 set -U ENV_PATH $HOME/.env
 
-$DOTFILES_PATH/bin/lib/colors/shell
+# $DOTFILES_PATH/bin/lib/colors/shell
 $DOTFILES_PATH/bin/prelude
 
 function source_if_exists
diff --git a/apps/shell/tmux/conf b/apps/shell/tmux/conf
index d3de2ca..f14b07a 100644
--- a/apps/shell/tmux/conf
+++ b/apps/shell/tmux/conf
@@ -8,10 +8,10 @@ bind-key T source-file "$HOME/.tmux.conf" \; display-message "source-file done"
 unbind r
 bind r source-file "$HOME/.tmux.conf"
 
-set -as terminal-overrides ',xterm*:smxx=\E[9m'
+# set -as terminal-overrides ',xterm*:smxx=\E[9m'
+set -g default-terminal "screen-256color"
 
 # sane defaults
-set -g default-terminal "tmux"
 set -g mouse on
 
 # honestly not exactly sure?