No need for 18.09 anymore

.travis.yml

@@ -9,8 +9,6 @@ before_script:
 
 matrix:
   include:
-  - env:
-    - NIXPKGS=https://github.com/NixOS/nixpkgs-channels/archive/nixos-18.09.tar.gz
   - env:
     - NIXPKGS=https://github.com/NixOS/nixpkgs-channels/archive/nixos-19.03.tar.gz
   - env:

default.nix

@@ -1,3 +1,13 @@
-{ haskellPackages }:
+{ lib, haskellPackages }:
 
-haskellPackages.callCabal2nix "xmonad-masser" ./. {}
+let
+  filtered = src: lib.sourceByRegex src [
+    "^src.*"
+    "Setup.hs"
+    ".*cabal"
+    "LICENSE"
+    ];
+
+in
+
+haskellPackages.callCabal2nix "xmonad-masser" (filtered ./.) {}

src/XMonad/Config/MasseR.hs

@@ -1,14 +1,17 @@
+{-# LANGUAGE DataKinds         #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE TypeApplications  #-}
 module XMonad.Config.MasseR  where
 
 
-import           XMonad.Password
+import           Control.Lens                       ((^.))
-import           XMonad.CustomPrompt
+import           Data.Generics.Product              (field)
-import           XMonad.TopicSpace
 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,
@@ -18,7 +21,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)
@@ -30,11 +32,13 @@ import           XMonad.Layout.Tabbed               (TabbedDecoration,
                                                      Theme (..), shrinkText,
                                                      tabbed)
 import           XMonad.Layout.ToggleLayouts        (ToggleLayout (..))
+import           XMonad.Password
 import           XMonad.Prompt.RunOrRaise           (runOrRaisePrompt)
 import qualified XMonad.StackSet                    as W
+import           XMonad.TopicSpace
 import           XMonad.Util.EZConfig
 
-import           XMonad.XMobar                             (zenburnPP)
+import           XMonad.XMobar                      (zenburnPP)
 
 import           Data.Monoid                        (Endo, (<>))
 
@@ -55,9 +59,9 @@ import           XMonad.Hooks.DynamicLog            (statusBar)
 
 import qualified Data.Set                           as S
 
-spotify :: XConfig l -> NamedAction
+spotify :: ExtraConfig -> XConfig l -> NamedAction
-spotify conf = submapName . mkNamedKeymap conf $
+spotify extraConf conf = submapName . mkNamedKeymap conf $
-   [ ("M-p", addName "Play" $ spawn "sp play") ]
+   [ ("M-p", addName "Play" $ spawn (musicToggle . applications $ extraConf)) ]
 
 scratchpads :: [NamedScratchpad]
 scratchpads = [
@@ -71,15 +75,17 @@ scratchSubmaps conf = submapName . mkNamedKeymap conf $ [
     ]
 
 -- Search engines inside submaps
-searchSubmaps :: XConfig l -> NamedAction
+searchSubmaps :: ExtraConfig -> XConfig l -> NamedAction
-searchSubmaps conf =
+searchSubmaps extraConfig conf =
-    let mkBrowser = promptSearchBrowser def "qutebrowser"
+    let mkBrowser = promptSearchBrowser def (extraConfig ^. field @"applications" . field @"browser")
         _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 }
@@ -172,9 +178,8 @@ myKeys extraConfig conf =
                      , ("<XF86AudioLowerVolume>", addName "Decrease volume" $ spawn "amixer set Master 2%-")
                      , ("M-<plus>", addName "Increase volume" $ spawn "amixer set Master 2+")
                      , ("M-<minus>", addName "Decrease volume" $ spawn "amixer set Master 2-")
-                     -- , ("<XF86AudioPlay>", addName "Play/pause spotify" $ spawn "/home/masse/.local/bin/sp play")
                      , ("<XF86AudioPlay>", addName "Play/pause mopidy" $ spawn "mpc toggle")
