From 5025c65f295bcfaadf67022f0396380013faf7d7 Mon Sep 17 00:00:00 2001
From: la-ninpre <leobrekalini@gmail.com>
Date: Sun, 26 Jun 2022 23:36:13 +0300
Subject: stylistic changes

---
 xmonad.hs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/xmonad.hs b/xmonad.hs
index 37ef99c..f20a73c 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -1,4 +1,3 @@
-import qualified Data.Map as M
 import System.Exit
 
 import XMonad
@@ -74,7 +73,7 @@ myKeys = [ ("M-<Return>", spawn myTerminal)
          , ("M-S-t",      sinkAll)
          , ("M-<Tab>",    toggleWindowSpacingEnabled >> toggleScreenSpacingEnabled)
 
-         , ("M-S-q",      io (exitWith ExitSuccess))
+         , ("M-S-q",      io exitSuccess)
          , ("M-S-r",      spawn "xmonad --recompile && xmonad --restart")
 
          , ("<XF86AudioPlay>",        spawn $ myMocp ++ " -G")
@@ -85,7 +84,7 @@ myKeys = [ ("M-<Return>", spawn myTerminal)
          ]
          ++
          [("M-" ++ m ++ show k, windows $ f i)
-             | (i, k) <- zip (myWorkspaces) [1..9]
+             | (i, k) <- zip myWorkspaces [1..9]
              , (f, m) <- [(W.greedyView, ""), (W.shift, "S-")]
          ]
 
@@ -138,11 +137,11 @@ myLayout = windowNavigation
          where
             tiled    = renamed [Replace "\xe624"] -- lawa
                      $ addTabs shrinkText myTabTheme
-                     $ subLayout [] (Simplest)
+                     $ subLayout [] Simplest
                      $ spacingWithEdge space $ ResizableTall nmaster delta ratio []
             threeCol = renamed [Replace "\xe665"] -- supa
                      $ addTabs shrinkText myTabTheme
-                     $ subLayout [] (Simplest)
+                     $ subLayout [] Simplest
                      $ spacingWithEdge space $ ResizableThreeColMid nmaster delta ratio []
             full     = renamed [Replace "\xe663"] -- suli
                      $ noBorders Full
@@ -158,11 +157,11 @@ myConfig = def
          , manageHook         = myManageHook
          , workspaces         = myWorkspaces
          , borderWidth        = myBorderWidth
-         , keys               = const M.empty -- discard default keybindings
+         , keys               = (`mkKeymap` myKeys)
          , normalBorderColor  = col_bg_alt def
          , focusedBorderColor = col_fg_alt def
          , startupHook = return () >> checkKeymap myConfig myKeys
-         } `additionalKeysP` myKeys
+         }
 
 main :: IO ()
 main = xmonad
-- 
cgit v1.2.3