summaryrefslogtreecommitdiff
path: root/accounts
diff options
context:
space:
mode:
Diffstat (limited to 'accounts')
-rw-r--r--accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs2
-rw-r--r--accounts/gkleen@sif/xmonad/xmonad.hs10
2 files changed, 6 insertions, 6 deletions
diff --git a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs b/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs
index 729941aa..998c533e 100644
--- a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs
+++ b/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs
@@ -137,7 +137,7 @@ connParser = do
137sshPrompt :: [Override] -> XPConfig -> X () 137sshPrompt :: [Override] -> XPConfig -> X ()
138sshPrompt o c = do 138sshPrompt o c = do
139 sc <- io sshComplList 139 sc <- io sshComplList
140 mkXPrompt Ssh c (mkComplFunFromList sc) $ ssh o 140 mkXPrompt Ssh c (mkComplFunFromList c sc) $ ssh o
141 141
142ssh :: [Override] -> String -> X () 142ssh :: [Override] -> String -> X ()
143ssh overrides str = do 143ssh overrides str = do
diff --git a/accounts/gkleen@sif/xmonad/xmonad.hs b/accounts/gkleen@sif/xmonad/xmonad.hs
index 7a71ca56..8f66bf39 100644
--- a/accounts/gkleen@sif/xmonad/xmonad.hs
+++ b/accounts/gkleen@sif/xmonad/xmonad.hs
@@ -235,7 +235,7 @@ hostFromName h
235 , hWsp = hWsp 235 , hWsp = hWsp
236 , hCoWsp = hCoWsp 236 , hCoWsp = hCoWsp
237 , hKeysMod = \conf -> Map.union $ (Map.fromList $ join $ map (spawnBindings conf) [ (xK_e, ["emacsclient -c"]) 237 , hKeysMod = \conf -> Map.union $ (Map.fromList $ join $ map (spawnBindings conf) [ (xK_e, ["emacsclient -c"])
238 , (xK_d, [fromString browser, "google-chrome", "notmuch-links"]) 238 , (xK_d, [fromString browser, "google-chrome" {- , "notmuch-links" -}])
239 , (xK_c, [ inputPrompt xPConfigMonospace "dc" ?+ dc ]) 239 , (xK_c, [ inputPrompt xPConfigMonospace "dc" ?+ dc ])
240 , (xK_g, ["pidgin"]) 240 , (xK_g, ["pidgin"])
241 , (xK_s, ["skype"]) 241 , (xK_s, ["skype"])
@@ -249,10 +249,10 @@ hostFromName h
249 , "tmux new-window -dt media mpv $(xclip -o -selection clipboard)" 249 , "tmux new-window -dt media mpv $(xclip -o -selection clipboard)"
250 , "alacritty --class media -e tmuxp load /var/media" 250 , "alacritty --class media -e tmuxp load /var/media"
251 ]) 251 ])
252 , (xK_m, [ "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e '(notmuch)'" 252 {- , (xK_m, [ "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e '(notmuch)'"
253 , "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e '(notmuch-mua-new-mail)'" 253 , "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e '(notmuch-mua-new-mail)'"
254 , "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e \"(browse-url-mail \"$(xclip -o)\")\"" 254 , "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e \"(browse-url-mail \"$(xclip -o)\")\""
255 ]) 255 ]) -}
256 , (xK_Return, ["keynav start,windowzoom", "keynav start"]) 256 , (xK_Return, ["keynav start,windowzoom", "keynav start"])
257 , (xK_t, [inputPrompt xPConfigMonospace "fuzzytime timer" ?+ fuzzytime, fuzzytime "unset", work_fuzzytime]) 257 , (xK_t, [inputPrompt xPConfigMonospace "fuzzytime timer" ?+ fuzzytime, fuzzytime "unset", work_fuzzytime])
258 , (xK_a, [inputPrompt xPConfigMonospace "adjmix" ?+ adjmix]) 258 , (xK_a, [inputPrompt xPConfigMonospace "adjmix" ?+ adjmix])
@@ -411,7 +411,7 @@ hostFromName h
411 (first : rest) = filter (not . null) $ lines result 411 (first : rest) = filter (not . null) $ lines result
412 notification = Notify.summary first <> Notify.body (unlines rest) <> Notify.timeout Infinite <> Notify.urgency Normal <> Notify.appName "dc" 412 notification = Notify.summary first <> Notify.body (unlines rest) <> Notify.timeout Infinite <> Notify.urgency Normal <> Notify.appName "dc"
413 void $ Notify.display notification 413 void $ Notify.display notification
414 synergyCompl = mkComplFunFromList' ["mathw86"] 414 synergyCompl = mkComplFunFromList' xPConfigMonospace ["mathw86"]
415 synergyStart host = safeSpawn "systemctl" ["--user", "start", "synergy-rtunnel@" ++ host ++ ".service"] 415 synergyStart host = safeSpawn "systemctl" ["--user", "start", "synergy-rtunnel@" ++ host ++ ".service"]
416 synergyStop host = safeSpawn "systemctl" ["--user", "stop", "synergy-rtunnel@" ++ host ++ ".service"] 416 synergyStop host = safeSpawn "systemctl" ["--user", "stop", "synergy-rtunnel@" ++ host ++ ".service"]
417 417
@@ -603,7 +603,7 @@ main = do
603 userCodeDef () $ whenJust (Map.lookup (mClean, s) ks) id 603 userCodeDef () $ whenJust (Map.lookup (mClean, s) ks) id
604 | otherwise = return () 604 | otherwise = return ()
605 handle _ = return () 605 handle _ = return ()
606 handle shutdown $ launch myConfig 606 handle shutdown $ launch myConfig =<< getDirectories
607 607
608secs :: Int -> Int 608secs :: Int -> Int
609secs = (* 1000000) 609secs = (* 1000000)