diff options
Diffstat (limited to '.xmonad/xmonad.hs')
-rw-r--r-- | .xmonad/xmonad.hs | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index cca4df1..f0e443f 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs | |||
@@ -40,7 +40,8 @@ import XMonad.Actions.Warp | |||
40 | 40 | ||
41 | import XMonad.Layout.IM | 41 | import XMonad.Layout.IM |
42 | 42 | ||
43 | import XMonad.Prompt.Shell | 43 | import XMonad.Prompt.MyShell |
44 | import XMonad.Prompt.MySsh | ||
44 | 45 | ||
45 | wsp :: Int -> WorkspaceId | 46 | wsp :: Int -> WorkspaceId |
46 | wsp i = case Map.lookup i workspaceNames of | 47 | wsp i = case Map.lookup i workspaceNames of |
@@ -135,6 +136,22 @@ xPConfig = defaultXPConfig { bgColor = "black" | |||
135 | , borderColor = "white" | 136 | , borderColor = "white" |
136 | } | 137 | } |
137 | 138 | ||
139 | sshOverrides = map (\h -> mkOverride { oHost = h, oCommand = moshCmd . inTmux } ) | ||
140 | [ | ||
141 | "odin", "odin.asgard.yggdrasil" | ||
142 | , "surtr", "yggdrasil.li", "surtr.yggdrasil.li", "praseodym.org", "surtr.praseodym.org", "surtr.141.li", "141.li" | ||
143 | , "vindler", "vindler.alfheim.yggdrasil" | ||
144 | , "ullr" | ||
145 | ] | ||
146 | ++ | ||
147 | map (\h -> mkOverride { oHost = h, oCommand = moshCmd' "/run/current-system/sw/bin/mosh-server" . withEnv [("TERM", "xterm")] . inTmux} ) | ||
148 | [ "bragi", "bragi.asgard.yggdrasil" | ||
149 | ] | ||
150 | ++ | ||
151 | map (\h -> mkOverride { oHost = h, oCommand = sshCmd . withEnv [("TERM", "xterm")] . inTmux } ) | ||
152 | [ "galois", "galois.praseodym.org" | ||
153 | ] | ||
154 | |||
138 | myKeys' conf = Map.fromList $ | 155 | myKeys' conf = Map.fromList $ |
139 | -- launch a terminal | 156 | -- launch a terminal |
140 | [ ((modm, xK_Return), spawn $ (XMonad.terminal conf) ++ " -e tmux") | 157 | [ ((modm, xK_Return), spawn $ (XMonad.terminal conf) ++ " -e tmux") |
@@ -142,8 +159,9 @@ myKeys' conf = Map.fromList $ | |||
142 | 159 | ||
143 | -- launch dmenu | 160 | -- launch dmenu |
144 | --, ((modm, xK_d ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") | 161 | --, ((modm, xK_d ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") |
145 | , ((modm, xK_d ), shellPrompt xPConfig) | 162 | , ((modm, xK_d ), shellPrompt "Run: " xPConfig) |
146 | , ((modm .|. shiftMask, xK_d ), prompt ("urxvtc" ++ " -e") xPConfig) | 163 | , ((modm .|. shiftMask, xK_d ), prompt "Run in Terminal: " ("urxvtc" ++ " -e") xPConfig) |
164 | , ((modm, xK_at ), sshPrompt sshOverrides xPConfig) | ||
147 | 165 | ||
148 | -- close focused window | 166 | -- close focused window |
149 | , ((modm .|. shiftMask, xK_q ), kill) | 167 | , ((modm .|. shiftMask, xK_q ), kill) |