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

This commit is contained in:
Ivan Malison 2017-08-28 23:12:59 -07:00
commit 25527f7098
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
4 changed files with 4 additions and 7 deletions

View File

@ -4,7 +4,7 @@ packages:
- '.' - '.'
- location: - location:
git: git@github.com:IvanMalison/taffybar.git git: git@github.com:IvanMalison/taffybar.git
commit: 3a5024368b4783084302b61cb6eb0ba27e305693 commit: e779acfe8056e6dde10638e2f7e4ec77f92b9448
extra-dep: true extra-dep: true
- location: - location:
git: git@github.com:willdonnelly/dyre.git git: git@github.com:willdonnelly/dyre.git

View File

@ -100,7 +100,7 @@ movableWidget builder =
return moveWidget return moveWidget
myFormatEntry wsNames ((ws, wtitle, wclass), _) = myFormatEntry wsNames ((ws, wtitle, wclass), _) =
printf "%s: %s - %s" wsName wtitle wclass printf "%s: %s - %s" wsName (head $ splitOn "\NUL" wclass) wtitle
where where
wsName = M.findWithDefault ("WS#" ++ show wsN) ws wsNames wsName = M.findWithDefault ("WS#" ++ show wsN) ws wsNames
WSIdx wsN = ws WSIdx wsN = ws

View File

@ -4178,7 +4178,6 @@ I had to disable this mode because something that it does messes with coding set
** recentf ** recentf
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package recentf (use-package recentf
:defer 1
:config :config
(progn (progn
(setq recentf-max-saved-items 1000 (setq recentf-max-saved-items 1000
@ -4939,7 +4938,3 @@ load-theme hook (See the heading below).
(when (file-exists-p custom-after-file) (load custom-after-file)) (when (file-exists-p custom-after-file) (load custom-after-file))
(when (file-exists-p machine-custom) (load machine-custom)) (when (file-exists-p machine-custom) (load machine-custom))
#+END_SRC #+END_SRC
* Finish Benchmarking
#+BEGIN_SRC emacs-lisp
(when imalison:do-benchmark (benchmark-init/deactivate))
#+END_SRC

View File

@ -72,6 +72,8 @@
(straight-transaction (straight-transaction
(concat (file-name-directory load-file-name) "README.org")))) (concat (file-name-directory load-file-name) "README.org"))))
(when imalison:do-benchmark (benchmark-init/deactivate))
;; Local Variables: ;; Local Variables:
;; flycheck-disabled-checkers: (emacs-lisp-checkdoc) ;; flycheck-disabled-checkers: (emacs-lisp-checkdoc)
;; End: ;; End: