Merge remote-tracking branch 'origin'

13 files changed, 44 insertions, 10 deletions

diff --git a/.chezmoiignore b/.chezmoiignore
index 1cea738..076df73 100644
--- a/.chezmoiignore
+++ b/.chezmoiignore
@@ -14,6 +14,8 @@ crontab
 {{- if ne .chezmoi.os "openbsd" }}
 # only install if on openbsd
 .urxvt/perl
+.xmonad/build
+.xmonad/xmonad-config.cabal
 {{- end }}
 
 # files in home
diff --git a/dot_Xresources.tmpl b/dot_Xresources.tmpl
index 98d59ca..993f9ad 100644
--- a/dot_Xresources.tmpl
+++ b/dot_Xresources.tmpl
@@ -33,7 +33,9 @@ Xft.hinting:    1
 Xft.hintstyle:  hintfull
 Xft.rgba:       rgb
 
-XLock*logoutButton:     -1
+XLock.dpmsoff: 10
+XLock.lockdelay: 0
+XLock.logoutButton: -1
 
 Xpdf*fileFilterStyle:   filter_hidden_files
 
@@ -73,3 +75,5 @@ XConsole.text.geometry:	480x130
 XConsole.verbose:	true
 XConsole*iconic:	true
 XConsole*font:		fixed
+
+! vim: set ft=xdefaults:
diff --git a/dot_lbdb/lbdbrc b/dot_lbdb/lbdbrc
deleted file mode 100644
index b9bb0b2..0000000
--- a/dot_lbdb/lbdbrc
+++ /dev/null
@@ -1,3 +0,0 @@
-KEEP_DUPES="yes"
-METHODS="m_inmail m_gpg m_muttalias"
-MUTTALIAS_FILES="~/.mutt/aliases.rc ~/.mutt/aliases-cmu.rc"
diff --git a/dot_lbdb/lbdbrc.tmpl b/dot_lbdb/lbdbrc.tmpl
new file mode 100644
index 0000000..148bdbe
--- /dev/null
+++ b/dot_lbdb/lbdbrc.tmpl
@@ -0,0 +1,3 @@
+KEEP_DUPES="yes"
+METHODS="m_inmail {{ if (not (eq .chezmoi.os "openbsd")) }}m_gpg {{ end }}m_muttalias"
+MUTTALIAS_FILES="aliases.rc accounts/rkavanag.alumni.cmu.edu/alias.rc accounts/ryank.mail.cs.mcgill.ca/alias.rc"
diff --git a/dot_screenlayout/executable_zeta-work.sh b/dot_screenlayout/executable_zeta-work.sh
deleted file mode 100755
index b73a836..0000000
--- a/dot_screenlayout/executable_zeta-work.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-xrandr --output eDP-1 --mode 1920x1080 --pos 1600x0 --rotate normal --output DP-1 --off --output HDMI-1 --off --output DP-2 --off --output HDMI-2 --primary --mode 1600x1200 --pos 0x0 --rotate normal
diff --git a/dot_screenlayout/executable_zeta-home.sh b/dot_screenlayout/executable_zeta.rak.ac-home.sh
index b4c76e9..b4c76e9 100755
--- a/dot_screenlayout/executable_zeta-home.sh
+++ b/dot_screenlayout/executable_zeta.rak.ac-home.sh
diff --git a/dot_screenlayout/executable_zeta-solo.sh b/dot_screenlayout/executable_zeta.rak.ac-solo.sh
index 18b58ed..18b58ed 100755
--- a/dot_screenlayout/executable_zeta-solo.sh
+++ b/dot_screenlayout/executable_zeta.rak.ac-solo.sh
diff --git a/dot_screenlayout/executable_zeta.rak.ac-work.sh b/dot_screenlayout/executable_zeta.rak.ac-work.sh
new file mode 100644
index 0000000..8666d94
--- /dev/null
+++ b/dot_screenlayout/executable_zeta.rak.ac-work.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+xrandr --output eDP1 --primary --mode 1920x1080 --pos 0x0 --rotate normal --output DP1 --off --output DP2 --off --output HDMI1 --off --output HDMI2 --mode 1920x1200 --pos 1920x0 --rotate normal --output VIRTUAL1 --off
diff --git a/dot_xmonad/executable_build b/dot_xmonad/executable_build
new file mode 100644
index 0000000..fa37a66
--- /dev/null
+++ b/dot_xmonad/executable_build
@@ -0,0 +1,13 @@
+#!/bin/ksh -eu
+
+output_file="${1}"
+
+if [ "${output_file}" -nt xmonad.hs ] && [ "${output_file}" -nt /usr/local/bin/xmonad ]; then
+    echo "${output_file}" is newer than xmonad.hs
+    exit 0
+fi
+
+cabal v2-install exe:xmonad-config --overwrite-policy=always --install-method=copy
+
+[ -e "${output_file}" ] && mv -f "${output_file}" "${output_file}.old"
+install "${HOME}/.cabal/bin/xmonad-config" "${output_file}"
diff --git a/dot_xmonad/xmonad-config.cabal b/dot_xmonad/xmonad-config.cabal
new file mode 100644
index 0000000..87e58cf
--- /dev/null
+++ b/dot_xmonad/xmonad-config.cabal
@@ -0,0 +1,13 @@
+cabal-version:      2.4
+
+name:               xmonad-config
+version:            0.1.0.0
+synopsis:           XMonad config
+author:             Greg Steuck
+maintainer:         xmonad@nest.cx
+
+executable xmonad-config
+  main-is:            xmonad.hs
+  build-depends:      base, containers, xmonad, xmonad-contrib
+  hs-source-dirs:     .
+  default-language:   Haskell2010
diff --git a/dot_xmonad/xmonad.hs b/dot_xmonad/xmonad.hs.tmpl
index ed227f6..ac70ae8 100644
--- a/dot_xmonad/xmonad.hs
+++ b/dot_xmonad/xmonad.hs.tmpl
@@ -58,7 +58,7 @@ import XMonad.StackSet (shiftMaster, greedyView, shift)
 
 myMod = mod4Mask -- windows key
 myCtrl = controlMask
