diff --git a/dotfiles/config/taffybar/stack.yaml b/dotfiles/config/taffybar/stack.yaml index 0c89b2ad..f6d8da74 100644 --- a/dotfiles/config/taffybar/stack.yaml +++ b/dotfiles/config/taffybar/stack.yaml @@ -19,8 +19,8 @@ packages: - location: ../../../../Projects/haskell-dbus extra-dep: true extra-deps: +- spool-0.1 - X11-xft-0.3.1 -- dbus-0.10.13 - gio-0.13.4.1 - gtk3-0.14.8 - libxml-sax-0.7.5 diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar index b2e9577b..f7673d90 160000 --- a/dotfiles/config/taffybar/taffybar +++ b/dotfiles/config/taffybar/taffybar @@ -1 +1 @@ -Subproject commit b2e9577b3de272f56f9c89dfb01c3d3d9107cf55 +Subproject commit f7673d90530183aa97d86000dc3160ca784fa492 diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs index c66af785..4e56e1fa 100644 --- a/dotfiles/config/taffybar/taffybar.hs +++ b/dotfiles/config/taffybar/taffybar.hs @@ -31,6 +31,7 @@ import System.Taffybar.SimpleClock import System.Taffybar.Systray import System.Taffybar.ToggleMonitor import System.Taffybar.Widgets.PollingGraph +import System.Taffybar.Widgets.StatusNotifierTray import System.Taffybar.WindowSwitcher import System.Taffybar.WorkspaceHUD import System.Taffybar.WorkspaceSwitcher @@ -233,6 +234,7 @@ main = do [ batteryBarNew defaultBatteryConfig 1.0 , makeContents clock "Cpu" , makeContents systrayNew "Cpu" + , makeContents buildTray "Cpu" , makeContents cpu "Cpu" , makeContents mem "Cpu" , makeContents netMonitor "Cpu" diff --git a/dotfiles/config/xmonad/stack.yaml b/dotfiles/config/xmonad/stack.yaml index 9d197e57..6df1764b 100644 --- a/dotfiles/config/xmonad/stack.yaml +++ b/dotfiles/config/xmonad/stack.yaml @@ -15,8 +15,6 @@ packages: extra-deps: - X11-xft-0.3.1 - xml-helpers-1.0.0 -- dbus-0.10.12 -- gtk-traymanager-0.1.6 - libxml-sax-0.7.5 - rate-limit-1.1.1 - time-units-1.0.0 diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index 31f2450a..b2d9a810 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -1626,10 +1626,16 @@ custom-set-faces in your custom file. (interactive) (imalison:named-compile "glide up")) +(defun imalison:stack-build () + (interactive) + (let ((frame-mode-use-new-frame-or-window t)) + (imalison:named-compile "stack build"))) + (defhydra imalison:compile nil "Compile" ("p" imalison:projectile-helm-command-from-zsh "Run a command in projectile root") ("d" helm-command-from-zsh "Run a command in default directory") ("c" imalison:named-compile "Enter Custom Command") + ("s" imalison:stack-build "Stack build") ("t" imalison:make-test "Test") ("u" imalison:glide-up "Update Dependencies")) ;; The following parens close the use-package/progn created several blocks above