From 5da460ca32a7b68a2ef44436843bcd9aa5c2f8f3 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 24 Aug 2017 12:06:03 -0700 Subject: [PATCH 1/5] [Emacs] Defer loading of proced --- dotfiles/emacs.d/README.org | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index 32e799ee..a6a23d7c 100644 --- a/dotfiles/emacs.d/README.org +++ b/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 @@ -1265,9 +1260,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 From 3d287bbc15e9d2931253cbbb74ae2f45782d5f52 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 24 Aug 2017 12:07:08 -0700 Subject: [PATCH 2/5] [Emacs] Reindent winner use-package --- dotfiles/emacs.d/README.org | 20 ++++++++++---------- dotfiles/lib/shellpath.sh | 6 +++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index a6a23d7c..3c7abdba 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -1448,16 +1448,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. diff --git a/dotfiles/lib/shellpath.sh b/dotfiles/lib/shellpath.sh index d12a1834..f57e1e44 100644 --- a/dotfiles/lib/shellpath.sh +++ b/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)" } From 725b5f5c30ca204ebae67529221d6d0499d1f3d5 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 24 Aug 2017 12:07:27 -0700 Subject: [PATCH 3/5] [Emacs] Defer loading of overseer --- dotfiles/emacs.d/README.org | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index 3c7abdba..4b103be6 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -2378,7 +2378,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 From ccbff942e8abbf843137d905001dfe545c80aef3 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 24 Aug 2017 12:07:47 -0700 Subject: [PATCH 4/5] [XMonad] Reindent windowAct --- dotfiles/xmonad/xmonad.hs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs index 3884db4e..12a1ae3f 100644 --- a/dotfiles/xmonad/xmonad.hs +++ b/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) From 0f33923eea492d5c4b2072bc330836ef7b923d0f Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 24 Aug 2017 12:08:01 -0700 Subject: [PATCH 5/5] [XMonad] Bump core pointer --- dotfiles/xmonad/stack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/xmonad/stack.yaml b/dotfiles/xmonad/stack.yaml index 7a9d274d..d1e8a34f 100644 --- a/dotfiles/xmonad/stack.yaml +++ b/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