Search endpoints

src/XMonad/Config/MasseR.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
 module XMonad.Config.MasseR  where
 
 
@@ -18,7 +19,6 @@ import           XMonad.Layout.BinarySpacePartition (emptyBSP)
 import           XMonad.Layout.Decoration           (Decoration,
                                                      DefaultShrinker)
 import           XMonad.Layout.DwmStyle
-import           XMonad.Layout.HintedGrid
 import           XMonad.Layout.LayoutModifier       (ModifiedLayout)
 import           XMonad.Layout.Master
 import           XMonad.Layout.NoBorders            (smartBorders)
@@ -71,15 +71,17 @@ scratchSubmaps conf = submapName . mkNamedKeymap conf $ [
     ]
 
 -- Search engines inside submaps
-searchSubmaps :: XConfig l -> NamedAction
-searchSubmaps conf =
+searchSubmaps :: ExtraConfig -> XConfig l -> NamedAction
+searchSubmaps extraConfig conf =
     let mkBrowser = promptSearchBrowser def "qutebrowser"
         _googleP = addName "Search google" $ mkBrowser google
         ddgP = addName "Search duckduckgo" $ mkBrowser (searchEngine "duckduckgo" "http://duckduckgo.com/?q=")
+        extras = [(key, addName name $ mkBrowser (searchEngine name url)) | Search{..} <- searchEndpoints extraConfig]
     in submapName . mkNamedKeymap conf $
             [ ("d", ddgP) -- Training to use ddg again
             , ("g", ddgP) -- training to use ddg again
-            ]
+            ] ++ extras
+
 
 myNav2d :: Navigation2DConfig
 myNav2d = def { defaultTiledNavigation = lineNavigation }
@@ -182,7 +184,7 @@ myKeys extraConfig conf =
     subKeys "Launchers" [ ("M-S-y", addName "Open youtube" $ spawn "mpv $(clip -o)")
                         , ("M-S-<Return>", addName "Open terminal" $ spawn $ XMonad.terminal conf)
                         , ("M-n", scratchSubmaps conf)
-                        , ("M-s", searchSubmaps conf)
+                        , ("M-s", searchSubmaps extraConfig conf)
                         , ("M-p", addName "Retrieve password" $ passPrompt def)
                         , ("M-S-e", addName "Open with app" xdgOpen)
                         , ("M-e", addName "Run app" $ runOrRaisePrompt def)] ^++^
@@ -239,13 +241,11 @@ masser extraConfig = xmonad =<< statusBar (bar extraConfig) zenburnPP toggleStru
                onWorkspace "dynamics" webLayout $
                onWorkspace "pdf" pdfLayout $
                onWorkspace "documents" documentLayout $
-               onWorkspace "mail" mailLayout $
-               onWorkspace "irc" ircLayout
+               onWorkspace "mail" mailLayout
                defLayout
       where
         -- Default layout
         defLayout = tiled ||| tabLayout ||| readLayout ||| bspLayout ||| vimLayout ||| spiral (6/7) ||| Full
-        ircLayout = GridRatio (4/3) False ||| emptyBSP
         -- Pdfs are restricted to tabs
         vimLayout = Mirror (mastered (1/100) (4/5) Accordion)
         pdfLayout =  readLayout ||| tiled ||| tabLayout

src/XMonad/Config/MasseR/ExtraConfig.hs

@@ -4,11 +4,29 @@ module XMonad.Config.MasseR.ExtraConfig where
 import GHC.Generics (Generic)
 import Data.Text (Text)
 
-data Applications = Applications { browser :: FilePath, launcher :: FilePath, prompt :: FilePath, screenshot :: FilePath, urxvt :: FilePath } deriving (Show, Generic)
+data Applications =
+  Applications { browser :: FilePath
+               , launcher :: FilePath
+               , prompt :: FilePath
+               , screenshot :: FilePath
+               , urxvt :: FilePath
+               } deriving (Show, Generic)
 
-data TopicRule = TopicRule { topicName :: Text
+data TopicRule =
+  TopicRule { topicName :: Text
             , topicHome :: Maybe Text
-                           , topicAction :: Maybe Text }
+            , topicAction :: Maybe Text
+            }
                deriving (Show, Generic)
 
-data ExtraConfig = ExtraConfig { applications :: Applications, topics :: [ TopicRule ] } deriving (Show, Generic)
+data Search = Search { name :: String
+                     , key :: String
+                     , url :: String
+                     }
+            deriving (Show, Generic)
+
+data ExtraConfig =
+  ExtraConfig { applications :: Applications
+              , topics :: [ TopicRule ]
+              , searchEndpoints :: [Search] }
+                 deriving (Show, Generic)