Merge branch 'release/0.2.0'

nordtheme · Apr 22, 2017 · 0f3d20f · 0f3d20f
2 parents 0d14b02 + 150bab8
commit 0f3d20f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@
 
 ---
 
+# 0.2.0
+*2017-04-22*
+## Features
+### Plugin Support
+❯ Implemented support for the [tmux-prefix-highlight](https://github.com/tmux-plugins/tmux-prefix-highlight) *prefix*- and `copy-mode` status indicator. (@kepbod, #3, 166c8956)
+
+<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-tmux/develop/src/assets/scrot-plugin-support-tmux-prefix-highlight.png"/><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-tmux/develop/src/assets/scrot-plugin-support-tmux-prefix-highlight-copy-mode.png"/></p>
+
 # 0.1.1
 *2017-04-21*
 ## Bug Fixes

diff --git a/README.md b/README.md
@@ -17,6 +17,8 @@ Based on the <a href="https://github.com/arcticicestudio/nord">Nord</a> color pa
       - [GitHub Repository Clone](#gitHub-repository-clone)
     - [Activation](#activation)
   - [Features](#features)
+  - [Plugin Support](#plugin-support)
+    - [tmux-prefix-highlight](#tmux-prefix-highlight)
   - [Development](#development)
     - [Contribution](#contribution)
 
@@ -76,8 +78,14 @@ tmux source-file `~/.tmux.conf`
 
 <p align="center"><strong>Fits to many terminal applications based on Nord</strong><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-tmux/develop/src/assets/scrot-htop.png"/></p>
 
+## Plugin Support
+### [tmux-prefix-highlight](https://github.com/tmux-plugins/tmux-prefix-highlight)
+Supports the *prefix*- and `copy-mode` status indicator.
+
+<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-tmux/develop/src/assets/scrot-plugin-support-tmux-prefix-highlight.png"/><br><img src="https://raw.githubusercontent.com/arcticicestudio/nord-tmux/develop/src/assets/scrot-plugin-support-tmux-prefix-highlight-copy-mode.png"/></p>
+
 ## Development
-[![](https://img.shields.io/badge/Changelog-0.1.1-81A1C1.svg)](https://github.com/arcticicestudio/nord-tmux/blob/v0.1.1/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-81A1C1.svg)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-81A1C1.svg)](https://github.com/arcticicestudio/arcver)
+[![](https://img.shields.io/badge/Changelog-0.2.0-81A1C1.svg)](https://github.com/arcticicestudio/nord-tmux/blob/v0.2.0/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-81A1C1.svg)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-81A1C1.svg)](https://github.com/arcticicestudio/arcver)
 
 ### Contribution
 Please report issues/bugs, feature requests and suggestions for improvements to the [issue tracker](https://github.com/arcticicestudio/nord-tmux/issues).

diff --git a/nord.tmux b/nord.tmux
@@ -14,7 +14,7 @@
 # tmux
 #   https://tmux.github.io
 NORD_TMUX_COLOR_THEME_FILE=src/nord.conf
-NORD_TMUX_VERSION=0.1.1
+NORD_TMUX_VERSION=0.2.0
 _current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 __cleanup() {

diff --git a/src/assets/scrot-plugin-support-tmux-prefix-highlight-copy-mode.png b/src/assets/scrot-plugin-support-tmux-prefix-highlight-copy-mode.png
diff --git a/src/assets/scrot-plugin-support-tmux-prefix-highlight.png b/src/assets/scrot-plugin-support-tmux-prefix-highlight.png
diff --git a/src/nord.conf b/src/nord.conf
@@ -1,12 +1,22 @@
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 # title      Nord tmux                                    +
 # project    nord-tmux                                    +
-# version    0.1.1                                        +
+# version    0.2.0                                        +
 # repository https://github.com/arcticicestudio/nord-tmux +
 # author     Arctic Ice Studio                            +
 # email      [email protected]              +
 # copyright  Copyright (C) 2017                           +
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#+----------------+
+#+ Plugin Support +
+#+----------------+
+#+--- tmux-prefix-highlight ---+
+set -g @prefix_highlight_fg black
+set -g @prefix_highlight_bg brightcyan
+set -g @prefix_highlight_copy_mode_attr "fg=brightcyan,bg=black,bold"
+set -g @prefix_highlight_output_prefix "#[fg=brightcyan]#[bg=black]#[nobold]#[noitalics]#[nounderscore]#[bg=brightcyan]#[fg=black]"
+set -g @prefix_highlight_output_suffix ""
+
 #+---------+
 #+ Options +
 #+---------+
@@ -27,7 +37,7 @@ set -g status-attr none
 
 #+--- Bars ---+
 set -g status-left "#[fg=black,bg=blue,bold] #S#[fg=blue,bg=black,nobold,noitalics,nounderscore]"
-set -g status-right "#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %Y-%m-%d #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %H:%M #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]#[fg=black,bg=cyan,bold] #H"
+set -g status-right "#{prefix_highlight}#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %Y-%m-%d #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %H:%M #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]#[fg=black,bg=cyan,bold] #H"
 
 #+--- Windows ---+
 set -g window-status-format "#[fg=black,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#I #[fg=white,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#W #F #[fg=brightblack,bg=black,nobold,noitalics,nounderscore]"