aboutsummaryrefslogtreecommitdiffstats
path: root/xmonad
diff options
context:
space:
mode:
Diffstat (limited to 'xmonad')
-rw-r--r--xmonad/xmonad-session-rc14
-rw-r--r--xmonad/xmonad.hs.gpp10
-rw-r--r--xmonad/xmonad.mk3
3 files changed, 25 insertions, 2 deletions
diff --git a/xmonad/xmonad-session-rc b/xmonad/xmonad-session-rc
new file mode 100644
index 0000000..f61a512
--- /dev/null
+++ b/xmonad/xmonad-session-rc
@@ -0,0 +1,14 @@
+# -*- shell-script -*-
+
+if test -z "${default_session}"; then # Guard from inclusion from xinit
+
+ SESSION=xmonad
+ export DESKTOP_SESSION="$SESSION"
+
+ # Apply package specific settings and run package specific programs
+ for f in ~/.config/X11/xinit/xinitrc.d/*; do
+ if test -r "$f"; then
+ . -- "$f"
+ fi
+ done
+fi
diff --git a/xmonad/xmonad.hs.gpp b/xmonad/xmonad.hs.gpp
index 6a9358e..7a6f960 100644
--- a/xmonad/xmonad.hs.gpp
+++ b/xmonad/xmonad.hs.gpp
@@ -54,12 +54,16 @@ import qualified Data.Map as M
$$<
+ hostname="$(hostname | tr '[[:upper:]]' '[[:lower:]]')"
+
workspace_1=main
- if test "$(hostname | tr '[[:upper:]]' '[[:lower:]]')" = zenith; then
+ if test "$hostname" = zenith; then
workspace_7=chat
workspace_8=mail
+ workspace_9=media
+ else
+ workspace_9=off
fi
- workspace_9=media
modmask=mod4Mask # Super_L
focus_on_hover=True
@@ -163,6 +167,8 @@ $$>fi
{-- TODO , (( $${modmask} .|. shiftMask , xK_m), sendMessage RestoreNextMinimizedWin) --}
]
+{-- TODO preselect workspace 9 on secondary monitor --}
+
---- ==== Layout settings ==== ----
ratios = [ toRational (2/(1 + sqrt 5 :: Double)) -- golden ratio
diff --git a/xmonad/xmonad.mk b/xmonad/xmonad.mk
index 65acabf..29d52bb 100644
--- a/xmonad/xmonad.mk
+++ b/xmonad/xmonad.mk
@@ -1,3 +1,6 @@
xmonad.hs: xmonad.hs.gpp xmonad.mk
+ @touch -- ~/.xmonad/xmonad.hs
+ @chmod -- +w ~/.xmonad/xmonad.hs
gpp -s '$$$$' < xmonad.hs.gpp > ~/.xmonad/xmonad.hs
xmonad --recompile
+ @chmod -- a-w ~/.xmonad/xmonad.hs