diff --git a/.clang-tidy b/.clang-tidy
new file mode 100644
index 0000000..f143fe9
--- /dev/null
+++ b/.clang-tidy
@@ -0,0 +1,23 @@
+Checks: "*,
+        -abseil-*,
+        -altera-*,
+        -android-*,
+        -fuchsia-*,
+        -google-*,
+        -llvm*,
+        -zircon-*,
+        -bugprone-easily-swappable-parameters
+        -readability-identifier-length
+        -readability-avoid-const-params-in-decls,
+        -readability-magic-numbers
+        -bugprone-narrowing-conversions
+        -modernize-use-trailing-return-type
+        -cppcoreguidelines-pro-type-union-access
+        -modernize-use-nodiscard
+        -cppcoreguidelines-narrowing-conversions
+        -cppcoreguidelines-avoid-magic-numbers
+        -Wsign-compare
+"
+WarningsAsErrors: ''
+HeaderFilterRegex: ''
+FormatStyle:     none
diff --git a/awesome/keys.lua b/awesome/keys.lua
index 1239ea2..f8ea87a 100644
--- a/awesome/keys.lua
+++ b/awesome/keys.lua
@@ -137,6 +137,13 @@ keys.globalkeys = gears.table.join(
         end,
         {description = "Open Firefox", group = "launcher"}
     ),
+    -- Lock the screen
+    awful.key({"Control", "Mod1"}, "l",
+       function()
+          awful.spawn('bash -c "i3lockr --blur 25"')
+       end,
+       {description = "Open Firefox", group = "launcher"}
+    ),
     -- Generate IMEC TOTP
     awful.key({modkey}, "i",
         function()
diff --git a/awesome/rc.lua b/awesome/rc.lua
index 7d55b13..edce233 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -19,7 +19,7 @@ local awful = require("awful")
 -- define default apps (global variable so other components can access it)
 apps = {
     terminal = 'bash -c "WINIT_X11_SCALE_FACTOR=1 alacritty"',
-    lock = "i3lock",
+    launcher = "/home/user/.toggle_rofi.sh",
     screenshot = "scrot -e 'mv $f ~/Pictures/Screenshots/ 2>/dev/null'",
 }
 
diff --git a/nvim/lua/lsp_config.lua b/nvim/lua/lsp_config.lua
index de45c5d..e314044 100644
--- a/nvim/lua/lsp_config.lua
+++ b/nvim/lua/lsp_config.lua
@@ -112,8 +112,15 @@ require('lspconfig').clangd.setup {
         "clangd",
         "--background-index",
         "--clang-tidy",
+        "-j=8",
+        "--clang-tidy-checks=*",
+        "--all-scopes-completion",
         "--completion-style=bundled",
-        "--cross-file-rename"
+        "--cross-file-rename",
+        "--completion-style=detailed",
+        "--header-insertion-decorators",
+        "--header-insertion=iwyu",
+        "--pch-storage=memory"
     }
 }
 
diff --git a/nvim/spell/ltex.dictionary.en-GB.txt b/nvim/spell/ltex.dictionary.en-GB.txt
index fe82711..a11c048 100644
--- a/nvim/spell/ltex.dictionary.en-GB.txt
+++ b/nvim/spell/ltex.dictionary.en-GB.txt
@@ -31,3 +31,5 @@ Ctheah
 TODO
 artifacts
 stochasticity
+playthrough
+StateManager