-myTerminal = "urxvtc"
+myTerminal = {{ if (eq .chezmoi.os "linux")  }}"urxvtc"{{ else }}"xterm"{{ end }}
 
 -- Mouse bindings: default actions bound to mouse events
 myMouseBindings (XConfig {XMonad.modMask = modMask}) = fromList $
@@ -97,7 +97,7 @@ mykeys _ = [
   , ((myMod, xK_F6), spawn "sleep 0.5 && ${HOME}/bin/icd && ${HOME}/bin/mice.sh")
   , ((myMod, xK_Up),   spawn "sleep 0.5 && b u")
   , ((myMod, xK_Down), spawn "sleep 0.5 && b d")
-  , ((myMod, xK_l), spawn "slock xset dpms force off")
+  , ((myMod, xK_l), spawn {{ if (eq .chezmoi.os "linux") }}"slock xset dpms force off"{{ else }}"xlock"{{ end }})
   , ((myMod .|. myCtrl .|. shiftMask, xK_Right), sendMessage $ Move R)
   , ((myMod .|. myCtrl .|. shiftMask, xK_Left),  sendMessage $ Move L)
   , ((myMod .|. myCtrl .|. shiftMask, xK_Up),    sendMessage $ Move U)
diff --git a/executable_dot_xinitrc.tmpl b/executable_dot_xinitrc.tmpl
index dd5d8b5..9ad3c74 100644
--- a/executable_dot_xinitrc.tmpl
+++ b/executable_dot_xinitrc.tmpl
@@ -35,8 +35,9 @@ case `uname` in
         [ -d /usr/local/share/fonts/spleen ] && xset +fp /usr/local/share/fonts/spleen/
         redshift &
         ${HOME}/bin/icd
-        urxvtd -q -f -o &
-        exec cwm
+        ${HOME}/.screenlayout/{{ .chezmoi.hostname }}-work.sh
+        xidle -delay 2 -se -timeout 180 -program "/usr/X11R6/bin/xlock" &
+        exec xmonad
 	;;
 
     Linux)
diff --git a/packages-openbsd b/packages-openbsd
index 1618aa3..c686394 100644
--- a/packages-openbsd
+++ b/packages-openbsd
@@ -23,6 +23,7 @@ keychain--
 latexmk--
 lbdb--
 mplayer--
+multitail--
 mupdf--
 muttprint--
 ncmpcpp--