diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 50378f3..779de37 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -16,19 +16,23 @@
   "mason-lspconfig.nvim": { "branch": "main", "commit": "3ba1b92b771f33256b4969d696b82c8ae7075364" },
   "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" },
   "neogit": { "branch": "master", "commit": "38dd297a905ec6869f4c20ea9184a3e514316e3b" },
+  "none-ls.nvim": { "branch": "main", "commit": "cf81e765460f722a381e5f3f5e3cbdce88398517" },
   "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" },
   "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
   "nvim-lspconfig": { "branch": "master", "commit": "7eed8b2150192e5ad05e1886fdf133493ddf2928" },
+  "nvim-neoclip.lua": { "branch": "main", "commit": "798cd0592a81c185465db3a091a0ff8a21af60fd" },
   "nvim-snippy": { "branch": "master", "commit": "8e4e39a4bf5f8939fcf4898d1fba48d1d1f72303" },
   "nvim-tree.lua": { "branch": "master", "commit": "59e65d88db177ad1e6a8cffaafd4738420ad20b6" },
   "nvim-treesitter": { "branch": "master", "commit": "07c8c3d84f67b1530f636dcad31971f569a3df5f" },
   "nvim-web-devicons": { "branch": "master", "commit": "140edfcf25093e8b321d13e154cbce89ee868ca0" },
   "oil.nvim": { "branch": "master", "commit": "dd432e76d01eda08b8658415588d011009478469" },
   "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
+  "sqlite.lua": { "branch": "master", "commit": "b7e28c8463254c46a8e61c52d27d6a2040492fc3" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
   "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" },
   "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
   "telescope.nvim": { "branch": "master", "commit": "da8b3d485975a8727bea127518b65c980521ae22" },
+  "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
   "tree-sitter-hypr": { "branch": "master", "commit": "42aa7274b5f093cec92b7a5bab629ba26b4be439" },
   "trim.nvim": { "branch": "master", "commit": "629b96a303a3a0bb5fd050e6cd9d627ca7831cc7" },
   "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua
index d946c90..75337e9 100644
--- a/nvim/lua/plugins/init.lua
+++ b/nvim/lua/plugins/init.lua
@@ -6,7 +6,7 @@ return {
     {'windwp/nvim-autopairs', event = "InsertEnter", opts = {}},
     {'NeogitOrg/neogit', dependencies = {"nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim", "sindrets/diffview.nvim"}, config = true, lazy = true},
     {'akinsho/bufferline.nvim', version = "*", dependencies = 'nvim-tree/nvim-web-devicons'},
-    {'folke/trouble.nvim', dependencies = {"nvim-tree/nvim-web-devicons"}, config = function () require('trouble').setup() end, lazy = true},
     {'lervag/vimtex', ft='latex'},
     {'numToStr/Comment.nvim', config = function () require('Comment').setup() end},
+    { "folke/todo-comments.nvim", dependencies = { "nvim-lua/plenary.nvim" }, opts = {} }
 }
diff --git a/nvim/lua/plugins/neoclip.lua b/nvim/lua/plugins/neoclip.lua
new file mode 100644
index 0000000..f9cc419
--- /dev/null
+++ b/nvim/lua/plugins/neoclip.lua
@@ -0,0 +1,26 @@
+return {
+    "AckslD/nvim-neoclip.lua",
+    dependencies = {
+        'nvim-telescope/telescope.nvim',
+        {'kkharji/sqlite.lua', module = 'sqlite'},
+    },
+    opts = {
+        continuous_sync = true,
+        enable_persistent_history = true,
+        keys = {
+            telescope = {
+                i = {
+                    paste = "<cr>",
+                    paste_behind = "<S-cr>",
+                },
+                n = {
+                    paste = "<cr>",
+                    paste_behind = "<S-cr>",
+                }
+            },
+        }
+    },
+    keys = {
+        {'<leader>c', '<cmd>Telescope neoclip<cr>'},
+    },
+}
diff --git a/nvim/lua/plugins/none-ls.lua b/nvim/lua/plugins/none-ls.lua
new file mode 100644
index 0000000..5f3afaf
--- /dev/null
+++ b/nvim/lua/plugins/none-ls.lua
@@ -0,0 +1,21 @@
+return {
+    "nvimtools/none-ls.nvim",
+    dependencies = { "mason.nvim", "nvim-lua/plenary.nvim" },
+    config = function()
+        local null_ls = require("null-ls")
+        null_ls.setup({
+            root_dir = require("null-ls.utils").root_pattern(".git", "Makefile", "CMakeLists.txt", "build/", "meson.build"),
+            sources = {
+                null_ls.builtins.completion.spell,
+                null_ls.builtins.code_actions.proselint,
+                null_ls.builtins.diagnostics.proselint,
+                null_ls.builtins.diagnostics.codespell,
+                null_ls.builtins.diagnostics.shellcheck,
+                null_ls.builtins.formatting.shellharden,
+                null_ls.builtins.formatting.shfmt,
+                -- null_ls.builtins.diagnostics.cppcheck,
+                null_ls.builtins.diagnostics.selene
+            }
+        })
+    end,
+}
diff --git a/nvim/lua/plugins/trouble.lua b/nvim/lua/plugins/trouble.lua
new file mode 100644
index 0000000..dda294d
--- /dev/null
+++ b/nvim/lua/plugins/trouble.lua
@@ -0,0 +1,12 @@
+return {
+    'folke/trouble.nvim',
+    dependencies = {"nvim-tree/nvim-web-devicons"},
+    opts = {
+        action_keys = {
+            close = {"q", "<Esc>"},
+            jump = {"<cr>"},
+            toggle_fold = {"<tab>"},
+        }
+    },
+    lazy = true
+}
diff --git a/nvim/selene.toml b/nvim/selene.toml
new file mode 100644
index 0000000..6540d6f
--- /dev/null
+++ b/nvim/selene.toml
@@ -0,0 +1 @@
+std="lua51+vim"
diff --git a/nvim/vim.toml b/nvim/vim.toml
new file mode 100644
index 0000000..0fa5c4f
--- /dev/null
+++ b/nvim/vim.toml
@@ -0,0 +1,2 @@
+[vim]
+any = true
diff --git a/zsh/.zshrc b/zsh/.zshrc
index fa9616f..a565b06 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -189,3 +189,5 @@ alias python=python3
 alias r=". ranger"
 alias cpr=rsync --archive -hh --partial --info=stats1,progress2 --modify-window=1
 alias mvr=rsync --archive -hh --partial --info=stats1,progress2 --modify-window=1 --remove-source-files
+alias rg="rg --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'"
+alias ag="rg --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'"