From 78de86f197f7a90eff3c13e17e460f02f6a64174 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 21 Nov 2016 17:42:55 -0800 Subject: [PATCH 1/6] [XMonad] Fixup whitespace --- dotfiles/xmonad/xmonad.hs | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs index 5cef67d0..b0ebaad5 100644 --- a/dotfiles/xmonad/xmonad.hs +++ b/dotfiles/xmonad/xmonad.hs @@ -107,9 +107,11 @@ instance Transformer MyToggles Window where myToggles = [LIMIT, GAPS, MAGICFOCUS] otherToggles = [NBFULL, MIRROR] -togglesMap = fmap M.fromList $ sequence $ map toggleTuple myToggles ++ map toggleTuple otherToggles +togglesMap = fmap M.fromList $ sequence $ + map toggleTuple myToggles ++ map toggleTuple otherToggles where - toggleTuple toggle = fmap (\str -> (str, Toggle toggle)) (toggleToStringWithState toggle) + toggleTuple toggle = fmap (\str -> (str, Toggle toggle)) + (toggleToStringWithState toggle) toggleStateToString s = case s of Just True -> "ON" @@ -117,8 +119,9 @@ toggleStateToString s = case s of Nothing -> "N/A" toggleToStringWithState :: (Transformer t Window, Show t) => t -> X String -toggleToStringWithState toggle = (printf "%s (%s)" (show toggle) . toggleStateToString) <$> - isToggleActive toggle +toggleToStringWithState toggle = + (printf "%s (%s)" (show toggle) . toggleStateToString) <$> + isToggleActive toggle selectToggle = togglesMap >>= DM.menuMapArgs "rofi" ["-dmenu", "-i"] >>= flip whenJust sendMessage @@ -130,8 +133,9 @@ whenB b a = do when b a return b -setToggleActive' toggle active = toggleInState toggle (Just active) >>= - flip whenB (sendMessage $ Toggle toggle) +setToggleActive' toggle active = + toggleInState toggle (Just active) >>= + flip whenB (sendMessage $ Toggle toggle) -- Ambiguous type reference without signature setToggleActive :: (Transformer t Window) => t -> Bool -> X () @@ -139,7 +143,8 @@ setToggleActive = (void .) . setToggleActive' deactivateFull = setToggleActive NBFULL False -toggleOr toggle toState action = setToggleActive' toggle toState >>= ((`when` action) . not) +toggleOr toggle toState action = setToggleActive' toggle toState >>= + ((`when` action) . not) deactivateFullOr = toggleOr NBFULL False deactivateFullAnd action = sequence_ [deactivateFull, action] @@ -209,7 +214,8 @@ myBringWindow WindowBringerConfig{ menuCommand = cmd } = windowMap' titler >>= DM.menuMapArgs cmd args >>= flip whenJust action where action window = sequence_ [ maximizeWindow window - , windows $ W.focusWindow window . bringWindow window + , windows $ W.focusWindow window . + bringWindow window ] -- Dynamic Workspace Renaming @@ -357,8 +363,10 @@ swapMinimizeStateAfter action = withFocused $ \originalWindow -> do -- Raise or spawn -myRaiseNextMaybe = (maybeUnminimizeClassAfter .) . raiseNextMaybeCustomFocus greedyFocusWindow -myBringNextMaybe = (maybeUnminimizeAfter .) . raiseNextMaybeCustomFocus bringWindow +myRaiseNextMaybe = (maybeUnminimizeClassAfter .) . + raiseNextMaybeCustomFocus greedyFocusWindow +myBringNextMaybe = (maybeUnminimizeAfter .) . + raiseNextMaybeCustomFocus bringWindow bindBringAndRaise :: KeyMask -> KeySym -> X () -> Query Bool -> [((KeyMask, KeySym), X ())] bindBringAndRaise mask sym start query = From 9ad18d95974022bac8caf5c919da315133a2ec07 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 21 Nov 2016 17:45:31 -0800 Subject: [PATCH 2/6] [Emacs] Add term-mode commentary --- dotfiles/emacs.d/README.org | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index 6e499d07..7cb48167 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -3653,6 +3653,9 @@ emr (emacs refactor) provides support for refactoring in many programming langua #+END_SRC * Utility ** term +The main thing I do here is restore a bunch of keybindings that are eliminated +in term-mode. This makes term-mode 1000% more useful +(especially having M-x and C-y available). #+BEGIN_SRC emacs-lisp (use-package term :preface From 23b52d27ae384ae47f6aec1724c1b72e1fdef40e Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 21 Nov 2016 17:45:31 -0800 Subject: [PATCH 3/6] [Emacs] Update github pages index file --- index.html | 1236 ++++++++++++++++++++++++++++------------------------ 1 file changed, 657 insertions(+), 579 deletions(-) diff --git a/index.html b/index.html index 8ac64e27..3113f9e4 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + @@ -185,8 +185,6 @@ - +