Compare commits

..

No commits in common. "a69b41e652b8a322b7be52dc07c223d2738ac9a0" and "6e2a821531ef47757e1217c35871f9b0c2da765d" have entirely different histories.

View File

@ -12,6 +12,7 @@ import qualified Data.List as List
import XMonad
import XMonad.Actions.CycleWS (swapNextScreen)
import XMonad.Actions.Search
import XMonad.CustomPrompt
import XMonad.Hooks.EwmhDesktops (ewmh, ewmhDesktopsStartup)
import XMonad.Hooks.SetWMName (setWMName)
import XMonad.Hooks.UrgencyHook (args, dzenUrgencyHook,
@ -81,10 +82,14 @@ scratchSubmaps conf = submapName . mkNamedKeymap conf $ [
searchSubmaps :: ExtraConfig -> XConfig l -> NamedAction
searchSubmaps extraConfig conf =
let mkBrowser = promptSearchBrowser def (extraConfig ^. field @"applications" . field @"browser")
googleP = addName "Search google" $ mkBrowser google
_googleP = addName "Search google" $ mkBrowser google
_ddgP = addName "Search duckduckgo" $ mkBrowser (searchEngine "duckduckgo" "http://duckduckgo.com/?q=")
searx = addName "Search searx" $ mkBrowser (searchEngine "searx" "https://searx.me/?q=")
extras = [(key, addName name $ mkBrowser (searchEngine name url)) | Search{..} <- searchEndpoints extraConfig]
in submapName . mkNamedKeymap conf $
("g", googleP) : extras
[ ("d", searx) -- Training to use ddg again
, ("g", searx) -- training to use ddg again
] ++ extras
myNav2d :: Navigation2DConfig
@ -238,11 +243,7 @@ masser extraConfig = xmonad =<< statusBar (bar extraConfig) zenburnPP toggleStru
, normalBorderColor = "#262626"
, focusedBorderColor = "#7F9F7F"
, manageHook = myManageHook
-- The focus follows mouse is a bad idea for me because
-- it misbehaves with accordion. If I accidentally hover
-- my mouse at the lower edge of the accordion, it will
-- just cycle through to the last accordion
, focusFollowsMouse = False
, focusFollowsMouse = True
, logHook = updatePointer (0.25, 0.25) (0.25, 0.25)
}
myLayout = toggleLayouts zoom workspaceLayouts