diff --git a/bin/xmonad.hs b/bin/xmonad.hs index 055427f..738a6c1 100644 --- a/bin/xmonad.hs +++ b/bin/xmonad.hs @@ -405,6 +405,7 @@ mkKeys ts c = , ("M-a", "launch network selector", runNetMenu) , ("M-w", "launch window selector", runWinMenu) , ("M-u", "launch device selector", runDevMenu) + , ("M-b", "launch bitwarden selector", runBwMenu) , ("M-C-e", "launch editor", runEditor) , ("M-C-w", "launch browser", runBrowser) , ("M-C-t", "launch terminal", runTerm) diff --git a/lib/XMonad/Internal/Command/DMenu.hs b/lib/XMonad/Internal/Command/DMenu.hs index 476332d..e75e9a3 100644 --- a/lib/XMonad/Internal/Command/DMenu.hs +++ b/lib/XMonad/Internal/Command/DMenu.hs @@ -8,6 +8,7 @@ module XMonad.Internal.Command.DMenu , runWinMenu , runNetMenu , runDevMenu + , runBwMenu , runShowKeys ) where @@ -82,7 +83,7 @@ spawnDmenuCmd :: String -> [String] -> X () spawnDmenuCmd cmd args = do name <- getMonitorName case name of - Just n -> spawnCmd cmd $ ["-m", n] ++ args + Just n -> spawnCmd cmd $ args ++ ["-m", n] Nothing -> io $ putStrLn "fail" spawnDmenuCmd' :: [String] -> X () @@ -91,6 +92,18 @@ spawnDmenuCmd' = spawnDmenuCmd myDmenuCmd -------------------------------------------------------------------------------- -- | Exported Commands +devSecrets :: [String] +devSecrets = concatMap (\x -> ["-s", x]) + [ "/media/ndwar/Roylab:user=ndwarshuis3@gatech.edu,host=outlook.office365.com" + , "/media/ndwar/MC3M:user=ndwarshuis3@gatech.edu,host=outlook.office365.com" + ] + +runDevMenu :: X () +runDevMenu = spawnDmenuCmd "rofi-dev" $ devSecrets ++ ["--"] + +runBwMenu :: X () +runBwMenu = spawnDmenuCmd "rofi-bw" ["-c", "--"] + runShowKeys :: [((KeyMask, KeySym), NamedAction)] -> NamedAction runShowKeys x = addName "Show Keybindings" $ do name <- getMonitorName @@ -128,5 +141,3 @@ runWinMenu = spawnDmenuCmd' ["-show", "window"] runNetMenu :: X () runNetMenu = spawnDmenuCmd "networkmanager_dmenu" [] -runDevMenu :: X () -runDevMenu = spawnDmenuCmd "rofi-devices" []