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

This commit is contained in:
Ivan Malison 2017-08-28 21:58:50 -07:00
commit 7cea300a30
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
2 changed files with 3 additions and 5 deletions

View File

@ -1161,8 +1161,8 @@ it on by default. Its probably safe to turn it on when in a programming mode.
:config :config
(progn (progn
(defun imalison:maybe-use-frames-for-org (&rest args) (defun imalison:maybe-use-frames-for-org (&rest args)
(let ((fn (if frame-mode 'org-switch-to-buffer-other-window (let ((fn (if frame-mode 'switch-to-buffer-other-frame
'switch-to-buffer-other-frame))) 'switch-to-buffer-other-window)))
(apply fn args))) (apply fn args)))
(advice-add 'org-switch-to-buffer-other-window (advice-add 'org-switch-to-buffer-other-window
:override 'imalison:maybe-use-frames-for-org) :override 'imalison:maybe-use-frames-for-org)

View File

@ -192,7 +192,6 @@ transmissionSelector = fmap (isPrefixOf "Transmission") title
hangoutsSelector = chromeSelectorBase <&&> fmap isHangoutsTitle title hangoutsSelector = chromeSelectorBase <&&> fmap isHangoutsTitle title
gmailSelector = chromeSelectorBase <&&> fmap isGmailTitle title gmailSelector = chromeSelectorBase <&&> fmap isGmailTitle title
volumeSelector = className =? "Pavucontrol" volumeSelector = className =? "Pavucontrol"
keepassSelector = className =? "keepassxc"
virtualClasses = virtualClasses =
[ (hangoutsSelector, "Hangouts") [ (hangoutsSelector, "Hangouts")
@ -208,10 +207,9 @@ gmailCommand = "start_chrome.sh --new-window https://mail.google.com/mail/u/0/#i
spotifyCommand = "spotify" spotifyCommand = "spotify"
chromeCommand = "start_chrome.sh" chromeCommand = "start_chrome.sh"
emacsCommand = "emacsclient -c" emacsCommand = "emacsclient -c"
htopCommand = "termite -e htop" htopCommand = "termite -e htop -t htop"
transmissionCommand = "transmission-gtk" transmissionCommand = "transmission-gtk"
volumeCommand = "pavucontrol" volumeCommand = "pavucontrol"
keepassCommand = "systemctl --user restart keepassx.service"
taffybarCommand = "restart_taffybar.sh" taffybarCommand = "restart_taffybar.sh"
-- Startup hook -- Startup hook