From 8eb632e3a4a4fe1ddb7803086182bbc3d7c4ac97 Mon Sep 17 00:00:00 2001
From: Bill Niblock <bill_niblock@yahoo.com>
Date: Wed, 19 Oct 2016 11:44:38 -0400
Subject: [PATCH] Update

---
 firefox/ffz-settings.json | 60 +++++++++++++++++++++++++++++++++++++++
 tmux/README.md            | 16 +++++++++--
 tmux/clocks.rb            | 48 +++++++++++++++----------------
 tmux/tmux.conf            | 10 +++----
 4 files changed, 103 insertions(+), 31 deletions(-)
 create mode 100644 firefox/ffz-settings.json

diff --git a/firefox/ffz-settings.json b/firefox/ffz-settings.json
new file mode 100644
index 0000000..9aa94da
--- /dev/null
+++ b/firefox/ffz-settings.json
@@ -0,0 +1,60 @@
+{
+    "version": 1,
+    "script_version": "3.5.318",
+    "aliases": {},
+    "settings": {
+        "advanced_settings": true,
+        "favorite_settings": [
+            "auto_theater",
+            "dark_twitch",
+            "channel_views",
+            "srl_races",
+            "stream_title",
+            "parse_emoticons",
+            "replace_bad_emotes",
+            "room_status",
+            "emoji_in_menu",
+            "global_emotes_in_menu",
+            "replace_twitch_menu",
+            "input_emoticons_case_sensitive",
+            "input_complete_name_at",
+            "input_complete_name_require_at",
+            "emote_image_hover",
+            "player_volume_bar",
+            "sidebar_hide_more_at_twitch",
+            "sidebar_hide_promoted_games",
+            "sidebar_hide_recommended_channels",
+            "sidebar_directly_to_followed_channels",
+            "hide_conversations_in_theatre",
+            "minimize_conversations"
+        ],
+        "twenty_four_timestamps": 2,
+        "auto_theater": true,
+        "player_volume_bar": true,
+        "emote_image_hover": true,
+        "chat_rows": true,
+        "chat_padding": true,
+        "minimal_chat": 3,
+        "top_conversations": false,
+        "hide_conversations_in_theatre": true,
+        "minimize_conversations": true,
+        "input_complete_name_require_at": true,
+        "sidebar_hide_recommended_channels": true,
+        "sidebar_hide_promoted_games": true,
+        "sidebar_hide_more_at_twitch": true,
+        "sidebar_directly_to_followed_channels": true,
+        "twitch_chat_dark": false,
+        "dark_twitch": true,
+        "dark_no_blue": true,
+        "replace_twitch_menu": true,
+        "global_emotes_in_menu": true,
+        "emoji_in_menu": true,
+        "emote_menu_collapsed": [
+            "twitch-2237",
+            "twitch-11261",
+            "ffz-3",
+            "twitch-0"
+        ],
+        "warp_world": false
+    }
+}
\ No newline at end of file
diff --git a/tmux/README.md b/tmux/README.md
index 870c30e..0df8f60 100644
--- a/tmux/README.md
+++ b/tmux/README.md
@@ -1,4 +1,16 @@
 #Tmux Configuration Files
 
-My tmux configuration is extremely basic at the moment. Further configuration to
-follow as my usage of tmux grows.
+My tmux configuration is very straight forward. Of note, I enable mouse mode,
+and have custom colors configured. I also have a few custom scripts.
+
+### Tmux Addons
+- [TPM](https://www.github.com/tmux-plugins/tpm): The TMUX Plugin Manager
+- [Scroll-Wheel Copy Mode](https://www.github.com/nhdaly/tmux-scroll-copy-mode)
+- [Resurrect](https://www.github.com/tmux-plugins/tmux-resurrect): Session
+  Management
+
+### Custom Scripts
+- clocks.sh/rb: My custom status bar. Shows time for 4 different time zones,
+  plus the date and weather of my default home location.
+
+- copy\_selected.sh: Enables uploading of the selected text to Gist. 
diff --git a/tmux/clocks.rb b/tmux/clocks.rb
index ec38708..6ed70ec 100644
--- a/tmux/clocks.rb
+++ b/tmux/clocks.rb
@@ -6,41 +6,41 @@ require 'net/http'
 
 class Weather
 
-     attr_reader :temp, :flag, :summary
+  attr_reader :temp, :flag, :summary
 
-     def initialize()
-          @temp = 68
-          @flag = "(!)" if hasflag?
-          @summary = "Dang nice"
-     end
+  def initialize()
+    @temp = 68
+    @flag = "(!)" if hasflag?
+    @summary = "Dang nice"
+  end
 
-     private
+  private
 
-     def get_weather(lat = 42.9333, lon = -78.877)
+  def get_weather(lat = 42.9333, lon = -78.877)
 
-     end
+  end
 
-     def hasflag?
-          return true
-     end
+  def hasflag?
+    return true
+  end
 
 end
 
 class Clocks
 
-     def initialize()
-          w = Weather.new()
-          t = Time.new()
-          @tu = t.utc.strftime("[ %H:%M ]")
-          @tb = t.getlocal("-04:00").strftime("<][ %b %d %H:%M | ")
-          @tw = "#{w::flag} #{w::temp} ][>"
-          @tc = t.getlocal("-07:00").strftime("<][ %H:%M ]")
-          @ti = t.getlocal("+05:30").strftime("[ %H:%M ][>")
-     end
+  def initialize()
+    w = Weather.new()
+    t = Time.new()
+    @tu = t.utc.strftime("[ %H:%M ]")
+    @tb = t.getlocal("-04:00").strftime("<][ %b %d %H:%M | ")
+    @tw = "#{w::flag} #{w::temp} ][>"
+    @tc = t.getlocal("-07:00").strftime("<][ %H:%M ]")
+    @ti = t.getlocal("+05:30").strftime("[ %H:%M ][>")
+  end
 
-     def show()
-          puts "#{@tc} #{@tb}#{@tw} #{@tu} #{@ti}"
-     end
+  def show()
+    puts "#{@tc} #{@tb}#{@tw} #{@tu} #{@ti}"
+  end
 end
 
 c = Clocks.new()
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index cc5f9c7..8a92148 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -37,7 +37,7 @@ set -g mouse on
 set -g status-fg cyan
 set -g status-bg black
 
-# window list
+# Window list
 setw -g window-status-fg cyan
 setw -g window-status-bg default
 setw -g window-status-attr dim
@@ -88,10 +88,10 @@ bind-key -r C-h select-window -t :-
 bind-key -r C-l select-window -t :+
 
 #pane resizing
-bind -r H resize-pane -L 10
-bind -r J resize-pane -D 10
-bind -r K resize-pane -U 10
-bind -r L resize-pane -R 10
+bind -r H resize-pane -L 5
+bind -r J resize-pane -D 5
+bind -r K resize-pane -U 5
+bind -r L resize-pane -R 5
 
 #split window and fix path for tmux 1.9
 bind | split-window -h #-c "#{pane_current_path}"