diff options
| author | Kjetil Orbekk <kj@orbekk.com> | 2021-11-24 09:00:47 -0500 |
|---|---|---|
| committer | Kjetil Orbekk <kj@orbekk.com> | 2021-12-02 09:12:42 -0500 |
| commit | 514b3abfc33eb6b0e2eecec5fe6cae35ac1dbbcd (patch) | |
| tree | 7ea822051221e391beae6fe9dd3791f242c39e4a /desktop | |
| parent | a529e16a5e4a9ea2daf515c49fd52056fa7614fa (diff) | |
update setup code
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/.xmonad/xmonad.hs | 5 | ||||
| -rwxr-xr-x | desktop/.xsession | 11 |
2 files changed, 12 insertions, 4 deletions
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 & |