1 files changed, 4 insertions, 6 deletions
diff --git a/.config/XMonad/xmonad.hs b/.config/XMonad/xmonad.hs
index 8da1c12..128243a 100644
--- a/.config/XMonad/xmonad.hs
+++ b/.config/XMonad/xmonad.hs
@@ -9,14 +9,12 @@ import XMonad.Hooks.EwmhDesktops
 import XMonad.Util.EZConfig
 import XMonad.Util.Run
 
-
 import Keybindings
+--import QwertyKeybindings
+import DvorakKeybindings
 import Defaults
 import Hooks
 
-myKeybindings = myKeybindingsQWERTY
-myKeybindingsP = myKeybindingsQWERTYP ++ myFnKeybindingsP
-
 main :: IO ()
 main = do
   -- myLemonbar  <- statusBarPipe myLemonbarCmd  (pure myLemonbarPP)
@@ -27,12 +25,12 @@ main = do
     , terminal           = myTerminal
     , borderWidth        = myBorderWidth
     , modMask            = myModMask
-    , workspaces         = myWorkspaces
+    , workspaces         = myWorkspaceNames
     , normalBorderColor  = myBorder
     , focusedBorderColor = myBorder'
     , layoutHook         = myLayoutHook
     , startupHook        = myStartupHook
     , manageHook         = myManageHook
   } `additionalKeys`          myKeybindings
-    `additionalKeysP`         myKeybindingsP
+    `additionalKeysP`         (myKeybindingsP ++ myFnKeybindingsP)
     `additionalMouseBindings` myMouseKeybindings