diff --git a/.gitignore b/.gitignore
index 6377d07..ed2e210 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,6 @@ transient/
 
 bookmarks
 .last-package-update-day
+.lsp*
 org-roam.db*
 .org-id-locations
diff --git a/.lsp-session-v1 b/.lsp-session-v1
deleted file mode 100644
index 704db90..0000000
--- a/.lsp-session-v1
+++ /dev/null
@@ -1 +0,0 @@
-#s(lsp-session ("/home/devraza/Projects/Rust/hello-world") nil #s(hash-table size 65 test equal rehash-size 1.5 rehash-threshold 0.8125 data ()) #s(hash-table size 65 test equal rehash-size 1.5 rehash-threshold 0.8125 data ()) #s(hash-table size 65 test equal rehash-size 1.5 rehash-threshold 0.8125 data ()))
\ No newline at end of file
diff --git a/lisp/editor.el b/lisp/editor.el
index b56d842..609c181 100644
--- a/lisp/editor.el
+++ b/lisp/editor.el
@@ -67,7 +67,7 @@
   (general-evil-setup t)
   :init
   (general-create-definer diancite/leaders
-			  :prefix leader-key))
+    :prefix leader-key))
 
 (diancite/leaders
  :keymaps 'normal
diff --git a/lisp/keybinds.el b/lisp/keybinds.el
index 6869f41..d64a78f 100644
--- a/lisp/keybinds.el
+++ b/lisp/keybinds.el
@@ -18,3 +18,19 @@
  "m s" '(magit-status :wk "Status")
  "m d" '(magit-dispatch :wk "Dispatch")
  "m f" '(magit-status :wk "File Dispatch"))
+
+
+;; Flymake & LSP
+(general-create-definer diancite/lsp
+  :prefix leader-key)
+
+(diancite/lsp
+ :keymaps 'normal
+ "l" '(:wk "LSP")
+ "l n" '(flymake-goto-next-error :wk "Next Error")
+ "l p" '(flymake-goto-prev-error :wk "Previous Error")
+ "l f" '(eglot-format :wk "Format Buffer")
+
+ "l w" '(:wk "Server")
+ "l w r" '('eglot-shutdown :wk "Restart Server")
+ "l w q" '('eglot-reconnect :wk "Shutdown Server"))
diff --git a/lisp/languages.el b/lisp/languages.el
index 5457f74..801917b 100644
--- a/lisp/languages.el
+++ b/lisp/languages.el
@@ -3,7 +3,8 @@
 ;; Markdown
 (use-package markdown-mode)
 
-(use-package flycheck)
+;; Diagnostics
+(use-package flymake)
 
 ;; eglot - Language Server Protocol ingegration
 (use-package eglot)