wgester/dotfiles
1
0
Fork 0
forked from colonelpanic/dotfiles
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Ivan Malison 2017-10-26 02:25:54 -07:00
commit 257c77b151
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
5 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dotfiles/boot/profile.boot
View File

@ -1,7 +1,7 @@
(require 'boot.repl) (require 'boot.repl)
(swap! boot.repl/*default-dependencies* (swap! boot.repl/*default-dependencies*
concat '[[cider/cider-nrepl "0.12.0"]]) concat '[[cider/cider-nrepl "0.15.1"]])
(swap! boot.repl/*default-middleware* (swap! boot.repl/*default-middleware*
conj 'cider.nrepl/cider-middleware) conj 'cider.nrepl/cider-middleware)

2
dotfiles/config/taffybar/taffybar

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

49
dotfiles/config/taffybar/taffybar.hs
View File

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

3
dotfiles/emacs.d/README.org
View File

@ -4178,7 +4178,6 @@ I had to disable this mode because something that it does messes with coding set
** undo-tree ** undo-tree
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package undo-tree (use-package undo-tree
:disabled t ;; this has been getting pretty annoying
:bind (("C--" . undo-redo) :bind (("C--" . undo-redo)
("C-c u" . undo-tree-visualize) ("C-c u" . undo-tree-visualize)
("C-c r" . undo-tree-redo)) ("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 :init
(progn (progn
;;(setq undo-tree-visualizer-diff t) ;; This causes performance problems ;;(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) (global-undo-tree-mode)
(setq undo-tree-visualizer-timestamps t))) (setq undo-tree-visualizer-timestamps t)))
#+END_SRC #+END_SRC

2
dotfiles/lein/profile.clj
View File

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