colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ivan Malison 2018-03-16 00:12:59 -07:00
commit 01f230b426
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dotfiles/config/taffybar/stack.yaml
View File

@ -19,8 +19,8 @@ packages:
- location: ../../../../Projects/haskell-dbus - location: ../../../../Projects/haskell-dbus
extra-dep: true extra-dep: true
extra-deps: extra-deps:
- spool-0.1
- X11-xft-0.3.1 - X11-xft-0.3.1
- dbus-0.10.13
- gio-0.13.4.1 - gio-0.13.4.1
- gtk3-0.14.8 - gtk3-0.14.8
- libxml-sax-0.7.5 - libxml-sax-0.7.5

2
dotfiles/config/taffybar/taffybar

@ -1 +1 @@
Subproject commit b2e9577b3de272f56f9c89dfb01c3d3d9107cf55 Subproject commit f7673d90530183aa97d86000dc3160ca784fa492

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

@ -31,6 +31,7 @@ import System.Taffybar.SimpleClock
import System.Taffybar.Systray import System.Taffybar.Systray
import System.Taffybar.ToggleMonitor import System.Taffybar.ToggleMonitor
import System.Taffybar.Widgets.PollingGraph import System.Taffybar.Widgets.PollingGraph
import System.Taffybar.Widgets.StatusNotifierTray
import System.Taffybar.WindowSwitcher import System.Taffybar.WindowSwitcher
import System.Taffybar.WorkspaceHUD import System.Taffybar.WorkspaceHUD
import System.Taffybar.WorkspaceSwitcher import System.Taffybar.WorkspaceSwitcher
@ -233,6 +234,7 @@ main = do
[ batteryBarNew defaultBatteryConfig 1.0 [ batteryBarNew defaultBatteryConfig 1.0
, makeContents clock "Cpu" , makeContents clock "Cpu"
, makeContents systrayNew "Cpu" , makeContents systrayNew "Cpu"
, makeContents buildTray "Cpu"
, makeContents cpu "Cpu" , makeContents cpu "Cpu"
, makeContents mem "Cpu" , makeContents mem "Cpu"
, makeContents netMonitor "Cpu" , makeContents netMonitor "Cpu"

2
dotfiles/config/xmonad/stack.yaml
View File

@ -15,8 +15,6 @@ packages:
extra-deps: extra-deps:
- X11-xft-0.3.1 - X11-xft-0.3.1
- xml-helpers-1.0.0 - xml-helpers-1.0.0
- dbus-0.10.12
- gtk-traymanager-0.1.6
- libxml-sax-0.7.5 - libxml-sax-0.7.5
- rate-limit-1.1.1 - rate-limit-1.1.1
- time-units-1.0.0 - time-units-1.0.0

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

@ -1626,10 +1626,16 @@ custom-set-faces in your custom file.
(interactive) (interactive)
(imalison:named-compile "glide up")) (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" (defhydra imalison:compile nil "Compile"
("p" imalison:projectile-helm-command-from-zsh "Run a command in projectile root") ("p" imalison:projectile-helm-command-from-zsh "Run a command in projectile root")
("d" helm-command-from-zsh "Run a command in default directory") ("d" helm-command-from-zsh "Run a command in default directory")
("c" imalison:named-compile "Enter Custom Command") ("c" imalison:named-compile "Enter Custom Command")
("s" imalison:stack-build "Stack build")
("t" imalison:make-test "Test") ("t" imalison:make-test "Test")
("u" imalison:glide-up "Update Dependencies")) ("u" imalison:glide-up "Update Dependencies"))
;; The following parens close the use-package/progn created several blocks above ;; The following parens close the use-package/progn created several blocks above