From 514b3abfc33eb6b0e2eecec5fe6cae35ac1dbbcd Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kj@orbekk.com>
Date: Wed, 24 Nov 2021 09:00:47 -0500
Subject: update setup code

---
 desktop/.xmonad/xmonad.hs |  5 ++---
 desktop/.xsession         | 11 ++++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'desktop')

diff --git a/desktop/.xmonad/xmonad.hs b/desktop/.xmonad/xmonad.hs
index 061e351..2bc7c07 100644
--- a/desktop/.xmonad/xmonad.hs
+++ b/desktop/.xmonad/xmonad.hs
@@ -24,7 +24,6 @@ import XMonad.Hooks.EwmhDesktops
 import Control.Applicative ((<$>), pure)
 import XMonad.Hooks.SetWMName
 import XMonad.Hooks.ManageHelpers
-import Data.List.Split
 import Control.Monad
 
 cViolet = "#68217A"
@@ -55,7 +54,7 @@ bar = statusBar dzenCommand myDzenPP toggleStrutsKey
   where toggleStrutsKey XConfig{modMask = modm} = (modm, xK_b)
 
 main = do
-  host <- (head . splitOn "." . nodeName) <$> getSystemID
+  host <- (takeWhile (/= '.') . nodeName) <$> getSystemID
   setEnv "HOST" host True
   config <- bar (myConfig host)
   xmonad config
@@ -160,7 +159,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
     -- , ((modm              , xK_q     ), spawn "xmonad --recompile; xmonad --restart")
 
     -- Lock screen
-    , ((modm .|. shiftMask, xK_z), spawn "mate-screensaver-command --lock")
+    , ((modm .|. shiftMask, xK_z), spawn "lock-screen.sh")
     ]
     ++
 
diff --git a/desktop/.xsession b/desktop/.xsession
index 01cd8f1..afc60b7 100755
--- a/desktop/.xsession
+++ b/desktop/.xsession
@@ -10,9 +10,18 @@ fi
 
 source ~/.zshenv
 
+find_planck_keyboard() {
+  xinput list | grep -q "OLKB Planck"
+}
+
 export TERMINAL=urxvt
 xrdb -merge $HOME/.Xresources -I$HOME
-setxkbmap us -variant dvorak -option compose:ralt -option caps:ctrl_modifier
+if find_planck_keyboard; then
+  setxkbmap us -option compose:ralt
+else
+  setxkbmap us -variant dvorak -option compose:ralt -option caps:ctrl_modifier
+fi
+
 xsetroot -solid "#2A3462"
 pasystray &
 xss-lock -- /usr/bin/env xscreensaver-command --lock &
-- 
cgit v1.2.3