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

dotfiles/emacs.d/README.org

@@ -361,11 +361,6 @@ but provide support for writing custom elisp.
   (defun imalison:shut-up-around (function &rest args)
     (shut-up (apply function args))))
 #+END_SRC
-*** pcache
-#+BEGIN_SRC emacs-lisp
-(use-package pcache
-  :demand t)
-#+END_SRC
 *** parse-csv
 #+BEGIN_SRC emacs-lisp
 (use-package parse-csv
@@ -1271,9 +1266,12 @@ This makes ~forward-word~ and ~backward-word~ understand snake and camel case.
 ** proced
 proced is an top like utility that runs inside of emacs. The following sets auto updating automatically and makes the update interval faster.
 #+BEGIN_SRC emacs-lisp
-(require 'proced)
-(setq proced-auto-update-interval 1)
-(add-hook 'proced-mode-hook (lambda () (proced-toggle-auto-update +1)))
+(use-package proced
+  :defer t
+  :config
+  (progn
+    (setq proced-auto-update-interval 1)
+    (add-hook 'proced-mode-hook (lambda () (proced-toggle-auto-update +1)))))
 #+END_SRC
 ** Set epa program
 #+BEGIN_SRC emacs-lisp
@@ -1456,16 +1454,16 @@ Paradox is a package.el extension. I have no use for it now that I use straight.
 #+END_SRC
 ** winner
 #+BEGIN_SRC emacs-lisp
-  (use-package winner
-	:commands (winner-undo winner-redo)
-	:bind ("C-c q" . imalison:winner-hydra/body)
-	:config
-	(progn
-	  (defhydra imalison:winner-hydra ()
-		"Winner"
-		("p" winner-undo "back")
-		("n" winner-redo "forward" :exit t))
-	  (winner-mode 1)))
+(use-package winner
+  :commands (winner-undo winner-redo)
+  :bind ("C-c q" . imalison:winner-hydra/body)
+  :config
+  (progn
+    (defhydra imalison:winner-hydra ()
+      "Winner"
+      ("p" winner-undo "back")
+      ("n" winner-redo "forward" :exit t))
+    (winner-mode 1)))
 #+END_SRC
 ** eyebrowse
 I don't have any use for this now that I use frames mode, but its an interesting idea.
@@ -2386,7 +2384,8 @@ Reduce indentation for some functions
 #+END_SRC
 **** overseer
 #+BEGIN_SRC emacs-lisp
-(use-package overseer)
+(use-package overseer
+  :defer t)
 #+END_SRC
 **** Misc
 #+BEGIN_SRC emacs-lisp

dotfiles/lib/shellpath.sh

@@ -7,7 +7,7 @@ function _setup_env {
     # This is in shellenv.sh now
     _python_setup
 
-    add_to_path "$HOME/.local/bin" "$HOME/.lib/bin" "$HOME/bin" --before
+    add_to_path "$HOME/.lib/bin" "$HOME/.local/bin" "$HOME/bin" --before
     add_to_path "/usr/local/sbin" "/usr/local/bin" "/usr/bin" --after
     _ruby_setup
 
@@ -22,6 +22,10 @@ function _setup_env {
 
     # This makes systemd aware of change to $PATH
     run_if_exists systemctl --user import-environment PATH DISPLAY XAUTHORITY HOME
+
+    # To ensure that things in ~/.lib/bin take precedence
+    add_to_path "$HOME/.lib/bin" --before
+
     export ENVIRONMENT_SETUP_DONE="$(date)"
 }
 

dotfiles/xmonad/stack.yaml

@@ -4,7 +4,7 @@ packages:
 - '.'
 - location:
     git: git@github.com:IvanMalison/xmonad.git
-    commit: 10b843ad21614994b7e12fafaf300f4267aa9e40
+    commit: 2e6312776bd277c775c32e35f9c763d3858e32a4
   extra-dep: true
 - location:
     git: git@github.com:IvanMalison/xmonad-contrib.git

dotfiles/xmonad/xmonad.hs

@@ -433,16 +433,13 @@ chromeTabAction doSplit action selected =
 
 -- This needs access to X in order to unminimize, which means that it can't be
 -- done with the existing window bringer interface
-myWindowAct c@WindowBringerConfig { menuCommand = cmd
-                                  , menuArgs = args
-                                  } action =
-  do
-    visible <- visibleWindows
-    ws <- windowMap' c { windowFilter = not . flip elem visible }
+myWindowAct c@WindowBringerConfig {menuCommand = cmd, menuArgs = args} action = do
+  visible <- visibleWindows
+  ws <- windowMap' c {windowFilter = not . flip elem visible}
     -- chromeTabs <- liftIO getChromeTabInfo
-    let options = M.union (M.map Left ws) (M.map Right M.empty)
-    selection <- DM.menuMapArgs cmd args options
-    whenJust selection action
+  let options = M.union (M.map Left ws) (M.map Right M.empty)
+  selection <- DM.menuMapArgs cmd args options
+  whenJust selection action
 
 doBringWindow window =
   maximizeWindow window >> windows (W.focusWindow window . bringWindow window)