diff --git a/eww-bar/.config/eww-bar/eww.yuck b/eww-bar/.config/eww-bar/eww.yuck
index 5dec78f..5271a34 100644
--- a/eww-bar/.config/eww-bar/eww.yuck
+++ b/eww-bar/.config/eww-bar/eww.yuck
@@ -115,7 +115,7 @@
 
 
 (defwindow bar_1
-  :monitor 1
+  :monitor "DisplayPort-0"
   :stacking "bg"
   :geometry (geometry :x 0 :y 0 :width "40px" :height "100%")
   :anchor "top left"
@@ -123,7 +123,7 @@
   (bar :screen 1))
 
 (defwindow bar_2
-  :monitor 2
+  :monitor "HDMI-A-1"
   :geometry (geometry :x 0 :y 0 :width "40px" :height "100%")
   :anchor "top left"
   :reserve (struts :distance "40px" :side "left")
diff --git a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
index c6fbf2e..bdc85c3 100644
--- a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
@@ -119,7 +119,9 @@
                      :server {:on_attach on_attach
                               :capabilities default-capabilities
                               :settings {:rust-analyzer {:cargo {:loadOutDirsFromCheck true}
-                                                         :procMacro {:enable true}}}}}))
+                                                         :procMacro {:enable true}
+                                                         :diagnostics {:enable false ;; native rust analyzer diagnostics
+                                                                       :experimental {:enable false}}}}}}))
                               
                               ;:cmd ["/home/leon/coding/prs/rust-analyzer/target/release/rust-analyzer"]}}))
 
diff --git a/xmonad/.xmonad/lib/Config.hs b/xmonad/.xmonad/lib/Config.hs
index f4e06c3..2081449 100644
--- a/xmonad/.xmonad/lib/Config.hs
+++ b/xmonad/.xmonad/lib/Config.hs
@@ -257,7 +257,7 @@ myStartupHook = do
   --spawnOnce "/home/leon/Downloads/picom --config /home/leon/.config/picom.conf --experimental-backends --backend xrender"  --no-fading-openclose"
   spawnOnce "/home/leon/Downloads/picom-epic-animations --config /home/leon/.config/picom.conf --experimental-backends --animations --animation-stiffness 200 --animation-dampening 20" --backend glx"  --no-fading-openclose"
   --spawn "/home/leon/.config/polybar/launch.sh"
-  setupPolybarOn "DisplayPort-0"
+  setupPolybarOn "DisplayPort-1"
   spawnOnce "eww -c /home/leon/.config/eww-bar open-many bar_2 bar_1 &"
   spawn "xsetroot -cursor_name left_ptr"
   spawnOnce "nitrogen --restore"
@@ -294,6 +294,9 @@ removedKeys :: [String]
 removedKeys = ["M-<Tab>", "M-S-c", "M-S-q", "M-h", "M-l", "M-j", "M-k", "M-S-<Return>", "M-S-j", "M-S-k"]
   ++ [key ++ show n | key <- ["M-", "M-S-", "M-C-"], n <- [1..9 :: Int]]
 
+screenIndexMain = 0
+screenIndexVert = 1
+screenIndexTop  = 2
 
 myKeys :: [(String, X ())]
 myKeys = concat [ zoomRowBindings, tabbedBindings, multiMonitorBindings, programLaunchBindings, miscBindings, windowControlBindings, workspaceBindings ]
@@ -329,12 +332,12 @@ myKeys = concat [ zoomRowBindings, tabbedBindings, multiMonitorBindings, program
 
   multiMonitorBindings :: [(String, X ())]
   multiMonitorBindings =
-    [ ("M-a",   windows $ IS.focusScreen 0)
-    , ("M-s",   windows $ IS.focusScreen 2)
-    , ("M-d",   windows $ IS.focusScreen 1)
-    , ("M-S-a", windows $ IS.withWspOnScreen 0 (\wsp -> W.view wsp . W.shift wsp))
-    , ("M-S-s", windows $ IS.withWspOnScreen 2 (\wsp -> W.view wsp . W.shift wsp))
-    , ("M-S-d", windows $ IS.withWspOnScreen 1 (\wsp -> W.view wsp . W.shift wsp))
+    [ ("M-a",   windows $ IS.focusScreen screenIndexVert)
+    , ("M-s",   windows $ IS.focusScreen screenIndexTop)
+    , ("M-d",   windows $ IS.focusScreen screenIndexMain)
+    , ("M-S-a", windows $ IS.withWspOnScreen screenIndexVert (\wsp -> W.view wsp . W.shift wsp))
+    , ("M-S-s", windows $ IS.withWspOnScreen screenIndexTop (\wsp -> W.view wsp . W.shift wsp))
+    , ("M-S-d", windows $ IS.withWspOnScreen screenIndexMain (\wsp -> W.view wsp . W.shift wsp))
     , ("M-C-s", windows swapScreenContents)
     ]