Merge branch 'master' of github.com:IvanMalison/dotfiles

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)

dotfiles/config/taffybar/taffybar

@@ -1 +1 @@
-Subproject commit 28b9515b1ddb9854d159b7943eb0136676d29fd9
+Subproject commit 5a01a6c7df328da4b012dd054b5a8314f1594640

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 =
+        -- , widgetBuilder =
-            buildButtonController $
+        --     buildButtonController $
-            buildUnderlineController $
+        --     buildUnderlineController $
-            buildContentsController
+        --     buildContentsController
-              [ buildConstantIconController
+        --       [ buildConstantIconController
-              , buildLabelController
+        --       , buildLabelController
-              , buildIconController
+        --       , 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"
+      los = layoutSwitcherNew pgr
-      wnd = makeUnderline (windowSwitcherNew pgr) "teal"
+      wnd = windowSwitcherNew pgr
       taffyConfig =
         defaultTaffybarConfig
-        { startWidgets = [hud, wnd, los]
+        { startWidgets = [hud, los, wnd]
         , endWidgets =
             [ batteryBarNew defaultBatteryConfig 1.0
-            , makeUnderline clock "teal"
+            , clock
-            , makeUnderline systrayNew "yellow"
+            , systrayNew
-            , makeUnderline mem "blue"
+            , mem
-            , makeUnderline cpu "green"
+            , cpu
-            , makeUnderline netMonitor "yellow"
+            , netMonitor
-            , makeUnderline mpris "red"
+            , mpris
             ]
         , barPosition = Top
         , barPadding = 10

dotfiles/emacs.d/README.org

@@ -4178,7 +4178,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))
@@ -4187,6 +4186,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

dotfiles/lein/profile.clj

@@ -1 +1 @@
-{:repl {:plugins [[cider/cider-nrepl "0.12.0"]]}}
+{:repl {:plugins [[cider/cider-nrepl "0.15.1"]]}}