From f23a323e1e6e284a7152ea7eb67566bba087476e Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Wed, 12 Feb 2020 20:13:33 -0500
Subject: mate setup

---
 xmonad/xmonad.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xmonad')

diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index 3cd577d..3127c5f 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -40,7 +40,7 @@ myConfig host =
     , borderWidth = 2
     , focusedBorderColor = "#ff0000"
     , normalBorderColor = "#777778"
-    , workspaces = pure <$> "\"<>PYFAOEU"
+    , workspaces = pure <$> "\"<>PYFAOEUI"
     , startupHook = do
         setWMName "LG3D"
         -- when (host == layoutScreensHost) (layoutScreens 2 (TwoPane 0.5 0.5))
@@ -131,7 +131,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
     -- , ((modm              , xK_q     ), spawn "xmonad --recompile; xmonad --restart")
 
     -- Lock screen
-    , ((modm .|. shiftMask, xK_z), spawn "xscreensaver-command -lock")
+    , ((modm .|. shiftMask, xK_z), spawn "mate-screensaver-command --lock")
     ]
     ++
 
-- 
cgit v1.2.3


From 2d18f8932d3c6fc8d38596e36d8bad9de23fc4a9 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Thu, 13 Feb 2020 04:02:10 -0500
Subject: hardcode terminal :/

---
 xmonad/xmonad.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'xmonad')

diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index 3127c5f..407ef89 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -36,7 +36,7 @@ myConfig host =
     { layoutHook = smartBorders $ myLayout
     , keys = myKeys
     , modMask = mod4Mask
-    , terminal = "$TERMINAL"
+    , terminal = "urxvt"
     , borderWidth = 2
     , focusedBorderColor = "#ff0000"
     , normalBorderColor = "#777778"
-- 
cgit v1.2.3


From 40cc866243ef8fc731dad55c3db9d1a62db7c109 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Thu, 13 Feb 2020 08:20:15 -0500
Subject: fix xmonad for mate

---
 xmonad/xmonad.hs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'xmonad')

diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index 407ef89..4df0d58 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -26,13 +26,14 @@ import Control.Monad
 main = do
   host <- (head . splitOn "." . nodeName) <$> getSystemID
   setEnv "HOST" host True
-  config <- xmobar (myConfig host)
+  -- config <- xmobar (myConfig host)
+  let config = myConfig host
   xmonad config
 
 layoutScreensHost = "unused" -- orange
 
 myConfig host =
-  ewmh desktopConfig
+  (docks . ewmh) $ desktopConfig
     { layoutHook = smartBorders $ myLayout
     , keys = myKeys
     , modMask = mod4Mask
@@ -41,13 +42,10 @@ myConfig host =
     , focusedBorderColor = "#ff0000"
     , normalBorderColor = "#777778"
     , workspaces = pure <$> "\"<>PYFAOEUI"
-    , startupHook = do
-        setWMName "LG3D"
-        -- when (host == layoutScreensHost) (layoutScreens 2 (TwoPane 0.5 0.5))
     , manageHook = insertPosition Below Newer <+> (isDialog --> doF W.shiftMaster <+> doF W.swapDown)
     }
   where myLayout = onHost layoutScreensHost (verticalTiled ||| horizontalTiled ||| Full) $
-                   layoutHook defaultConfig
+                   layoutHook desktopConfig
         verticalTiled = Mirror (Tall 1 (5/100) (2/3))
         horizontalTiled = Tall 0 (5/100) (2/3)
 
@@ -122,7 +120,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
     , ((modm .|. shiftMask, xK_s ), rescreen)
 
     -- This is redundant because it's added by the statusBar function.
-    -- , ((modm              , xK_b     ), sendMessage ToggleStruts)
+    , ((modm              , xK_b     ), sendMessage ToggleStruts)
 
     -- Quit xmonad
     -- , ((modm .|. shiftMask, xK_q     ), io (exitWith ExitSuccess))
-- 
cgit v1.2.3