diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e596fad9bd..e54324c8c9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,6 +28,7 @@ jobs:
         run: |
           rustup set profile minimal
           rustup update stable
+          rustup component add clippy
           rustup target add wasm32-wasi
 
       - name: Install Node
@@ -39,7 +40,10 @@ jobs:
         uses: actions/checkout@v2
         with:
           clean: false
-
+          
+      - name: Run clippy
+        run: cargo clippy --workspace -- -D warnings
+        
       - name: Run tests
         run: cargo test --workspace --no-fail-fast
     
diff --git a/assets/settings/default.json b/assets/settings/default.json
index 33eb64e201..9cf915d1a6 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -145,5 +145,22 @@
             "tab_size": 2
         }
     },
-    "lsp": {}
+    //LSP Specific settings.
+    "lsp": {
+        //Specify the LSP name as a key here.
+        //As of 8/10/22, supported LSPs are:
+        //pyright
+        //gopls
+        //rust-analyzer
+        //typescript-language-server
+        //vscode-json-languageserver
+        "rust_analyzer": {
+            //These initialization options are merged into Zed's defaults
+            "initialization_options": {
+                "checkOnSave": {
+                    "command": "clippy"
+                }
+            }
+        }
+    }
 }