diff options
Diffstat (limited to 'accounts/gkleen@sif/xmonad')
-rw-r--r-- | accounts/gkleen@sif/xmonad/xmonad.hs | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/accounts/gkleen@sif/xmonad/xmonad.hs b/accounts/gkleen@sif/xmonad/xmonad.hs index 579456ad..d21debdf 100644 --- a/accounts/gkleen@sif/xmonad/xmonad.hs +++ b/accounts/gkleen@sif/xmonad/xmonad.hs | |||
@@ -172,8 +172,6 @@ hostFromName h | |||
172 | | h `elem` ["hel", "sif"] = defaultHost { hName = h | 172 | | h `elem` ["hel", "sif"] = defaultHost { hName = h |
173 | , hManageHook = namedScratchpadManageHook scratchpads <+> composeOne (catMaybes | 173 | , hManageHook = namedScratchpadManageHook scratchpads <+> composeOne (catMaybes |
174 | [ assign "mpv" $ className =? "mpv" | 174 | [ assign "mpv" $ className =? "mpv" |
175 | , assign "mpv" $ (className =? "URxvt" <&&> title =? "irssi") | ||
176 | , assign "mpv" $ (className =? "URxvt" <&&> resource =? "presentation") | ||
177 | , assign "mpv" $ stringProperty "WM_WINDOW_ROLE" =? "presentation" | 175 | , assign "mpv" $ stringProperty "WM_WINDOW_ROLE" =? "presentation" |
178 | , assign "read" $ stringProperty "WM_WINDOW_ROLE" =? "presenter" | 176 | , assign "read" $ stringProperty "WM_WINDOW_ROLE" =? "presenter" |
179 | , assign "mpv" $ className =? "factorio" | 177 | , assign "mpv" $ className =? "factorio" |
@@ -182,19 +180,15 @@ hostFromName h | |||
182 | , assign "work" $ (appName =? "Devtools" <&&> className =? "Firefox") | 180 | , assign "work" $ (appName =? "Devtools" <&&> className =? "Firefox") |
183 | , assign "work" $ className =? "Postman" | 181 | , assign "work" $ className =? "Postman" |
184 | , assign "web" $ className =? "Firefox" | 182 | , assign "web" $ className =? "Firefox" |
185 | , assign "comm" $ (className =? "URxvt" <&&> resource =? "comm") | ||
186 | , assign "comm" $ (className =? "Emacs" <&&> title =? "Mail") | 183 | , assign "comm" $ (className =? "Emacs" <&&> title =? "Mail") |
187 | , assign "comm" $ className =? "Zulip" | 184 | , assign "comm" $ className =? "Zulip" |
188 | , assign "comm" $ className =? "Discord" | 185 | , assign "comm" $ className =? "Discord" |
189 | , assign "media" $ (className =? "URxvt" <&&> resource =? "media") | 186 | , assign "media" $ (className =? "Alacritty" <&&> resource =? "media") |
190 | , assign "media" $ (className =? "URxvt" <&&> title =? "streamlink") | ||
191 | , assign "media" $ (className =? "URxvt" <&&> title =? "mpv") | ||
192 | , assign "monitor" $ (className =? "URxvt" <&&> fmap ("monitor" `isInfixOf`) title) | ||
193 | , assign "monitor" $ className =? "Grafana" | 187 | , assign "monitor" $ className =? "Grafana" |
194 | , Just $ (className =? "URxvt" <&&> resource =? "htop") -?> centerFloat | 188 | , Just $ (className =? "Alacritty" <&&> resource =? "htop") -?> centerFloat |
195 | , Just $ (className =? "Scp-dbus-service.py") -?> centerFloat | 189 | , Just $ (className =? "Scp-dbus-service.py") -?> centerFloat |
196 | , Just $ (className =? "URxvt" <&&> resource =? "log") -?> centerFloat | 190 | , Just $ (className =? "Alacritty" <&&> resource =? "log") -?> centerFloat |
197 | , assign "work" $ className =? "URxvt" | 191 | , assign "work" $ className =? "Alacritty" |
198 | , assign' ["work", "uni"] $ (className =? "Emacs" <&&> appName /=? "Edit_with_Emacs_FRAME") | 192 | , assign' ["work", "uni"] $ (className =? "Emacs" <&&> appName /=? "Edit_with_Emacs_FRAME") |
199 | , assign' ["work", "uni"] $ className =? "jetbrains-idea-ce" | 193 | , assign' ["work", "uni"] $ className =? "jetbrains-idea-ce" |
200 | , assign "read" $ className =? "llpp" | 194 | , assign "read" $ className =? "llpp" |
@@ -227,7 +221,6 @@ hostFromName h | |||
227 | , hCoWsp = hCoWsp | 221 | , hCoWsp = hCoWsp |
228 | , hKeysMod = \conf -> Map.union $ (Map.fromList $ join $ map (spawnBindings conf) [ (xK_e, ["emacsclient -c"]) | 222 | , hKeysMod = \conf -> Map.union $ (Map.fromList $ join $ map (spawnBindings conf) [ (xK_e, ["emacsclient -c"]) |
229 | , (xK_d, [fromString browser, fromString $ browser ++ " $(xclip -o)", fromString $ "notmuch-links"]) | 223 | , (xK_d, [fromString browser, fromString $ browser ++ " $(xclip -o)", fromString $ "notmuch-links"]) |
230 | , (xK_f, ["urxvtc -name comm -title Feeds -e mosh odin -- tmux new-session -ADs comm"]) | ||
231 | , (xK_c, [ inputPrompt xPConfig "dc" ?+ dc ]) | 224 | , (xK_c, [ inputPrompt xPConfig "dc" ?+ dc ]) |
232 | , (xK_g, ["pidgin"]) | 225 | , (xK_g, ["pidgin"]) |
233 | , (xK_s, ["skype"]) | 226 | , (xK_s, ["skype"]) |
@@ -235,7 +228,7 @@ hostFromName h | |||
235 | , (xK_w, ["sudo rewacom"]) | 228 | , (xK_w, ["sudo rewacom"]) |
236 | , (xK_y, [ "tmux new-window -dt media /var/media/link.hs $(xclip -o)" | 229 | , (xK_y, [ "tmux new-window -dt media /var/media/link.hs $(xclip -o)" |
237 | , "tmux new-window -dt media /var/media/download.hs $(xclip -o)" | 230 | , "tmux new-window -dt media /var/media/download.hs $(xclip -o)" |
238 | , "urxvtc -name media -e tmuxp load /var/media" | 231 | , "alacritty --class media -e tmuxp load /var/media" |
239 | ]) | 232 | ]) |
240 | , (xK_l, [ "tmux new-window -dt media mpv $(xclip -o)" | 233 | , (xK_l, [ "tmux new-window -dt media mpv $(xclip -o)" |
241 | , "tmux new-window -dt media streamlink --retry-open 10 $(xclip -o)" | 234 | , "tmux new-window -dt media streamlink --retry-open 10 $(xclip -o)" |
@@ -250,8 +243,8 @@ hostFromName h | |||
250 | , (xK_s, [ inputPromptWithCompl xPConfig "start synergy" synergyCompl ?+ synergyStart | 243 | , (xK_s, [ inputPromptWithCompl xPConfig "start synergy" synergyCompl ?+ synergyStart |
251 | , inputPromptWithCompl xPConfig "stop synergy" synergyCompl ?+ synergyStop | 244 | , inputPromptWithCompl xPConfig "stop synergy" synergyCompl ?+ synergyStop |
252 | ]) | 245 | ]) |
253 | , (xK_h, [ "urxvtc -name htop -e htop" | 246 | , (xK_h, [ "alacritty --class htop -e htop" |
254 | , "urxvtc -name log -e journalctl -xef" | 247 | , "alacritty --class log -e journalctl -xef" |
255 | ]) | 248 | ]) |
256 | , (xK_x, [ "autorandr -c" | 249 | , (xK_x, [ "autorandr -c" |
257 | , "autorandr -fl def" | 250 | , "autorandr -fl def" |
@@ -312,7 +305,7 @@ hostFromName h | |||
312 | , (9, "media") | 305 | , (9, "media") |
313 | , (10, "mpv") | 306 | , (10, "mpv") |
314 | ] | 307 | ] |
315 | scratchpads = [ NS "term" "urxvtc -name scratchpad -title scratchpad -e tmux new-session -AD -s scratch" (resource =? "scratchpad") centerFloat | 308 | scratchpads = [ NS "term" "alacritty --class scratchpad --title scratchpad -e tmux new-session -AD -s scratch" (resource =? "scratchpad") centerFloat |
316 | , NS "pavucontrol" "pavucontrol" (resource =? "pavucontrol") centerFloat | 309 | , NS "pavucontrol" "pavucontrol" (resource =? "pavucontrol") centerFloat |
317 | , NS "alarms" "alarm-clock-applet" (className =? "Alarm-clock-applet" <&&> title =? "Alarms") centerFloat | 310 | , NS "alarms" "alarm-clock-applet" (className =? "Alarm-clock-applet" <&&> title =? "Alarms") centerFloat |
318 | , NS "blueman" "blueman-manager" (className =? ".blueman-manager-wrapped") centerFloat | 311 | , NS "blueman" "blueman-manager" (className =? ".blueman-manager-wrapped") centerFloat |
@@ -480,7 +473,7 @@ main = do | |||
480 | setEnv "HOST" hostname | 473 | setEnv "HOST" hostname |
481 | let myConfig = withHostUrgency . ewmh $ docks def | 474 | let myConfig = withHostUrgency . ewmh $ docks def |
482 | { manageHook = hManageHook host | 475 | { manageHook = hManageHook host |
483 | , terminal = "urxvtc" | 476 | , terminal = "alacritty" |
484 | , layoutHook = smartBorders . avoidStruts $ windowNavigation layout' | 477 | , layoutHook = smartBorders . avoidStruts $ windowNavigation layout' |
485 | , logHook = do | 478 | , logHook = do |
486 | dynamicLogString xmobarPP' >>= writeProps | 479 | dynamicLogString xmobarPP' >>= writeProps |
@@ -768,7 +761,7 @@ myKeys' conf host = Map.fromList $ | |||
768 | -- launch dmenu | 761 | -- launch dmenu |
769 | --, ((modm, xK_d ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") | 762 | --, ((modm, xK_d ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") |
770 | , ((modm, xK_d ), shellPrompt "Run: " xPConfig) | 763 | , ((modm, xK_d ), shellPrompt "Run: " xPConfig) |
771 | , ((modm .|. shiftMask, xK_d ), prompt "Run in Terminal: " ("urxvtc" ++ " -e") xPConfig) | 764 | , ((modm .|. shiftMask, xK_d ), prompt "Run in Terminal: " ("alacritty" ++ " -e") xPConfig) |
772 | , ((modm, xK_at ), sshPrompt (sshOverrides . Just $ hName host) xPConfig) | 765 | , ((modm, xK_at ), sshPrompt (sshOverrides . Just $ hName host) xPConfig) |
773 | 766 | ||
774 | -- close focused window | 767 | -- close focused window |