Skip to content

Commit

Permalink
More work on xmonad.
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnmcdonnell
johnmcdonnell committed Mar 6, 2012
1 parent 4980969 commit 163b440
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 30 deletions.
10 changes: 5 additions & 5 deletions xmobarrc
View file
Expand Up @@ -4,13 +4,13 @@


Config {
font = "xft:Droid Sans Mono:size=11"
font = "xft:Roboto:size=11"
, bgColor = "#000000"
, fgColor = "#ffffff"
, position = Top
, commands = [ Run Weather "KNYC" ["-t","<tempC>C Sky:<skyCondition>","-L","18","-H","25","--normal","green","--high","red","--low","cyan"] 36000
, Run Network "eth0" ["-L","0","-H","32","--normal","green","--high","red"] 10
, Run Cpu ["-L","3","-H","50","--normal","green","--high","red"] 10
, commands = [ Run Weather "KNYC" ["-t","<tempC>C Sky:<skyCondition>","-L","18","-H","25","--normal","#77ff77","--high","#ff7777","--low","#7777ff"] 36000
, Run Network "eth0" ["-L","0","-H","32","--normal","#77ff77","--high","#ff7777"] 10
, Run Cpu ["-L","3","-H","50","--normal","#77ff77","--high","#ff7777"] 10
, Run Memory ["-t","Mem: <usedratio>%"] 10
, Run Swap [] 10
, Run Com "uname" ["-s","-r"] "" 36000
Expand All @@ -21,7 +21,7 @@ Config {
]
, sepChar = "%"
, alignSep = "}{"
, template = "%StdinReader% } %cpu% %memory% %swap% %eth0% { <fc=#ee9a00>%date%</fc> | %KNYC% | %uname%"
, template = "%StdinReader% } %cpu% %memory% %swap% %eth0% { <fc=#7777cc>%date%</fc> | %KNYC% | %uname% "
}


Expand Down
67 changes: 42 additions & 25 deletions xmonad/xmonad.hs
View file
Expand Up @@ -16,7 +16,7 @@ import XMonad.Prompt.Workspace
import XMonad.Util.XSelection
import XMonad.Util.Run (runInTerm)
import XMonad.Util.WindowProperties
--import XMonad.Actions.Search (google, isohunt, wayback, wikipedia, wiktionary, intelligent, selectSearch, promptSearch)
import XMonad.Util.WorkspaceCompare (getSortByXineramaRule)
import XMonad.Actions.TopicSpace
import XMonad.Actions.GridSelect
import XMonad.Actions.Commands
Expand Down Expand Up @@ -62,14 +62,14 @@ myHomedir = "/home/j/"
browserCmd = "firefox"
pdfViewer = "mupdf"

-- TODO: set this up.
-- for dzen, not in use right now.
--myLogHook = dynamicLogWithPP (myPrettyPrinter dbus)

-- Trying this topic thing out:
myTopics :: [Topic]
myTopics =
[ "dash"
, "ws1", "ws2", "ws3", "irc", "chat", "admin", "xmonad", "web", "pdf", "mendeley", "skype", "music", "frylock", "smash"]
, "ws1", "ws2", "ws3", "irc", "admin", "xmonad", "chat", "web", "pdf", "mendeley", "skype", "music", "frylock", "smash"]

myTopicConfig :: TopicConfig
myTopicConfig = defaultTopicConfig
Expand All @@ -89,8 +89,9 @@ myTopicConfig = defaultTopicConfig
spawn "xchat")
, ("web", spawn "firefox -browser")
, ("mendeley", spawn "mendeleydesktop")
, ("mendeley", spawn "skype")
, ("xmonad", spawn "gvim /home/mcdon/.xmonad/xmonad.hs")
, ("skype", spawn "skype")
, ("xmonad", spawn "gvim /home/mcdon/.xmonad/xmonad.hs" >>
spawnShellIn "/home/mcdon/config_repo")
--, ("vimrc", spawn "gvim /home/mcdon/.vimrc /home/mcdon/.vim")
, ("pdf", spawn pdfViewer)
, ("frylock", ssh "frylock")
Expand Down Expand Up @@ -158,6 +159,7 @@ tabConfig = defaultTheme { inactiveBorderColor = "#FF0000"
-- normalLayout = tiled ||| (spiral (6/7)) ||| noBorders Full

-- | This is for gridselect TODO make this work.
-- (currently the arrow keys don't quite work right)
gsConfig = defaultGSConfig { gs_navigate = fix $ \self ->
let navKeyMap = M.mapKeys ((,) 0) $ M.fromList $
[(xK_Escape, cancel)
Expand All @@ -182,28 +184,44 @@ gsConfig = defaultGSConfig { gs_navigate = fix $ \self ->
]
in makeXEventhandler $ shadowWithKeymap navKeyMap (const self) }

-- Xmobar stuff
myBar = "xmobar"
myPP = xmobarPP { ppCurrent = xmobarColor "#ff7777" "" . wrap "<" ">"
, ppVisible = wrap "(" ")"
, ppUrgent = xmobarColor "#ffffff" "#ff0000" . wrap "*" "*"
, ppTitle = xmobarColor "#aaaaaa" "" . wrap "*" "*"
, ppWsSep = " "
}

toggleStrutsKey XConfig {XMonad.modMask = modMask} = (modMask, xK_b) -- to drop the bar from layout.

-- Float certain apps
myManageHook = composeAll
[ className =? "Gimp" --> doFloat
, className =? "pygame" --> doFloat
, className =? "gvncviewer" --> doFloat
]

--main = xmonad =<< statusBar myBar myPP toggleStrutsKey myConfig -- TODO: restore

main :: IO ()
main = do
checkTopicConfig myTopics myTopicConfig
let urgency = withUrgencyHook dzenUrgencyHook { args = ["-bg", "darkgreen", "-xs", "l"] }
-- Todo: put this back:
-- For use with dzen, also maybe broken.
--withUrgencyHook dzenUrgencyHook { args = ["-bg", "darkgreen", "-xs", "l"] } $
xmonad =<< statusBar myBar myPP toggleStrutsKey myConfig

myBar = "xmobar"
myPP = xmobarPP { ppCurrent = xmobarColor "#429942" "" . wrap "<" ">" }
toggleStrutsKey XConfig {XMonad.modMask = modMask} = (modMask, xK_b) -- to drop the bar from layout.

myConfig = defaultConfig {
normalBorderColor = myNormalBorderColor
,focusedBorderColor = myFocusedBorderColor
,keys = myKeys
,modMask = myModMask
,borderWidth = myBorderWidth
,terminal = myTerm
,workspaces = myTopics
,layoutHook = myLayout
normalBorderColor = myNormalBorderColor
, focusedBorderColor = myFocusedBorderColor
, keys = myKeys
, modMask = myModMask
, borderWidth = myBorderWidth
, terminal = myTerm
, workspaces = myTopics
, layoutHook = myLayout
, manageHook = myManageHook <+> imManageHooks <+> manageHook defaultConfig
-- ,handleEventHook = promoteWarp # used with magic focus.
,focusFollowsMouse = myFocusFollowsMouse
}
Expand Down Expand Up @@ -243,20 +261,19 @@ toAdd x =
, ((modm .|. shiftm , xK_g), promptedShift)

, ((modm .|. shiftm , xK_x), changeDir defaultXPConfig)
, ((modm .|. ctlm , xK_n), appendFilePrompt defaultXPConfig $ myHomedir ++ ".notes/xmonad.txt")
--, ((modm , xK_d), promptSearch greenXPConfig wikipedia)
--, ((modm .|. shiftm , xK_d), selectSearch wikipedia)
--, ((modm , xK_g), promptSearch greenXPConfig (intelligent google))
--, ((modm .|. shiftm , xK_g), selectSearch (intelligent google))
, ((ctlm .|. shiftm , xK_n), appendFilePrompt defaultXPConfig $ myHomedir ++ ".notes/xmonad.txt")
, ((modm , xK_q), restart "xmonad" True)
, ((modm .|. ctlm , xK_q), do
spawn "kill $GNOME_KERYING_PID"
io (exitWith ExitSuccess)
)
, ((modm .|. shiftm , xK_q), spawn "/opt/scripts/gothefucktosleep")
, ((0 , xK_Print), spawn "scrot")
, ((0 , xK_Pause), spawn "amixer set Master,0 toggle") -- TOOD: test
, ((controlMask , xK_Print), spawn "sleep 0.2; scrot -s")
, ((modm , xK_z), toggleWS) -- from cycleWS
-- , ((modm .|. shiftm , xK_h), prevWS) -- from cycleWS
-- , ((modm .|. shiftm , xK_l), nextWS) -- from cycleWS
, ((ctlm .|. shiftm , xK_h), prevWS) -- from cycleWS
, ((ctlm .|. shiftm , xK_l), nextWS) -- from cycleWS
] ++ physicalScreenRemaps


Expand Down

0 comments on commit 163b440

Please sign in to comment.