From e1cee91d5ec10e7b021721dc77b1e151c620a54d Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Wed, 25 Oct 2017 16:46:20 -0700
Subject: [PATCH 1/3] [clojure] Update cider nrepl versions

---
 dotfiles/boot/profile.boot | 2 +-
 dotfiles/lein/profile.clj  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dotfiles/boot/profile.boot b/dotfiles/boot/profile.boot
index 898afbe6..723477c3 100644
--- a/dotfiles/boot/profile.boot
+++ b/dotfiles/boot/profile.boot
@@ -1,7 +1,7 @@
 (require 'boot.repl)
 
 (swap! boot.repl/*default-dependencies*
-       concat '[[cider/cider-nrepl "0.12.0"]])
+       concat '[[cider/cider-nrepl "0.15.1"]])
 
 (swap! boot.repl/*default-middleware*
        conj 'cider.nrepl/cider-middleware)
diff --git a/dotfiles/lein/profile.clj b/dotfiles/lein/profile.clj
index 0991fd72..b0afb731 100644
--- a/dotfiles/lein/profile.clj
+++ b/dotfiles/lein/profile.clj
@@ -1 +1 @@
-{:repl {:plugins [[cider/cider-nrepl "0.12.0"]]}}
+{:repl {:plugins [[cider/cider-nrepl "0.15.1"]]}}

From d3114467f540743fe1e30f6daea3a9e51bb7c4c7 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Wed, 25 Oct 2017 20:18:33 -0700
Subject: [PATCH 2/3] [Emacs] Increase undo-limit and use undo-tree

---
 dotfiles/emacs.d/README.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org
index a0b56ba5..e37a36f5 100644
--- a/dotfiles/emacs.d/README.org
+++ b/dotfiles/emacs.d/README.org
@@ -4176,7 +4176,6 @@ I had to disable this mode because something that it does messes with coding set
 ** undo-tree
 #+BEGIN_SRC emacs-lisp
 (use-package undo-tree
-  :disabled t ;; this has been getting pretty annoying
   :bind (("C--" . undo-redo)
          ("C-c u" . undo-tree-visualize)
          ("C-c r" . undo-tree-redo))
@@ -4185,6 +4184,8 @@ I had to disable this mode because something that it does messes with coding set
   :init
   (progn
     ;;(setq undo-tree-visualizer-diff t) ;; This causes performance problems
+    (setq undo-limit (expt 2 25)
+          undo-strong-limit (expt 2 25))
     (global-undo-tree-mode)
     (setq undo-tree-visualizer-timestamps t)))
 #+END_SRC

From c1432a83bf4ff6ada883c43773a760008309cfc0 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Thu, 26 Oct 2017 00:32:31 -0700
Subject: [PATCH 3/3] [taffybar] Remove underlines

---
 dotfiles/config/taffybar/taffybar    |  2 +-
 dotfiles/config/taffybar/taffybar.hs | 49 ++++++++++++++++------------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index 28b9515b..5a01a6c7 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit 28b9515b1ddb9854d159b7943eb0136676d29fd9
+Subproject commit 5a01a6c7df328da4b012dd054b5a8314f1594640
diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs
index 8b7d6bd0..d2955552 100644
--- a/dotfiles/config/taffybar/taffybar.hs
+++ b/dotfiles/config/taffybar/taffybar.hs
@@ -41,8 +41,15 @@ instance WorkspaceWidgetController ConstantIconController where
   updateWidget cic _ = return cic
   getWidget = Gtk.toWidget . cicImage
 
-memCfg =
+myGraphConfig =
   defaultGraphConfig
+  { graphPadding = 5
+  , graphBorderWidth = 0
+  , graphWidth = 75
+  }
+
+memCfg =
+  myGraphConfig
   {graphDataColors = [(0.129, 0.588, 0.953, 1)], graphLabel = Just "mem"}
 
 memCallback :: Gtk.Widget -> IO [Double]
@@ -165,7 +172,7 @@ main = do
               IINone -> IIFilePath $ inResourcesDirectory "exe-icon.png"
               _ -> res
       cpuCfg =
-        defaultGraphConfig
+        myGraphConfig
         { graphDataColors = [(0, 1, 0, 1), (1, 0, 1, 0.5)]
         , graphLabel = Just "cpu"
         }
@@ -179,16 +186,16 @@ main = do
         , minWSWidgetSize = Nothing
         , minIcons = 1
         , getIconInfo = myGetIconInfo
-        , windowIconSize = 32
+        , windowIconSize = 28
         , widgetGap = 0
-        , widgetBuilder =
-            buildButtonController $
-            buildUnderlineController $
-            buildContentsController
-              [ buildConstantIconController
-              , buildLabelController
-              , buildIconController
-              ]
+        -- , widgetBuilder =
+        --     buildButtonController $
+        --     buildUnderlineController $
+        --     buildContentsController
+        --       [ buildConstantIconController
+        --       , buildLabelController
+        --       , buildIconController
+        --       ]
         , showWorkspaceFn = hideEmpty
         , updateRateLimitMicroseconds = 100000
         , updateIconsOnTitleChange = True
@@ -203,23 +210,23 @@ main = do
       pagerConfig =
         defaultPagerConfig
         {useImages = True, windowSwitcherFormatter = myFormatEntry}
-      makeUnderline = underlineWidget myHUDConfig
+      -- makeUnderline = underlineWidget myHUDConfig
   pgr <- pagerNew pagerConfig
   -- tray2 <- movableWidget tray
   let hud = buildWorkspaceHUD myHUDConfig pgr
-      los = makeUnderline (layoutSwitcherNew pgr) "red"
-      wnd = makeUnderline (windowSwitcherNew pgr) "teal"
+      los = layoutSwitcherNew pgr
+      wnd = windowSwitcherNew pgr
       taffyConfig =
         defaultTaffybarConfig
-        { startWidgets = [hud, wnd, los]
+        { startWidgets = [hud, los, wnd]
         , endWidgets =
             [ batteryBarNew defaultBatteryConfig 1.0
-            , makeUnderline clock "teal"
-            , makeUnderline systrayNew "yellow"
-            , makeUnderline mem "blue"
-            , makeUnderline cpu "green"
-            , makeUnderline netMonitor "yellow"
-            , makeUnderline mpris "red"
+            , clock
+            , systrayNew
+            , mem
+            , cpu
+            , netMonitor
+            , mpris
             ]
         , barPosition = Top
         , barPadding = 10