Permalink
Browse files

Merge branch 'master' of github.com:escaped/xmonad-config

  • Loading branch information...
2 parents 61bf703 + 8c78a12 commit 9e0f23dd9b098cedfa262a6e326347bc715c7e06 @escaped committed Jul 27, 2011
Showing with 32 additions and 24 deletions.
  1. +4 −4 lib/ApplicationRules.hs
  2. +9 −13 lib/LayoutRules.hs
  3. +7 −7 xmobarrc
  4. +12 −0 xmonad.hs
View
@@ -25,11 +25,11 @@ rules = [
]
-- applications
-webApps = ["Google-chrome", "Chromium-browser"]
+webApps = ["firefox", "Google-chrome", "Chromium-browser"]
codeApps = ["Eclipse"]
imApps = ["Pidgin"]
pdfApps = ["Evince", "Epdfview"]
-docApps = ["libreoffice-startcenter"]
-stuffApps = ["JDownloader", "VirtualBox", "MPlayer", "Remmina", "Vncviewer"]
+docApps = ["texmaker", "libreoffice-startcenter"]
+stuffApps = ["vlc", "Vncviewer"]
-centerApps = ["Xmessage", "Zenity", "feh"]
+centerApps = ["nm-applet", "Xmessage", "Zenity", "feh"]
View
@@ -13,16 +13,16 @@ import XMonad.Layout.IM
import XMonad.Layout.Tabbed
import XMonad.Layout.PerWorkspace
import XMonad.Layout.Grid
--- import XMonad.Layout.Magnifier
-- Data.Ratio for IM layout
import Data.Ratio ((%))
layoutRules =
onWorkspace "1:web" webLayout $
- onWorkspace "3:chat" imLayout $
- onWorkspace "4:pdf" tabbedLayout $
+ onWorkspace "4:chat" imLayout $
+ onWorkspace "5:doc" tabbedLayout $
+ onWorkspace "6:stuff" gimpLayout $
standardLayouts
where
@@ -41,18 +41,14 @@ layoutRules =
-- web Layout
webLayout = avoidStruts $ tabLayout ||| tiled ||| reflectHoriz tiled ||| full
- -- pdf
- tabbedLayout = avoidStruts $ tabLayout ||| tiled ||| full
- -- webLayout = magnifiercz' 1.4 $ Tall nmaster delta ratio where
- -- The default number of windows in the master pane
- -- nmaster = 1
- -- Percent of screen to increment by when resizing p anes
- -- delta = 3/100
- -- Default proportion of screen occupied by master p ane
- -- ratio = 60/100
+ -- pdf
+ tabbedLayout = avoidStruts $ tabLayout ||| tiled ||| full
-- Gimp Layout
- -- gimpLayout = avoidStruts $ smartBorders $ withIM(0.11) (Role "gimp-toolbox") $ reflectHoriz $ withIM (0.15) (Role "gimp-dock") Full
+ gimpLayout = withIM (0.11) (Role "gimp-toolbox") $
+ reflectHoriz $
+ withIM (0.15) (Role "gimp-dock") Full
+
-- full
fullL = avoidStruts $ full
View
@@ -4,13 +4,13 @@ Config { font = "-*-terminus-*-*-*-*-12-*-*-*-*-*-*-u"
, position = TopW L 92
, lowerOnStart = True
, commands = [ Run StdinReader
- , Run BatteryP ["BAT0"] ["-t","<left>","-L","10","-H","45","-l","red","-n","orange","-h","green"] 20
- , Run Cpu ["cpu0","-L","5","-H","50","-l","green","--normal","orange","--high","red"] 10
- , Run CpuFreq ["-t","<cpu0>/<cpu1> GHz","-L","1","-H","2","-l","green","-n","orange","-h","red"] 20
- , Run Memory ["-t","Mem: <usedratio>%","-l","green","--normal","orange","--high","red"] 10
- , Run Network "eth0" ["-L","0","-H","32","-l","green","--normal","orange","--high","red"] 10
- , Run Network "wlan0" ["-L","0","-H","32","-l","green","--normal","orange","--high","red"] 10
- , Run Date "%d.%m.%Y %H:%M:%S" "date" 10
+ , Run BatteryP ["BAT0"] ["-t","<left>%","-L","10","-H","45","-l","red","-n","orange","-h","green"] 20
+ , Run Cpu ["cpu0","-L","5","-H","50","-l","green","--normal","orange","--high","red"] 50
+ , Run CpuFreq ["-t","<cpu0>/<cpu1> GHz","-L","1","-H","2","-l","green","-n","orange","-h","red"] 101010101010101010100
+ , Run Memory ["-t","Mem: <usedratio>%","-l","green","--normal","orange","--high","red"] 300
+ , Run Network "eth0" ["-L","0","-H","32","-l","green","--normal","orange","--high","red"] 50
+ , Run Network "wlan0" ["-L","0","-H","32","-l","green","--normal","orange","--high","red"] 50
+ , Run Date "%d.%m.%Y %H:%M" "date" 600
]
, sepChar = "%"
, alignSep = "}{"
View
@@ -91,6 +91,18 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
]
)
+ -- multimedia keys
+ -- XF86AudioLowerVolume
+ , ((0, 0x1008ff11), spawn "amixer -q set Master 2dB-")
+ -- XF86AudioRaiseVolume
+ , ((0, 0x1008ff13), spawn "amixer -q set Master 2dB+")
+ -- XF86AudioMute
+ , ((0, 0x1008ff12), spawn "amixer -q set Master toggle")
+
+ -- screenshot
+ , ((controlMask, xK_Print), spawn "sleep 0.2; scrot -s -e 'mv $f ~/images/screenshots/'")
+ , ((0, xK_Print), spawn "scrot -e 'mv $f ~/images/screenshots/'")
+
-- launcher
, ((modMask , xK_space), shellPrompt myXPConfig)
, ((modMask , xK_s ), SM.submap $ Tools.searchEngineMap $ S.promptSearchBrowser myXPConfig "Google-chrome")

0 comments on commit 9e0f23d

Please sign in to comment.