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

This commit is contained in:
Ivan Malison 2016-11-04 08:55:04 -07:00
commit a1ba0097cb
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
4 changed files with 15 additions and 10 deletions

View File

@ -18,6 +18,7 @@
imalison:avy imalison:avy
imalison:multi-line imalison:multi-line
indent-for-tab-command indent-for-tab-command
indent-region
insert-register insert-register
isearch-forward-regexp isearch-forward-regexp
isearch-other-control-char isearch-other-control-char

View File

@ -4434,13 +4434,17 @@ Set the character used to represent spaces to ·, and the character used for tab
This automatically applies ansi-color interpretation of terminal escape This automatically applies ansi-color interpretation of terminal escape
sequences to compilation buffers. sequences to compilation buffers.
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(defun colorize-compilation-buffer () (defun imalison:colorize-compilation-buffer ()
(let ((was-read-only read-only-mode)) (let ((was-read-only buffer-read-only))
(when was-read-only (read-only-mode -1)) (unwind-protect
(ansi-color-apply-on-region (point-min) (point-max)) (progn
(when was-read-only (read-only-mode +1)))) (when was-read-only
(read-only-mode -1))
(ansi-color-apply-on-region (point-min) (point-max)))
(when was-read-only
(read-only-mode +1)))))
(add-hook 'compilation-filter-hook 'colorize-compilation-buffer) (add-hook 'compilation-filter-hook 'imalison:colorize-compilation-buffer)
#+END_SRC #+END_SRC
** Automatic Theme Changer ** Automatic Theme Changer
Disabled for now Disabled for now

View File

@ -159,8 +159,6 @@ getWorkspaceNameFromTag namesMap tag =
Nothing -> tag Nothing -> tag
Just label -> printf "%s: %s " tag label Just label -> printf "%s: %s " tag label
shiftThenView i = W.greedyView i . W.shift i
-- Toggleable fade -- Toggleable fade
newtype ToggleFade = ToggleFade (M.Map Window Bool) newtype ToggleFade = ToggleFade (M.Map Window Bool)
@ -191,6 +189,8 @@ toggleFadingForActiveWindow = withWindowSet $ \windowSet -> do
greedyFocusWindow w ws = W.focusWindow w $ W.greedyView greedyFocusWindow w ws = W.focusWindow w $ W.greedyView
(fromMaybe (W.currentTag ws) $ W.findTag w ws) ws (fromMaybe (W.currentTag ws) $ W.findTag w ws) ws
shiftThenView i = W.greedyView i . W.shift i
shiftToEmptyAndView = doTo Next EmptyWS DWO.getSortByOrder (windows . shiftThenView) shiftToEmptyAndView = doTo Next EmptyWS DWO.getSortByOrder (windows . shiftThenView)
myRaiseNextMaybe = raiseNextMaybeCustomFocus greedyFocusWindow myRaiseNextMaybe = raiseNextMaybeCustomFocus greedyFocusWindow
@ -252,7 +252,7 @@ addKeys conf@XConfig {modMask = modm} =
, (modalt, xK_e, spawn "emacsclient -c", emacsSelector) , (modalt, xK_e, spawn "emacsclient -c", emacsSelector)
, (modalt, xK_c, spawn "google-chrome-stable", chromeSelector) , (modalt, xK_c, spawn "google-chrome-stable", chromeSelector)
, (modalt, xK_h, spawn "google-chrome-stable --profile-directory=Default --app-id=knipolnnllmklapflnccelgolnpehhpl", hangoutsSelector) , (modalt, xK_h, spawn "google-chrome-stable --profile-directory=Default --app-id=knipolnnllmklapflnccelgolnpehhpl", hangoutsSelector)
, (modalt, xK_t, spawn "transmission", transmissionSelector) , (modalt, xK_t, spawn "transmission-gtk", transmissionSelector)
] ++ ] ++
-- Replace original moving stuff around + greedy view bindings -- Replace original moving stuff around + greedy view bindings
[((additionalMask .|. modm, key), windows $ function workspace) [((additionalMask .|. modm, key), windows $ function workspace)

View File

@ -29,7 +29,7 @@ PACKAGES = [
"ttf-mac-fonts", "otf-hermit", "ttf-font-awesome", "ttf-monaco", "tcpdump", "ttf-mac-fonts", "otf-hermit", "ttf-font-awesome", "ttf-monaco", "tcpdump",
"ngrep", "wireshark-gtk", "teamviewer", "mopidy-podcast", "tigervnc", "ngrep", "wireshark-gtk", "teamviewer", "mopidy-podcast", "tigervnc",
"kdegraphics-okular", "pandoc", "kdeconnect-git", "mlocate", "kdegraphics-okular", "pandoc", "kdeconnect-git", "mlocate",
"ncurses5-compat-libs", "ncurses5-compat-libs", "lsdesktopf",
] ]