-                     , ("M-m", spotify conf)
+                     , ("M-m", spotify extraConfig conf)
                      , ("M-S-<Space>", addName "Swap screens" swapNextScreen)
                      , ("M-<Backspace>", addName "Kill window" kill)
                      -- scrot requires `unGrab`
@@ -182,7 +187,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 +244,11 @@ masser extraConfig = xmonad =<< statusBar (bar extraConfig) zenburnPP toggleStru
                onWorkspace "dynamics" webLayout $
                onWorkspace "pdf" pdfLayout $
                onWorkspace "documents" documentLayout $
-               onWorkspace "mail" mailLayout $
+               onWorkspace "mail" mailLayout
-               onWorkspace "irc" ircLayout
                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,30 @@ 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
+               , musicToggle :: FilePath
+               } deriving (Show, Generic)
 
-data TopicRule = TopicRule { topicName :: Text
+data TopicRule =
-                           , topicHome :: Maybe Text
+  TopicRule { topicName :: Text
-                           , topicAction :: Maybe Text }
+            , topicHome :: Maybe Text
-                           deriving (Show, Generic)
+            , 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)

src/XMonad/TopicSpace.hs

@@ -4,7 +4,6 @@ module XMonad.TopicSpace (topicKeys', addTopic, TopicAction(..)) where
 import XMonad.Actions.TopicSpace
 import XMonad
 import qualified Data.Map as M
-import XMonad.Actions.GridSelect
 import XMonad.Actions.DynamicWorkspaces
 import XMonad.TopicUtils
 import XMonad.Util.EZConfig (mkNamedKeymap)
@@ -42,7 +41,6 @@ myTopicConfig extraConfig =
 topicKeys' :: ExtraConfig -> XConfig l -> [(String, NamedAction)]
 topicKeys' extraConfig conf = [ ("M-y", addName "Change topic" $ visualSelect (myTopicConfig extraConfig))
                               , ("M-S-g", addName "Move window to topic" $ gridselectMove def)
-                              , ("M-u", addName "Select window" $ gotoSelected' def{gs_colorizer = fromClassName})
                               , ("M-<Return>", addName "Open project action" $ currentTopicAction' (myTopicConfig extraConfig))
                               , ("M-w", modificationSubmaps' conf)]
 

src/XMonad/TopicUtils.hs

@@ -26,9 +26,11 @@ safeRunInTerm dir Nothing = safeSpawn "urxvt" ["-cd", dir]
 safeRunInTerm dir (Just command) = safeSpawn "urxvt" ["-cd", dir, "-e", command]
 
 inactiveTags :: X [WorkspaceId]
-inactiveTags = map W.tag . inactive' <$> gets windowset
+inactiveTags = inactive' <$> gets windowset
     where
-        inactive' s = W.hidden s ++ map W.workspace (filter (\w -> (W.tag . W.workspace . W.current) s /= (W.tag . W.workspace) w) (W.visible s))
+        inactive' s =
+          let current = W.currentTag s
+          in filter (current /=) . map W.tag $ W.hidden s <> map W.workspace (W.visible s)
 
 gridselectMove :: GSConfig WorkspaceId -> X ()
 gridselectMove conf = do
@@ -48,7 +50,10 @@ gsConfig = def{gs_navigate = navNSearch, gs_colorizer = fromClassName}
 -- - Takes a topicspace viewfunc
 gridselectWorkspace :: GSConfig WorkspaceId -> (WorkspaceId -> X ()) -> X ()
 gridselectWorkspace conf viewFunc = withWindowSet $ \ws -> do
-  let wss = map W.tag . W.hidden $ ws
+  let wss = filter (/= current) . map W.tag $ invisible <> visible
+      visible = fmap W.workspace (W.visible ws)
+      invisible = W.hidden ws
+      current = W.currentTag ws
   gridselect conf (zip wss wss) >>= flip whenJust viewFunc
 
 gotoSelected' :: GSConfig Window -> X ()

xmonad-masser.cabal

@@ -34,5 +34,7 @@ library
                      , unix
                      , containers
                      , text
+                     , lens
+                     , generic-lens
   hs-source-dirs:      src
   default-language:    Haskell2010