summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tmux/.tmux.conf2
-rw-r--r--tmux/.tmux/aws.conf (renamed from tmux/.tmux.aws.conf)2
-rw-r--r--tmux/.tmux/common.conf (renamed from tmux/.tmux.common.conf)0
-rw-r--r--tmux/.tmux/default.conf (renamed from tmux/.tmux.default.conf)2
-rw-r--r--tmux/.tmux/gcloud.conf (renamed from tmux/.tmux.gcloud.conf)2
-rw-r--r--tmux/.tmux/uberspace.conf (renamed from tmux/.tmux.uberspace.conf)2
-rw-r--r--zsh/.zshrc8
7 files changed, 9 insertions, 9 deletions
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index a1cdddd..04aee71 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -1,4 +1,4 @@
-source-file ~/.tmux.common.conf
+source-file ~/.tmux/common.conf
set -g status-bg colour13
set -g status-fg colour235
diff --git a/tmux/.tmux.aws.conf b/tmux/.tmux/aws.conf
index b5c1abd..4ea910f 100644
--- a/tmux/.tmux.aws.conf
+++ b/tmux/.tmux/aws.conf
@@ -1,4 +1,4 @@
-source-file ~/.tmux.common.conf
+source-file ~/.tmux/common.conf
set -g status-bg yellow
set -g status-fg black
diff --git a/tmux/.tmux.common.conf b/tmux/.tmux/common.conf
index 5de73ad..5de73ad 100644
--- a/tmux/.tmux.common.conf
+++ b/tmux/.tmux/common.conf
diff --git a/tmux/.tmux.default.conf b/tmux/.tmux/default.conf
index 728a475..1abb019 100644
--- a/tmux/.tmux.default.conf
+++ b/tmux/.tmux/default.conf
@@ -1,4 +1,4 @@
-source-file ~/.tmux.common.conf
+source-file ~/.tmux/common.conf
set -g status-bg white
set -g status-fg black
diff --git a/tmux/.tmux.gcloud.conf b/tmux/.tmux/gcloud.conf
index d518764..7270636 100644
--- a/tmux/.tmux.gcloud.conf
+++ b/tmux/.tmux/gcloud.conf
@@ -1,4 +1,4 @@
-source-file ~/.tmux.common.conf
+source-file ~/.tmux/common.conf
set -g status-bg blue
set -g status-fg white
diff --git a/tmux/.tmux.uberspace.conf b/tmux/.tmux/uberspace.conf
index b8208d7..e5b3cd5 100644
--- a/tmux/.tmux.uberspace.conf
+++ b/tmux/.tmux/uberspace.conf
@@ -1,4 +1,4 @@
-source-file ~/.tmux.common.conf
+source-file ~/.tmux/common.conf
set -g status-bg green
set -g status-fg black
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 2a215df..99f2570 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -231,22 +231,22 @@ case `hostname -f` in
*.uberspace.de)
HOSTCOLOR_BG=green
HOSTCOLOR_FG=black
- alias tmux="tmux -f ~/.tmux.uberspace.conf"
+ alias tmux="tmux -f ~/.tmux/uberspace.conf"
;;
*)
HOSTCOLOR_BG=black
HOSTCOLOR_FG=white
- alias tmux="tmux -f ~/.tmux.default.conf"
+ alias tmux="tmux -f ~/.tmux/default.conf"
# google cloud
if [[ $(on_gcloud) == "yes" ]]; then
HOSTCOLOR_BG=blue
HOSTCOLOR_FG=white
- alias tmux="tmux -f ~/.tmux.gcloud.conf"
+ alias tmux="tmux -f ~/.tmux/gcloud.conf"
# aws
elif [[ $(on_aws) == "yes" ]]; then
HOSTCOLOR_BG=yellow
HOSTCOLOR_FG=black
- alias tmux="tmux -f ~/.tmux.aws.conf"
+ alias tmux="tmux -f ~/.tmux/aws.conf"
fi
;;
esac