20 files changed, 213 insertions, 867 deletions

diff --git a/.config/XMonad/lib/Defaults.hs b/.config/XMonad/lib/Defaults.hs
index 5aee38a..8492cd7 100644
--- a/.config/XMonad/lib/Defaults.hs
+++ b/.config/XMonad/lib/Defaults.hs
@@ -67,7 +67,8 @@ myEmailClient     = "thunderbird"
 myPasswordManager = "keepassxc"
 
 -- workspaces
-myWorkspaceNames = ["一", "二", "三", "四", "五", "六", "七", "八", "九", "十"]
+myExtraWorkspaces = [(xK_0, "十")]
+myWorkspaces      = ["一", "二", "三", "四", "五", "六", "七", "八", "九"] ++ map snd myExtraWorkspaces
 
 -- screen gaps
 sGap = 3
diff --git a/.config/XMonad/lib/DvorakKeybindings.hs b/.config/XMonad/lib/DvorakKeybindings.hs
deleted file mode 100644
index caebdc8..0000000
--- a/.config/XMonad/lib/DvorakKeybindings.hs
+++ /dev/null
@@ -1,105 +0,0 @@
-module DvorakKeybindings where
-
-import XMonad
-import qualified XMonad.StackSet as W
-
--- actions
-import XMonad.Actions.CopyWindow
-import XMonad.Actions.WithAll
-import XMonad.Actions.CycleWS
-import XMonad.Actions.GridSelect
-import XMonad.Actions.SwapWorkspaces
-
--- layout modifiers
-import XMonad.Layout.Spacing
-import XMonad.Layout.WindowNavigation as WN
-import XMonad.Layout.Maximize
-
--- Layouts
-import XMonad.Layout.BinarySpacePartition as BSP
-
--- hooks
-import XMonad.Hooks.ManageDocks
-
-import Util
-import Defaults
-import Scratchpads
-
-myWorkspaceKeys = [xK_1, xK_2, xK_3, xK_4, xK_5, xK_6, xK_7, xK_8, xK_9, xK_0]
---myWorkspaceKeys = [xK_ampersand, xK_bracketleft, xK_braceleft, xK_braceright, xK_parenleft, xK_equal, xK_asterisk, xK_parenright, xK_plus, xK_bracketright]
-myWorkspaces = wsKeys myWorkspaceKeys myWorkspaceNames
-
-myKeybindings :: [((KeyMask, KeySym), X ())]
-myKeybindings = [
-    ((myModMask, xK_Return), spawn myTerminal)
-    , ((myModShiftMask, xK_Return), spawn myLockscreen)
-    , ((myModMask .|. shiftMask, xK_c), kill1)
-    , ((myModMask, xK_s), spawn myLauncher)
-
-    -- view prev/next workspaces
-    , ((myModShiftMask,          xK_Tab       ), prevWS)
-    , ((myModMask,               xK_Tab       ), nextWS)
-    --, ((myModMask,               xK_semicolon ), prevWS)
-    --, ((myModMask,               xK_apostrophe), nextWS)
-    --, ((myModMask',              xK_h         ), prevWS)
-    --, ((myModMask',              xK_l         ), nextWS)
-
-    -- move to prev/next workspaces
-    --, ((myModShiftMask', xK_h         ), shiftToPrev >> prevWS)
-    --, ((myModShiftMask', xK_l         ), shiftToNext >> nextWS)
-    --, ((myModShiftMask', xK_semicolon ), shiftToPrev >> prevWS)
-    --, ((myModShiftMask', xK_apostrophe), shiftToNext >> nextWS)
-
-    -- toggle maximize
-    --, ((myModMask, xK_f), withFocused (sendMessage . maximizeRestore))
-
-    -- unfloat windows
-    --, ((myModMask .|. shiftMask, xK_f), withFocused $ windows . W.sink)
-
-    -- cycle through windows
-    --, ((myModMask', xK_j), windows W.focusDown)
-    --, ((myModMask', xK_k), windows W.focusUp)
-
-    -- 2D navigation
-    , ((myModMask,                   xK_n), sendMessage $ Go R)
-    , ((myModMask,                   xK_d), sendMessage $ Go L)
-    , ((myModMask,                   xK_t), sendMessage $ Go U)
-    , ((myModMask,                   xK_h), sendMessage $ Go D)
-    -- swap windows
-    , ((myModShiftMask,              xK_n), sendMessage $ WN.Swap R)
-    , ((myModShiftMask,              xK_d), sendMessage $ WN.Swap L)
-    , ((myModShiftMask,              xK_t), sendMessage $ WN.Swap U)
-    , ((myModShiftMask,              xK_h), sendMessage $ WN.Swap D)
-    -- resize
-    , ((myModMask .|. myModMask',      xK_n), sendMessage $ ExpandTowards R)
-    , ((myModMask .|. myModMask',      xK_d), sendMessage $ ExpandTowards L)
-    , ((myModMask .|. myModMask',      xK_h), sendMessage $ ExpandTowards D)
-    , ((myModMask .|. myModMask',      xK_t), sendMessage $ ExpandTowards U)
-    , ((myModMask .|. myModShiftMask', xK_n), sendMessage $ ShrinkFrom R)
-    , ((myModMask .|. myModShiftMask', xK_d), sendMessage $ ShrinkFrom L)
-    , ((myModMask .|. myModShiftMask', xK_h), sendMessage $ ShrinkFrom D)
-    , ((myModMask .|. myModShiftMask', xK_t), sendMessage $ ShrinkFrom U)
-    --, ((myModMask, xK_B), windows $ W.greedyView "十")
-  ] ++ [
-    -- workspace switching
-      ((myModMask, key), windows $ W.greedyView ws) | (key,ws) <- myWorkspaces
-  -- ] ++ [
-  --   -- moving window to workspace
-  --   ((myModShiftMask, key), windows $ W.shift ws) | (key,ws) <- myWorkspaces
-  -- ] ++ [
-  --   -- to swap workspace
-  --   ((myModShiftMask', key), windows $ swapWithCurrent ws) | (key, ws) <- myWorkspaces
-  -- ] ++ [
-  --   -- copy
-  --   ((m .|. myModMask, key), windows $ f ws) | (key, ws) <- myWorkspaces, (f, m) <- [(copy, myModShiftMask')]
-  -- ] ++ [
-  --   -- for not swapping tags while using multihead
-  --   ((m .|. myModMask, key), windows $ f ws) | (key, ws) <- myWorkspaces, (f, m) <- [(W.view, 0), (W.shift, shiftMask)]
-  ] -- ++ [ -- directly focus monitors instead of cycling
-  --  ((m .|. myModMask, key), screenWorkspace sc >>= flip whenJust (windows . f))
-  --  | (key, sc) <- zip [xK_e, xK_w] [0..]
-  --  , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]
-  --]
-
-myKeybindingsP :: [(String, X())]
-myKeybindingsP = []
diff --git a/.config/XMonad/lib/Hooks.hs b/.config/XMonad/lib/Hooks.hs
index 1b2962b..4dcb821 100644
--- a/.config/XMonad/lib/Hooks.hs
+++ b/.config/XMonad/lib/Hooks.hs
@@ -24,9 +24,9 @@ import Scratchpads
 
 myManageHook = namedScratchpadManageHook myScratchpads
   <+> manageDocks <+> composeAll [
-    className   =? "discord"     --> doShift ( myWorkspaceNames !! 9 )
-    , className =? "thunderbird" --> doShift ( myWorkspaceNames !! 8 )
-    , className =? "KeePassXC"   --> doShift ( myWorkspaceNames !! 7 )
+    className   =? "discord"     --> doShift ( myWorkspaces !! 9 )
+    , className =? "thunderbird" --> doShift ( myWorkspaces !! 8 )
+    , className =? "KeePassXC"   --> doShift ( myWorkspaces !! 7 )
     , isFullscreen               --> doFullFloat
   ]
 
diff --git a/.config/XMonad/lib/Keybindings.hs b/.config/XMonad/lib/Keybindings.hs
index c6f9205..bc1aa99 100644
--- a/.config/XMonad/lib/Keybindings.hs
+++ b/.config/XMonad/lib/Keybindings.hs
@@ -1,9 +1,29 @@
 module Keybindings where
 
 import XMonad
+import qualified XMonad.StackSet as W
+
+-- actions
+import XMonad.Actions.CopyWindow
+import XMonad.Actions.WithAll
 import XMonad.Actions.CycleWS
+import XMonad.Actions.GridSelect
+import XMonad.Actions.SwapWorkspaces
+
+-- layout modifiers
+import XMonad.Layout.Spacing
+import XMonad.Layout.WindowNavigation as WN
+import XMonad.Layout.Maximize
+
+-- Layouts
+import XMonad.Layout.BinarySpacePartition as BSP
+
+-- hooks
+import XMonad.Hooks.ManageDocks
 
+import Util
 import Defaults
+import Scratchpads
 
 myMouseKeybindings :: [((ButtonMask, Button), Window -> X ())]
 myMouseKeybindings = [
@@ -23,4 +43,79 @@ myFnKeybindingsP = [
     , ("<XF86AudioPlay>",         spawn pausePlay)
     , ("<XF86AudioPause>",        spawn pausePlay)
     , ("<Pause>",                 spawn pausePlay)
-  ]
\ No newline at end of file
+  ]
+
+myKeybindings :: [((KeyMask, KeySym), X ())]
+myKeybindings = [
+    ((myModMask, xK_Return), spawn myTerminal)
+    , ((myModShiftMask, xK_Return), spawn myLockscreen)
+    , ((myModMask .|. shiftMask, xK_c), kill1)
+    , ((myModMask, xK_s), spawn myLauncher)
+
+    -- view prev/next workspaces
+    , ((myModShiftMask,          xK_Tab       ), prevWS)
+    , ((myModMask,               xK_Tab       ), nextWS)
+    --, ((myModMask,               xK_semicolon ), prevWS)
+    --, ((myModMask,               xK_apostrophe), nextWS)
+    --, ((myModMask',              xK_h         ), prevWS)
+    --, ((myModMask',              xK_l         ), nextWS)
+
+    -- move to prev/next workspaces
+    --, ((myModShiftMask', xK_h         ), shiftToPrev >> prevWS)
+    --, ((myModShiftMask', xK_l         ), shiftToNext >> nextWS)
+    --, ((myModShiftMask', xK_semicolon ), shiftToPrev >> prevWS)
+    --, ((myModShiftMask', xK_apostrophe), shiftToNext >> nextWS)
+
+    -- toggle maximize
+    --, ((myModMask, xK_f), withFocused (sendMessage . maximizeRestore))
+
+    -- unfloat windows
+    --, ((myModMask .|. shiftMask, xK_f), withFocused $ windows . W.sink)
+
+    -- cycle through windows
+    --, ((myModMask', xK_j), windows W.focusDown)
+    --, ((myModMask', xK_k), windows W.focusUp)
+
+    -- 2D navigation
+    , ((myModMask,                   xK_n), sendMessage $ Go R)
+    , ((myModMask,                   xK_d), sendMessage $ Go L)
+    , ((myModMask,                   xK_t), sendMessage $ Go U)
+    , ((myModMask,                   xK_h), sendMessage $ Go D)
+    -- swap windows
+    , ((myModShiftMask,              xK_n), sendMessage $ WN.Swap R)
+    , ((myModShiftMask,              xK_d), sendMessage $ WN.Swap L)
+    , ((myModShiftMask,              xK_t), sendMessage $ WN.Swap U)
+    , ((myModShiftMask,              xK_h), sendMessage $ WN.Swap D)
+    -- resize
+    , ((myModMask .|. myModMask',      xK_n), sendMessage $ ExpandTowards R)
+    , ((myModMask .|. myModMask',      xK_d), sendMessage $ ExpandTowards L)
+    , ((myModMask .|. myModMask',      xK_h), sendMessage $ ExpandTowards D)
+    , ((myModMask .|. myModMask',      xK_t), sendMessage $ ExpandTowards U)
+    , ((myModMask .|. myModShiftMask', xK_n), sendMessage $ ShrinkFrom R)
+    , ((myModMask .|. myModShiftMask', xK_d), sendMessage $ ShrinkFrom L)
+    , ((myModMask .|. myModShiftMask', xK_h), sendMessage $ ShrinkFrom D)
+    , ((myModMask .|. myModShiftMask', xK_t), sendMessage $ ShrinkFrom U)
+    --, ((myModMask, xK_B), windows $ W.greedyView "十")
+  ] ++ [
+    -- workspace switching
+     ((myModMask, key), windows $ W.greedyView ws) | (key,ws) <- myExtraWorkspaces
+  -- ] ++ [
+  --   -- moving window to workspace
+  --   ((myModShiftMask, key), windows $ W.shift ws) | (key,ws) <- myWorkspaces
+  -- ] ++ [
+  --   -- to swap workspace
+  --   ((myModShiftMask', key), windows $ swapWithCurrent ws) | (key, ws) <- myWorkspaces
+  -- ] ++ [
+  --   -- copy
+  --   ((m .|. myModMask, key), windows $ f ws) | (key, ws) <- myWorkspaces, (f, m) <- [(copy, myModShiftMask')]
+  -- ] ++ [
+  --   -- for not swapping tags while using multihead
+  --   ((m .|. myModMask, key), windows $ f ws) | (key, ws) <- myWorkspaces, (f, m) <- [(W.view, 0), (W.shift, shiftMask)]
+  ] -- ++ [ -- directly focus monitors instead of cycling
+  --  ((m .|. myModMask, key), screenWorkspace sc >>= flip whenJust (windows . f))
+  --  | (key, sc) <- zip [xK_e, xK_w] [0..]
+  --  , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]
+  --]
+
+myKeybindingsP :: [(String, X())]
+myKeybindingsP = []
\ No newline at end of file
diff --git a/.config/XMonad/lib/QwertyKeybindings.hs b/.config/XMonad/lib/QwertyKeybindings.hs
deleted file mode 100644
index c02a63b..0000000
--- a/.config/XMonad/lib/QwertyKeybindings.hs
+++ /dev/null
@@ -1,241 +0,0 @@
-module QwertyKeybindings where
-
-import XMonad
-import qualified XMonad.StackSet as W
-
--- actions
-import XMonad.Actions.CopyWindow
-import XMonad.Actions.WithAll
-import XMonad.Actions.CycleWS
-import XMonad.Actions.GridSelect
-import XMonad.Actions.SwapWorkspaces
-
--- layout modifiers
-import XMonad.Layout.Spacing
-import XMonad.Layout.WindowNavigation as WN
-import XMonad.Layout.Maximize
-
--- Layouts
-import XMonad.Layout.BinarySpacePartition as BSP
-
--- hooks
-import XMonad.Hooks.ManageDocks
-
-import Util
-import Defaults
-import Scratchpads
-
-myWorkspaceKeys = [xK_1, xK_2, xK_3, xK_4, xK_5, xK_6, xK_7, xK_8, xK_9, xK_0]
-myWorkspaces = wsKeys myWorkspaceKeys myWorkspaceNames
-
-myKeybindings :: [((KeyMask, KeySym), X ())]
-myKeybindings = [
-    ((myModMask, xK_Return), spawn myTerminal)
-    , ((myModShiftMask, xK_Return), spawn myLockscreen)
-    , ((myModMask .|. shiftMask, xK_q), kill1)
-    , ((myModShiftMask, xK_p), spawn myLauncher)
-
-    -- shutdown, restart, etc
-    , ((myModMask .|. myModMask', xK_Delete), spawn "shutdown -P now")
-    , ((myModShiftMask .|. myModMask', xK_Delete), spawn "shutdown -r now")
-
-    -- scratchpads
-    , ((myModMask,      xK_u), myScratchpad "Term 0")
-    , ((myModMask,      xK_i), myScratchpad "Term 1")
-    , ((myModMask,      xK_o), myScratchpad "Term 2")
-    , ((myModMask,      xK_p), myScratchpad "Term 3")
-
-    -- volume keys
-    , ((myModMask, xK_equal),     spawn volUp)
-    , ((myModMask, xK_minus),     spawn volDown)
-    , ((myModMask, xK_BackSpace), spawn volMute)
-
-    -- brightness keys
-    , ((myModMask .|. shiftMask, xK_equal), spawn backlightUp)
-    , ((myModMask .|. shiftMask, xK_minus), spawn backlightDown)
-
-    -- modify gaps on runtime
-    -- , ((myModMask,               xK_F2), incWindowSpacing 1)
-    -- , ((myModMask,               xK_F1), decWindowSpacing 1)
-    -- , ((myModMask .|. shiftMask, xK_F2), incScreenSpacing 1)
-    -- , ((myModMask .|. shiftMask, xK_F1), decScreenSpacing 1)
-
-    -- view prev/next workspaces
-    , ((myModShiftMask,          xK_Tab       ), prevWS)
-    , ((myModMask,               xK_Tab       ), nextWS)
-    , ((myModMask,               xK_semicolon ), prevWS)
-    , ((myModMask,               xK_apostrophe), nextWS)
-    , ((myModMask',              xK_h         ), prevWS)
-    , ((myModMask',              xK_l         ), nextWS)
-
-    -- move to prev/next workspaces
-    , ((myModShiftMask', xK_h         ), shiftToPrev >> prevWS)
-    , ((myModShiftMask', xK_l         ), shiftToNext >> nextWS)
-    , ((myModShiftMask', xK_semicolon ), shiftToPrev >> prevWS)
-    , ((myModShiftMask', xK_apostrophe), shiftToNext >> nextWS)
-
-    -- focus previous/next monitor
-    , ((myModMask, xK_bracketleft ), prevScreen)
-    , ((myModMask, xK_bracketright), nextScreen)
-
-    -- move window to previous/next monitor
-    , ((myModShiftMask, xK_bracketleft ), shiftPrevScreen >> prevScreen)
-    , ((myModShiftMask, xK_bracketright), shiftNextScreen >> nextScreen)
-
-    -- swap different screens
-    , ((myModMask .|. controlMask, xK_bracketleft ), swapPrevScreen >> prevScreen)
-    , ((myModMask .|. controlMask, xK_bracketright), swapNextScreen >> nextScreen)
-
-    -- toggle maximize
-    , ((myModMask, xK_f), withFocused (sendMessage . maximizeRestore))
-
-    -- unfloat windows
-    , ((myModMask .|. shiftMask, xK_f), withFocused $ windows . W.sink)
-
-    -- cycle through windows
-    , ((myModMask', xK_j), windows W.focusDown)
-    , ((myModMask', xK_k), windows W.focusUp)
-
-    -- 2D navigation
-    , ((myModMask,                   xK_l), sendMessage $ Go R)
-    , ((myModMask,                   xK_h), sendMessage $ Go L)
-    , ((myModMask,                   xK_k), sendMessage $ Go U)
-    , ((myModMask,                   xK_j), sendMessage $ Go D)
-    -- swap windows
-    , ((myModShiftMask,              xK_l), sendMessage $ WN.Swap R)
-    , ((myModShiftMask,              xK_h), sendMessage $ WN.Swap L)
-    , ((myModShiftMask,              xK_k), sendMessage $ WN.Swap U)
-    , ((myModShiftMask,              xK_j), sendMessage $ WN.Swap D)
-    -- resize
-    , ((myModMask .|. myModMask',      xK_l), sendMessage $ ExpandTowards R)
-    , ((myModMask .|. myModMask',      xK_h), sendMessage $ ExpandTowards L)
-    , ((myModMask .|. myModMask',      xK_j), sendMessage $ ExpandTowards D)
-    , ((myModMask .|. myModMask',      xK_k), sendMessage $ ExpandTowards U)
-    , ((myModMask .|. myModShiftMask', xK_l), sendMessage $ ShrinkFrom R)
-    , ((myModMask .|. myModShiftMask', xK_h), sendMessage $ ShrinkFrom L)
-    , ((myModMask .|. myModShiftMask', xK_j), sendMessage $ ShrinkFrom D)
-    , ((myModMask .|. myModShiftMask', xK_k), sendMessage $ ShrinkFrom U)
-  ] ++ [
-    -- workspace switching
-    ((myModMask, key), windows $ W.greedyView ws) | (key,ws) <- myWorkspaces
-  ] ++ [
-    -- moving window to workspace
-    ((myModShiftMask, key), windows $ W.shift ws) | (key,ws) <- myWorkspaces
-  ] ++ [
-    -- to swap workspace
-    ((myModShiftMask', key), windows $ swapWithCurrent ws) | (key, ws) <- myWorkspaces
-  ] ++ [
-    -- copy
-    ((m .|. myModMask, key), windows $ f ws) | (key, ws) <- myWorkspaces, (f, m) <- [(copy, myModShiftMask')]
-  ] ++ [
-    -- for not swapping tags while using multihead
-    ((m .|. myModMask, key), windows $ f ws) | (key, ws) <- myWorkspaces, (f, m) <- [(W.view, 0), (W.shift, shiftMask)]
-  ] ++ [ -- directly focus monitors instead of cycling
-    ((m .|. myModMask, key), screenWorkspace sc >>= flip whenJust (windows . f))
-    | (key, sc) <- zip [xK_e, xK_w] [0..]
-    , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]
-  ]
-
-myKeybindingsP :: [(String, X())]
-myKeybindingsP = [
-    -- actions
-    -- TODO: add reboot, shutdown, logout, copy, cut, paste
-    ("M-a w",     spawn wifiOff)
-    , ("M-a S-w",   spawn wifiOn)
-    , ("M-a s",     spawn customScreenshot)
-    , ("M-a S-s",   spawn fullScreenshot)
-    , ("M-a m",     spawn volMute)
-    , ("M-a p",     spawn pausePlay)
-    , ("M-a d",     myScratchpad "arandr")
-    , ("M-a r",     spawn "screenrefresh")
-    , ("M-a S-r",   spawn "screenrefresh -b")
-    -- media
-    , ("M-m w",     myScratchpad "wallpaper")
-    , ("M-S-x",     myScratchpad "wallpaper")
-    , ("M-m o",     spawn "obs")
-    , ("M-S-o",     spawn "obs")
-    , ("M-S-u",     myScratchpad "musicplayer")
-    , ("M-m S-o",   spawn "osu")
-    , ("M-m s",     spawn "syncplay")
-    , ("M-m g",     spawn "gimp")
-    , ("M-m k",     spawn "kdenlive")
-    , ("M-g",       spawn "gimp")
-    , ("M-s-g",     spawn "kdenlive")
-    , ("M-m l",     spawn "lutris")
-    , ("M-m v",     spawn "vlc")
-    , ("M-m m",     spawn "minecraft-launcher")
-    -- system apps/scratchpads
-    , ("M-b t",     spawn myTorrentClient)
-    , ("M-b i",     spawn myBrowser)
-    , ("M-S-i",     spawn myBrowser)
-    , ("M-b d",     myScratchpad "arandr")
-    , ("M-b c",     myScratchpad "calc")
-    , ("M-b b",     myScratchpad "blueman")
-    , ("M-S-b",     myScratchpad "blueman")
-    , ("M-b p",     myScratchpad "pavucontrol")
-    , ("M-x",       myScratchpad "pavucontrol")
-    , ("M-b m",     myScratchpad "BPYTOP")
-    , ("M-S-m",     myScratchpad "BPYTOP")
-    , ("M-b n",     myScratchpad "nmtui")
-    , ("M-S-n",     myScratchpad "nmtui")
-    -- websites
-    , ("M-n y",     spawn $ myBrowser ++ " https://youtube.com")
-    , ("M-n d",     spawn $ myBrowser ++ " https://duckduckgo.com")
-    , ("M-n g",     spawn $ myBrowser ++ " https://google.com")
-    , ("M-n S-g",   spawn $ myBrowser ++ " https://github.com")
-    , ("M-n j",     spawn $ myBrowser ++ " https://www.youtube.com/playlist?list=PL8lRJQHQWddu55nsz8CezmJJ-GRVISZ1E")
-    , ("M-n k",     spawn $ myBrowser ++ " https://www.youtube.com/playlist?list=PL8lRJQHQWddvzCv02lClCfDfUo97wzX1A")
-    , ("M-n c",     spawn $ myBrowser ++ " https://www.youtube.com/playlist?list=PL8lRJQHQWdduy2V0DQQ4Lm0P572XJFVB9")
-    , ("M-n v",     spawn $ myBrowser ++ " https://vidhukant.xyz")
-    , ("M-n m",     spawn $ myBrowser ++ " https://myanimelist.net/profile/0ZeroTsu")
-    -- other apps
-    , ("M-y e",     spawn myTextEditor)
-    , ("M-d",       spawn myTextEditor)
-    , ("M-S-d",     spawn "firejail discord")
-    , ("M-y S-e",   spawn myEmailClient)
-    , ("M-t",       spawn myEmailClient)
-    , ("M-y t",     spawn myTorrentClient)
-    , ("M-S-t",     spawn myTorrentClient)
-    , ("M-y S-t",   spawn "torbrowser-launcher")
-    , ("M-y i",     spawn myBrowser)
-    , ("M-y S-i",   spawn myPrivateBrowser)
-    , ("M-y f",     spawn "firefox")
-    , ("M-y v",     spawn "virt-manager")
-    , ("M-v",       spawn "virt-manager")
-    , ("M-y b",     spawn "brave")
-    , ("M-y p",     spawn myFileManager)
-    , ("M-s",       spawn myFileManager)
-    , ("M-z",       spawn myPasswordManager)
-    , ("M-y S-p",   spawn $ myTerminal' ++ " -e " ++ myFileManager')
-    , ("M-c",       spawn myColorPicker)
-    -- XMonad
-    , ("M-q q",     gridselectWindow myGridSelect >>= flip whenJust (\w -> killWindow w))
-    , ("M-q S-q",   killAll)
-    , ("M-q r",     sendMessage Rotate)
-    , ("M-q t",     sendMessage ToggleStruts)
-    , ("M-q s",     sendMessage BSP.Swap)
-    , ("M-q g",     goToSelected myGridSelect)
-    , ("M-q c",     windows copyToAll)
-    , ("M-q S-c",   killAllOtherCopies)
-    , ("M-q b",     bringSelected myGridSelect)
-    -- gaps
-    , ("M-q x d",   decWindowSpacing 3)
-    , ("M-q x i",   incWindowSpacing 3)
-    , ("M-q x S-d", decScreenSpacing 3)
-    , ("M-q x S-i", incScreenSpacing 3)
-    , ("M-q x b",   setSmartSpacing False)
-    , ("M-q x S-b", setSmartSpacing True)
-    , ("M-q x n",   setWindowSpacingEnabled False)
-    , ("M-q x S-n", setWindowSpacingEnabled True)
-    , ("M-q x m",   setScreenSpacingEnabled False)
-    , ("M-q x S-m", setScreenSpacingEnabled True)
-    -- resize windows
-    , ("M-q h",     sendMessage $ ExpandTowards L)
-    , ("M-q j",     sendMessage $ ExpandTowards D)
-    , ("M-q k",     sendMessage $ ExpandTowards U)
-    , ("M-q l",     sendMessage $ ExpandTowards R)
-    , ("M-q S-h",   sendMessage $ ShrinkFrom L)
-    , ("M-q S-j",   sendMessage $ ShrinkFrom D)
-    , ("M-q S-k",   sendMessage $ ShrinkFrom U)
-    , ("M-q S-l",   sendMessage $ ShrinkFrom R)
-  ]
diff --git a/.config/XMonad/xmonad.hs b/.config/XMonad/xmonad.hs
index 128243a..36c2028 100644
--- a/.config/XMonad/xmonad.hs
+++ b/.config/XMonad/xmonad.hs
@@ -10,8 +10,6 @@ import XMonad.Util.EZConfig
 import XMonad.Util.Run
 
 import Keybindings
---import QwertyKeybindings
-import DvorakKeybindings
 import Defaults
 import Hooks
 
@@ -25,7 +23,7 @@ main = do
     , terminal           = myTerminal
     , borderWidth        = myBorderWidth
     , modMask            = myModMask
-    , workspaces         = myWorkspaceNames
+    , workspaces         = myWorkspaces
     , normalBorderColor  = myBorder
     , focusedBorderColor = myBorder'
     , layoutHook         = myLayoutHook
diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml
new file mode 100644
index 0000000..84d08b2
--- /dev/null
+++ b/.config/alacritty/alacritty.toml
@@ -0,0 +1 @@
+import = ["/home/zt/.config/alacritty/font.toml", "/home/zt/.config/alacritty/keybindings.toml", "/home/zt/.config/alacritty/mouse.toml", "/home/zt/.config/alacritty/shell.toml", "/home/zt/.config/alacritty/window.toml", "/home/zt/.config/alacritty/themes/dracula.toml"]
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
deleted file mode 100644
index f908324..0000000
--- a/.config/alacritty/alacritty.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-import:
-  # settings
-  - ~/.config/alacritty/font.yml
-  - ~/.config/alacritty/keybindings.yml #
-  - ~/.config/alacritty/mouse.yml
-  - ~/.config/alacritty/shell.yml
-  - ~/.config/alacritty/window.yml # window and scrolling
-
-  # themes
-  - ~/.config/alacritty/themes/dracula.yml
diff --git a/.config/alacritty/font.toml b/.config/alacritty/font.toml
new file mode 100644
index 0000000..c2d861e
--- /dev/null
+++ b/.config/alacritty/font.toml
@@ -0,0 +1,25 @@
+[colors]
+draw_bold_text_with_bright_colors = true
+
+[font]
+size = 8.0
+
+[font.bold]
+family = "Source Code Pro"
+style = "Bold"
+
+[font.bold_italic]
+family = "Source Code Pro"
+style = "Bold Italic"
+
+[font.italic]
+family = "Source Code Pro"
+style = "Italic"
+
+[font.normal]
+family = "Source Code Pro"
+style = "Regular"
+
+[font.offset]
+x = 0
+y = -1
diff --git a/.config/alacritty/font.yml b/.config/alacritty/font.yml
deleted file mode 100644
index a410a02..0000000
--- a/.config/alacritty/font.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-font:
-  normal:
-    family: Source Code Pro
-    style: Regular
-
-  bold:
-    family: Source Code Pro
-    style: Bold
-
-  italic:
-    family: Source Code Pro
-    style: Italic
-
-  bold_italic:
-    family: Source Code Pro
-    style: Bold Italic
-
-  # Point size
-  size: 8.0
-
-  offset:
-    x: 0
-    y: -1
-
-# If `true`, bold text is drawn using the bright color variants.
-draw_bold_text_with_bright_colors: true
diff --git a/.config/alacritty/keybindings.toml b/.config/alacritty/keybindings.toml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/alacritty/keybindings.toml
diff --git a/.config/alacritty/keybindings.yml b/.config/alacritty/keybindings.yml
deleted file mode 100644
index 13d31d0..0000000
--- a/.config/alacritty/keybindings.yml
+++ /dev/null
@@ -1,314 +0,0 @@
-# Key bindings
-#
-# Key bindings are specified as a list of objects. For example, this is the
-# default paste binding:
-#
-# `- { key: V, mods: Control|Shift, action: Paste }`
-#
-# Each key binding will specify a:
-#
-# - `key`: Identifier of the key pressed
-#
-#    - A-Z
-#    - F1-F24
-#    - Key0-Key9
-#
-#    A full list with available key codes can be found here:
-#    https://docs.rs/glutin/*/glutin/event/enum.VirtualKeyCode.html#variants
-#
-#    Instead of using the name of the keys, the `key` field also supports using
-#    the scancode of the desired key. Scancodes have to be specified as a
-#    decimal number. This command will allow you to display the hex scancodes
-#    for certain keys:
-#
-#       `showkey --scancodes`.
-#
-# Then exactly one of:
-#
-# - `chars`: Send a byte sequence to the running application
-#
-#    The `chars` field writes the specified string to the terminal. This makes
-#    it possible to pass escape sequences. To find escape codes for bindings
-#    like `PageUp` (`"\x1b[5~"`), you can run the command `showkey -a` outside
-#    of tmux. Note that applications use terminfo to map escape sequences back
-#    to keys. It is therefore required to update the terminfo when changing an
-#    escape sequence.
-#
-# - `action`: Execute a predefined action
-#
-#   - ToggleViMode
-#   - SearchForward
-#       Start searching toward the right of the search origin.
-#   - SearchBackward
-#       Start searching toward the left of the search origin.
-#   - Copy
-#   - Paste
-#   - IncreaseFontSize
-#   - DecreaseFontSize
-#   - ResetFontSize
-#   - ScrollPageUp
-#   - ScrollPageDown
-#   - ScrollHalfPageUp
-#   - ScrollHalfPageDown
-#   - ScrollLineUp
-#   - ScrollLineDown
-#   - ScrollToTop
-#   - ScrollToBottom
-#   - ClearHistory
-#       Remove the terminal's scrollback history.
-#   - Hide
-#       Hide the Alacritty window.
-#   - Minimize
-#       Minimize the Alacritty window.
-#   - Quit
-#       Quit Alacritty.
-#   - ToggleFullscreen
-#   - SpawnNewInstance
-#       Spawn a new instance of Alacritty.
-#   - ClearLogNotice
-#       Clear Alacritty's UI warning and error notice.
-#   - ClearSelection
-#       Remove the active selection.
-#   - ReceiveChar
-#   - None
-#
-# - Vi mode exclusive actions:
-#
-#   - Open
-#       Perform the action of the first matching hint under the vi mode cursor
-#       with `mouse.enabled` set to `true`.
-#   - ToggleNormalSelection
-#   - ToggleLineSelection
-#   - ToggleBlockSelection
-#   - ToggleSemanticSelection
-#       Toggle semantic selection based on `selection.semantic_escape_chars`.
-#
-# - Vi mode exclusive cursor motion actions:
-#
-#   - Up
-#       One line up.
-#   - Down
-#       One line down.
-#   - Left
-#       One character left.
-#   - Right
-#       One character right.
-#   - First
-#       First column, or beginning of the line when already at the first column.
-#   - Last
-#       Last column, or beginning of the line when already at the last column.
-#   - FirstOccupied
-#       First non-empty cell in this terminal row, or first non-empty cell of
-#       the line when already at the first cell of the row.
-#   - High
-#       Top of the screen.
-#   - Middle
-#       Center of the screen.
-#   - Low
-#       Bottom of the screen.
-#   - SemanticLeft
-#       Start of the previous semantically separated word.
-#   - SemanticRight
-#       Start of the next semantically separated word.
-#   - SemanticLeftEnd
-#       End of the previous semantically separated word.
-#   - SemanticRightEnd
-#       End of the next semantically separated word.
-#   - WordLeft
-#       Start of the previous whitespace separated word.
-#   - WordRight
-#       Start of the next whitespace separated word.
-#   - WordLeftEnd
-#       End of the previous whitespace separated word.
-#   - WordRightEnd
-#       End of the next whitespace separated word.
-#   - Bracket
-#       Character matching the bracket at the cursor's location.
-#   - SearchNext
-#       Beginning of the next match.
-#   - SearchPrevious
-#       Beginning of the previous match.
-#   - SearchStart
-#       Start of the match to the left of the vi mode cursor.
-#   - SearchEnd
-#       End of the match to the right of the vi mode cursor.
-#
-# - Search mode exclusive actions:
-#   - SearchFocusNext
-#       Move the focus to the next search match.
-#   - SearchFocusPrevious
-#       Move the focus to the previous search match.
-#   - SearchConfirm
-#   - SearchCancel
-#   - SearchClear
-#       Reset the search regex.
-#   - SearchDeleteWord
-#       Delete the last word in the search regex.
-#   - SearchHistoryPrevious
-#       Go to the previous regex in the search history.
-#   - SearchHistoryNext
-#       Go to the next regex in the search history.
-#
-# - macOS exclusive actions:
-#   - ToggleSimpleFullscreen
-#       Enter fullscreen without occupying another space.
-#
-# - Linux/BSD exclusive actions:
-#
-#   - CopySelection
-#       Copy from the selection buffer.
-#   - PasteSelection
-#       Paste from the selection buffer.
-#
-# - `command`: Fork and execute a specified command plus arguments
-#
-#    The `command` field must be a map containing a `program` string and an
-#    `args` array of command line parameter strings. For example:
-#       `{ program: "alacritty", args: ["-e", "vttest"] }`
-#
-# And optionally:
-#
-# - `mods`: Key modifiers to filter binding actions
-#
-#    - Command
-#    - Control
-#    - Option
-#    - Super
-#    - Shift
-#    - Alt
-#
-#    Multiple `mods` can be combined using `|` like this:
-#       `mods: Control|Shift`.
-#    Whitespace and capitalization are relevant and must match the example.
-#
-# - `mode`: Indicate a binding for only specific terminal reported modes
-#
-#    This is mainly used to send applications the correct escape sequences
-#    when in different modes.
-#
-#    - AppCursor
-#    - AppKeypad
-#    - Search
-#    - Alt
-#    - Vi
-#
-#    A `~` operator can be used before a mode to apply the binding whenever
-#    the mode is *not* active, e.g. `~Alt`.
-#
-# Bindings are always filled by default, but will be replaced when a new
-# binding with the same triggers is defined. To unset a default binding, it can
-# be mapped to the `ReceiveChar` action. Alternatively, you can use `None` for
-# a no-op if you do not wish to receive input characters for that binding.
-#
-# If the same trigger is assigned to multiple actions, all of them are executed
-# in the order they were defined in.
-#key_bindings:
-  #- { key: Paste,                                       action: Paste          }
-  #- { key: Copy,                                        action: Copy           }
-  #- { key: L,         mods: Control,                    action: ClearLogNotice }
-  #- { key: L,         mods: Control, mode: ~Vi|~Search, chars: "\x0c"          }
-  #- { key: PageUp,    mods: Shift,   mode: ~Alt,        action: ScrollPageUp,  }
-  #- { key: PageDown,  mods: Shift,   mode: ~Alt,        action: ScrollPageDown }
-  #- { key: Home,      mods: Shift,   mode: ~Alt,        action: ScrollToTop,   }
-  #- { key: End,       mods: Shift,   mode: ~Alt,        action: ScrollToBottom }
-
-  # Vi Mode
-  #- { key: Space,  mods: Shift|Control, mode: ~Search,    action: ToggleViMode            }
-  #- { key: Space,  mods: Shift|Control, mode: Vi|~Search, action: ScrollToBottom          }
-  #- { key: Escape,                      mode: Vi|~Search, action: ClearSelection          }
-  #- { key: I,                           mode: Vi|~Search, action: ToggleViMode            }
-  #- { key: I,                           mode: Vi|~Search, action: ScrollToBottom          }
-  #- { key: C,      mods: Control,       mode: Vi|~Search, action: ToggleViMode            }
-  #- { key: Y,      mods: Control,       mode: Vi|~Search, action: ScrollLineUp            }
-  #- { key: E,      mods: Control,       mode: Vi|~Search, action: ScrollLineDown          }
-  #- { key: G,                           mode: Vi|~Search, action: ScrollToTop             }
-  #- { key: G,      mods: Shift,         mode: Vi|~Search, action: ScrollToBottom          }
-  #- { key: B,      mods: Control,       mode: Vi|~Search, action: ScrollPageUp            }
-  #- { key: F,      mods: Control,       mode: Vi|~Search, action: ScrollPageDown          }
-  #- { key: U,      mods: Control,       mode: Vi|~Search, action: ScrollHalfPageUp        }
-  #- { key: D,      mods: Control,       mode: Vi|~Search, action: ScrollHalfPageDown      }
-  #- { key: Y,                           mode: Vi|~Search, action: Copy                    }
-  #- { key: Y,                           mode: Vi|~Search, action: ClearSelection          }
-  #- { key: Copy,                        mode: Vi|~Search, action: ClearSelection          }
-  #- { key: V,                           mode: Vi|~Search, action: ToggleNormalSelection   }
-  #- { key: V,      mods: Shift,         mode: Vi|~Search, action: ToggleLineSelection     }
-  #- { key: V,      mods: Control,       mode: Vi|~Search, action: ToggleBlockSelection    }
-  #- { key: V,      mods: Alt,           mode: Vi|~Search, action: ToggleSemanticSelection }
-  #- { key: Return,                      mode: Vi|~Search, action: Open                    }
-  #- { key: K,                           mode: Vi|~Search, action: Up                      }
-  #- { key: J,                           mode: Vi|~Search, action: Down                    }
-  #- { key: H,                           mode: Vi|~Search, action: Left                    }
-  #- { key: L,                           mode: Vi|~Search, action: Right                   }
-  #- { key: Up,                          mode: Vi|~Search, action: Up                      }
-  #- { key: Down,                        mode: Vi|~Search, action: Down                    }
-  #- { key: Left,                        mode: Vi|~Search, action: Left                    }
-  #- { key: Right,                       mode: Vi|~Search, action: Right                   }
-  #- { key: Key0,                        mode: Vi|~Search, action: First                   }
-  #- { key: Key4,   mods: Shift,         mode: Vi|~Search, action: Last                    }
-  #- { key: Key6,   mods: Shift,         mode: Vi|~Search, action: FirstOccupied           }
-  #- { key: H,      mods: Shift,         mode: Vi|~Search, action: High                    }
-  #- { key: M,      mods: Shift,         mode: Vi|~Search, action: Middle                  }
-  #- { key: L,      mods: Shift,         mode: Vi|~Search, action: Low                     }
-  #- { key: B,                           mode: Vi|~Search, action: SemanticLeft            }
-  #- { key: W,                           mode: Vi|~Search, action: SemanticRight           }
-  #- { key: E,                           mode: Vi|~Search, action: SemanticRightEnd        }
-  #- { key: B,      mods: Shift,         mode: Vi|~Search, action: WordLeft                }
-  #- { key: W,      mods: Shift,         mode: Vi|~Search, action: WordRight               }
-  #- { key: E,      mods: Shift,         mode: Vi|~Search, action: WordRightEnd            }
-  #- { key: Key5,   mods: Shift,         mode: Vi|~Search, action: Bracket                 }
-  #- { key: Slash,                       mode: Vi|~Search, action: SearchForward           }
-  #- { key: Slash,  mods: Shift,         mode: Vi|~Search, action: SearchBackward          }
-  #- { key: N,                           mode: Vi|~Search, action: SearchNext              }
-  #- { key: N,      mods: Shift,         mode: Vi|~Search, action: SearchPrevious          }
-
-  # Search Mode
-  #- { key: Return,                mode: Search|Vi,  action: SearchConfirm         }
-  #- { key: Escape,                mode: Search,     action: SearchCancel          }
-  #- { key: C,      mods: Control, mode: Search,     action: SearchCancel          }
-  #- { key: U,      mods: Control, mode: Search,     action: SearchClear           }
-  #- { key: W,      mods: Control, mode: Search,     action: SearchDeleteWord      }
-  #- { key: P,      mods: Control, mode: Search,     action: SearchHistoryPrevious }
-  #- { key: N,      mods: Control, mode: Search,     action: SearchHistoryNext     }
-  #- { key: Up,                    mode: Search,     action: SearchHistoryPrevious }
-  #- { key: Down,                  mode: Search,     action: SearchHistoryNext     }
-  #- { key: Return,                mode: Search|~Vi, action: SearchFocusNext       }
-  #- { key: Return, mods: Shift,   mode: Search|~Vi, action: SearchFocusPrevious   }
-
-  # (Windows, Linux, and BSD only)
-  #- { key: V,              mods: Control|Shift, mode: ~Vi,        action: Paste            }
-  #- { key: C,              mods: Control|Shift,                   action: Copy             }
-  #- { key: F,              mods: Control|Shift, mode: ~Search,    action: SearchForward    }
-  #- { key: B,              mods: Control|Shift, mode: ~Search,    action: SearchBackward   }
-  #- { key: C,              mods: Control|Shift, mode: Vi|~Search, action: ClearSelection   }
-  #- { key: Insert,         mods: Shift,                           action: PasteSelection   }
-  #- { key: Key0,           mods: Control,                         action: ResetFontSize    }
-  #- { key: Equals,         mods: Control,                         action: IncreaseFontSize }
-  #- { key: Plus,           mods: Control,                         action: IncreaseFontSize }
-  #- { key: NumpadAdd,      mods: Control,                         action: IncreaseFontSize }
-  #- { key: Minus,          mods: Control,                         action: DecreaseFontSize }
-  #- { key: NumpadSubtract, mods: Control,                         action: DecreaseFontSize }
-
-  # (Windows only)
-  #- { key: Return,   mods: Alt,           action: ToggleFullscreen }
-
-  # (macOS only)
-  #- { key: K,              mods: Command, mode: ~Vi|~Search, chars: "\x0c"                 }
-  #- { key: K,              mods: Command, mode: ~Vi|~Search, action: ClearHistory          }
-  #- { key: Key0,           mods: Command,                    action: ResetFontSize         }
-  #- { key: Equals,         mods: Command,                    action: IncreaseFontSize      }
-  #- { key: Plus,           mods: Command,                    action: IncreaseFontSize      }
-  #- { key: NumpadAdd,      mods: Command,                    action: IncreaseFontSize      }
-  #- { key: Minus,          mods: Command,                    action: DecreaseFontSize      }
-  #- { key: NumpadSubtract, mods: Command,                    action: DecreaseFontSize      }
-  #- { key: V,              mods: Command,                    action: Paste                 }
-  #- { key: C,              mods: Command,                    action: Copy                  }
-  #- { key: C,              mods: Command, mode: Vi|~Search,  action: ClearSelection        }
-  #- { key: H,              mods: Command,                    action: Hide                  }
-  #- { key: H,              mods: Command|Alt,                action: HideOtherApplications }
-  #- { key: M,              mods: Command,                    action: Minimize              }
-  #- { key: Q,              mods: Command,                    action: Quit                  }
-  #- { key: W,              mods: Command,                    action: Quit                  }
-  #- { key: N,              mods: Command,                    action: SpawnNewInstance      }
-  #- { key: F,              mods: Command|Control,            action: ToggleFullscreen      }
-  #- { key: F,              mods: Command, mode: ~Search,     action: SearchForward         }
-  #- { key: B,              mods: Command, mode: ~Search,     action: SearchBackward        }
diff --git a/.config/alacritty/mouse.toml b/.config/alacritty/mouse.toml
new file mode 100644
index 0000000..f65083c
--- /dev/null
+++ b/.config/alacritty/mouse.toml
@@ -0,0 +1,6 @@
+[mouse]
+hide_when_typing = false
+
+[[mouse.bindings]]
+action = "PasteSelection"
+mouse = "Middle"
diff --git a/.config/alacritty/mouse.yml b/.config/alacritty/mouse.yml
deleted file mode 100644
index 31cd6ae..0000000
--- a/.config/alacritty/mouse.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-mouse:
-  double_click: { threshold: 300 }
-  triple_click: { threshold: 300 }
-
-  # If this is `true`, the cursor is temporarily hidden when typing.
-  hide_when_typing: false
-
-# Mouse bindings
-#
-# Mouse bindings are specified as a list of objects, much like the key
-# bindings further below.
-#
-# To trigger mouse bindings when an application running within Alacritty
-# captures the mouse, the `Shift` modifier is automatically added as a
-# requirement.
-#
-# Each mouse binding will specify a:
-#
-# - `mouse`:
-#
-#   - Middle
-#   - Left
-#   - Right
-#   - Numeric identifier such as `5`
-#
-# - `action` (see key bindings)
-#
-# And optionally:
-#
-# - `mods` (see key bindings)
-mouse_bindings:
-  - { mouse: Middle, action: PasteSelection }
diff --git a/.config/alacritty/shell.toml b/.config/alacritty/shell.toml
new file mode 100644
index 0000000..6c4fb7b
--- /dev/null
+++ b/.config/alacritty/shell.toml
@@ -0,0 +1,4 @@
+working_directory = "None"
+
+[shell]
+program = "/bin/fish"
diff --git a/.config/alacritty/shell.yml b/.config/alacritty/shell.yml
deleted file mode 100644
index e6425df..0000000
--- a/.config/alacritty/shell.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-shell:
-  program: /bin/fish
-#  program: /bin/fish
-#  args:
-#    - --login
-
-# Startup directory
-#
-# Directory the shell is started in. If this is unset, or `None`, the working
-# directory of the parent process will be used.
-working_directory: None
diff --git a/.config/alacritty/themes/dracula.toml b/.config/alacritty/themes/dracula.toml
new file mode 100644
index 0000000..1afe74d
--- /dev/null
+++ b/.config/alacritty/themes/dracula.toml
@@ -0,0 +1,57 @@
+[colors.bright]
+black = "0x4d4d4d"
+blue = "0xcaa9fa"
+cyan = "0x9aedfe"
+green = "0x5af78e"
+magenta = "0xff92d0"
+red = "0xff6e67"
+white = "0xe6e6e6"
+yellow = "0xf4f99d"
+
+[colors.cursor]
+cursor = "CellForeground"
+text = "CellBackground"
+
+[colors.dim]
+black = "0x14151b"
+blue = "0x4d5b86"
+cyan = "0x59dffc"
+green = "0x1ef956"
+magenta = "0xff46b0"
+red = "0xff2222"
+white = "0xe6e6d1"
+yellow = "0xebf85b"
+
+[colors.line_indicator]
+background = "None"
+foreground = "None"
+
+[colors.normal]
+black = "0x0e0a10"
+blue = "0xbd93f9"
+cyan = "0x8be9fd"
+green = "0x50fa7b"
+magenta = "0xff79c6"
+red = "0xff5555"
+white = "0xbfbfbf"
+yellow = "0xf1fa8c"
+
+[colors.primary]
+background = "0x0e0911"
+foreground = "0xf8f8f2"
+
+[colors.search.focused_match]
+background = "0xffb86c"
+foreground = "0x44475a"
+
+[colors.search.matches]
+background = "0x50fa7b"
+foreground = "0x44475a"
+
+[colors.selection]
+background = "0x44475a"
+text = "CellForeground"
+
+[colors.vi_mode_cursor]
+cursor = "CellForeground"
+text = "CellBackground"
diff --git a/.config/alacritty/themes/dracula.yml b/.config/alacritty/themes/dracula.yml
deleted file mode 100644
index f17f5fa..0000000
--- a/.config/alacritty/themes/dracula.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-colors:
-  primary:
-    # background: '0x282a36'
-    #background: '0x100b13'
-    background: '0x0e0911'
-      # background: '0x1D1F21'
-    foreground: '0xf8f8f2'
-  cursor:
-    text: CellBackground
-    cursor: CellForeground
-  vi_mode_cursor:
-    text: CellBackground
-    cursor: CellForeground
-  search:
-    matches:
-      foreground: '0x44475a'
-      background: '0x50fa7b'
-    focused_match:
-      foreground: '0x44475a'
-      background: '0xffb86c'
-  bar:
-    background: '0x282a36'
-    foreground: '0xf8f8f2'
-  line_indicator:
-    foreground: None
-    background: None
-  selection:
-    text: CellForeground
-    background: '0x44475a'
-  normal:
-    black:   '0x0e0a10'
-    red:     '0xff5555'
-    green:   '0x50fa7b'
-    yellow:  '0xf1fa8c'
-    blue:    '0xbd93f9'
-    magenta: '0xff79c6'
-    cyan:    '0x8be9fd'
-    white:   '0xbfbfbf'
-  bright:
-    black:   '0x4d4d4d'
-    red:     '0xff6e67'
-    green:   '0x5af78e'
-    yellow:  '0xf4f99d'
-    blue:    '0xcaa9fa'
-    magenta: '0xff92d0'
-    cyan:    '0x9aedfe'
-    white:   '0xe6e6e6'
-  dim:
-    black:   '0x14151b'
-    red:     '0xff2222'
-    green:   '0x1ef956'
-    yellow:  '0xebf85b'
-    blue:    '0x4d5b86'
-    magenta: '0xff46b0'
-    cyan:    '0x59dffc'
-    white:   '0xe6e6d1'
diff --git a/.config/alacritty/window.toml b/.config/alacritty/window.toml
new file mode 100644
index 0000000..843f080
--- /dev/null
+++ b/.config/alacritty/window.toml
@@ -0,0 +1,18 @@
+[scrolling]
+history = 20000
+
+[window]
+decorations = "full"
+dynamic_padding = false
+dynamic_title = true
+opacity = 0.7
+startup_mode = "Windowed"
+title = "Alacritty"
+
+[window.class]
+general = "Alacritty"
+instance = "Alacritty"
+
+[window.padding]
+x = 0
+y = 0
diff --git a/.config/alacritty/window.yml b/.config/alacritty/window.yml
deleted file mode 100644
index d35f991..0000000
--- a/.config/alacritty/window.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-window:
-  opacity: 0.7
-  # Window dimensions (changes require restart)
-  #
-  # Number of lines/columns (not pixels) in the terminal. The number of columns
-  # must be at least `2`, while using a value of `0` for columns and lines will
-  # fall back to the window manager's recommended size.
-  #dimensions:
-  #  columns: 0
-  #  lines: 0
-
-  # Window position (changes require restart)
-  #
-  # Specified in number of pixels.
-  # If the position is not set, the window manager will handle the placement.
-  #position:
-  #  x: 0
-  #  y: 0
-
-  # Window padding (changes require restart)
-  #
-  # Blank space added around the window in pixels. This padding is scaled
-  # by DPI and the specified value is always added at both opposing sides.
-  padding:
-    x: 0
-    y: 0
-
-  # Spread additional padding evenly around the terminal content.
-  dynamic_padding: false
-
-  # Window decorations
-  #
-  # Values for `decorations`:
-  #     - full: Borders and title bar
-  #     - none: Neither borders nor title bar
-  #
-  # Values for `decorations` (macOS only):
-  #     - transparent: Title bar, transparent background and title bar buttons
-  #     - buttonless: Title bar, transparent background and no title bar buttons
-  decorations: full
-
-  startup_mode: Windowed
-
-  title: Alacritty
-  dynamic_title: true
-
-  # Window class (Linux/BSD only):
-  class:
-    instance: Alacritty
-    general: Alacritty
-
-  # GTK theme variant (Linux/BSD only)
-  #
-  # Override the variant of the GTK theme. Commonly supported values are `dark`
-  # and `light`. Set this to `None` to use the default theme variant.
-  #gtk_theme_variant: None
-
-scrolling:
-  # Maximum number of lines in the scrollback buffer.
-  # Specifying '0' will disable scrolling.
-  history: 20000
-
-  # Scrolling distance multiplier.
-  #multiplier: 3