summaryrefslogtreecommitdiff
path: root/.config
diff options
context:
space:
mode:
Diffstat (limited to '.config')
-rw-r--r--.config/fish/config.fish1
-rw-r--r--.config/nvim/lazy-lock.json38
-rw-r--r--.config/nvim/lua/plugins/catppuccin.lua1
-rw-r--r--.config/nvim/lua/plugins/cmp.lua4
-rw-r--r--.config/nvim/lua/plugins/editor.lua1
-rw-r--r--.config/nvim/lua/plugins/illuminate.lua15
-rw-r--r--.config/nvim/lua/plugins/lsp.lua22
7 files changed, 20 insertions, 62 deletions
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 5d33399..5cce240 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -5,6 +5,7 @@ end
alias ls exa
alias parallel parallel-moreutils
+alias cfg 'git --git-dir $HOME/.cfg --work-tree $HOME'
# pnpm
set -gx PNPM_HOME "/home/samn/.local/share/pnpm"
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 8099aee..887bb09 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,8 +1,8 @@
{
"FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
- "LuaSnip": { "branch": "master", "commit": "a658ae2906344a1d2b9c507738e585cf68e685c7" },
- "bufferline.nvim": { "branch": "main", "commit": "2f391fde91b9c3876eee359ee24cc352050e5e48" },
- "catppuccin": { "branch": "main", "commit": "cc8d3abc944d78cb6bf2a4cc88871ab383c4da62" },
+ "LuaSnip": { "branch": "master", "commit": "45a4e899ca8f54936fe32ead6bba65f2a8d42e12" },
+ "bufferline.nvim": { "branch": "main", "commit": "cd27a52ecdfed7f14a41b61b7976f155e3d593c7" },
+ "catppuccin": { "branch": "main", "commit": "3ffd2f511f3dc6c01258923d7170ccaf1445634b" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
"cmp-conjure": { "branch": "master", "commit": "d97816d5007be2b060f3a4e09f5b144d97d96fe8" },
@@ -14,49 +14,49 @@
"comment.nvim": { "branch": "master", "commit": "176e85eeb63f1a5970d6b88f1725039d85ca0055" },
"conjure": { "branch": "master", "commit": "31a1626273e2bab479b6b8416a137f9edaba7daa" },
"dashboard-nvim": { "branch": "master", "commit": "ab84915f7cfd7bc7a5bfe7409c3eccf8d09c162a" },
- "diffview.nvim": { "branch": "main", "commit": "94f5f40543e393d9028bae9ce2fedf6da3af701a" },
+ "diffview.nvim": { "branch": "main", "commit": "b0cc22f5708f6b2b4f873b44fbc5eb93020f4e0c" },
"dressing.nvim": { "branch": "master", "commit": "e6eff7a5a950a853c3903d906dbcea03f778db5f" },
"fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
"flit.nvim": { "branch": "main", "commit": "5c9a78b97f7f4301473ea5e37501b5b1d4da167b" },
- "friendly-snippets": { "branch": "main", "commit": "a94db1ee6ddfd238e725b0f90163fdd65d382464" },
- "gitsigns.nvim": { "branch": "main", "commit": "dc2962f7fce953a2a98e7c6d3d7fc4c1d1f66758" },
+ "friendly-snippets": { "branch": "main", "commit": "6e0afe3be0ba43ef03d495a529de8fb22721c0d0" },
+ "gitsigns.nvim": { "branch": "main", "commit": "48c3ae8ec74cb83f9570ceb0c5ab8217db7a2220" },
"hlsearch.nvim": { "branch": "main", "commit": "eea3f8010e739c7694ceafe800d60caba0f896c6" },
- "indent-blankline.nvim": { "branch": "master", "commit": "73640233cca0da8e01aced8c1f9e63fd892128b7" },
- "lazy.nvim": { "branch": "main", "commit": "5af331ea65418dc9361769891921fdee4bcc837a" },
+ "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" },
+ "lazy.nvim": { "branch": "main", "commit": "da8b00581a52f5f87ad2aba9f52171fda7491f18" },
"leap.nvim": { "branch": "main", "commit": "8facf2eb6a378fd7691dce8c8a7b2726823e2408" },
"lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
"markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
"mini.ai": { "branch": "main", "commit": "5218ea75e635df78a807bc9d5a7162594fb76d02" },
- "neodev.nvim": { "branch": "main", "commit": "0705c72c281626f45c78d0916151d3e2bfb53fae" },
- "neogit": { "branch": "master", "commit": "72824006f2dcf775cc498cc4a046ddd2c99d20a3" },
+ "neodev.nvim": { "branch": "main", "commit": "fed7f27480ac6bda777cb36f2d6737c8ccc580fe" },
+ "neogit": { "branch": "master", "commit": "1b6edb56e8c754494be1564912d33e50ddd8a023" },
"neotest": { "branch": "master", "commit": "e46eae5739c470aa011ee43108ea8a730736174e" },
"neotest-go": { "branch": "main", "commit": "05535cb2cfe3ce5c960f65784896d40109572f89" },
"neotest-python": { "branch": "master", "commit": "054f22129405e747adfc2cbeddfcc59537df50ba" },
"neotest-rust": { "branch": "main", "commit": "6dce8963e5395adf079bf22e931dfce65d3fed25" },
"null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" },
"nvim-autopairs": { "branch": "master", "commit": "e8f7dd7a72de3e7b6626c050a802000e69d53ff0" },
- "nvim-cmp": { "branch": "main", "commit": "2743dd989e9b932e1b4813a4927d7b84272a14e2" },
+ "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" },
"nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" },
- "nvim-dap": { "branch": "master", "commit": "bb1ddce6cd951ef3c1319e4fd8596131113163c3" },
+ "nvim-dap": { "branch": "master", "commit": "3bde6f786057fa29d8356559b2ae3a52d9317fba" },
"nvim-dap-go": { "branch": "main", "commit": "cdf604a5703838f65fdee7c198f6cb59b563ef6f" },
"nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" },
"nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" },
- "nvim-lspconfig": { "branch": "master", "commit": "a7ecaff3245ba4b9e5ed784ebefbedba54e7f0ad" },
- "nvim-navic": { "branch": "master", "commit": "e3b9d8a974bec71b88d5640f1c87bf5b4a7e4113" },
+ "nvim-lspconfig": { "branch": "master", "commit": "deade69789089c3da15237697156334fb3e943f0" },
+ "nvim-navic": { "branch": "master", "commit": "6e8850a524307814decc1b195a2c8a51482a9886" },
"nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
- "nvim-spectre": { "branch": "master", "commit": "dc3f0bd41e09148924ef04a4746cb708539d08db" },
+ "nvim-spectre": { "branch": "master", "commit": "6edac44e10b94b88bf3067fae937915172a3f825" },
"nvim-surround": { "branch": "main", "commit": "10b20ca7d9da1ac8df8339e140ffef94f9ab3b18" },
- "nvim-treesitter": { "branch": "master", "commit": "e1ab5391e5c4820dd1ffc2566d29b01573ab52a9" },
+ "nvim-treesitter": { "branch": "master", "commit": "b4b94ec387525cb9df4b56eb1a8bf33231a0df47" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "52f1f3280d9092bfaee5c45be5962fabee3d9654" },
"nvim-web-devicons": { "branch": "master", "commit": "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9" },
"plenary.nvim": { "branch": "master", "commit": "bda256fab0eb66a15e8190937e417e6a14ee5d72" },
- "rainbow-delimiters.nvim": { "branch": "master", "commit": "5801463f9c67582529e3a10b5b18ad0c581a8dcf" },
- "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
+ "rainbow-delimiters.nvim": { "branch": "master", "commit": "3860bed3c7243780bd0218eb7764c2df09134a5f" },
+ "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
"telescope-file-browser.nvim": { "branch": "master", "commit": "e03ff55962417b69c85ef41424079bb0580546ba" },
"telescope.nvim": { "branch": "master", "commit": "276362a8020c6e94c7a76d49aa00d4923b0c02f3" },
"todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" },
- "toggleterm.nvim": { "branch": "main", "commit": "2249e974faed67e795ffc2ca2be13b93c5d51938" },
+ "toggleterm.nvim": { "branch": "main", "commit": "83aa231fa414a5dcb72aed97437446a6ca5a81f2" },
"trouble.nvim": { "branch": "main", "commit": "d99e2abd10808ef91738ce98a5c767e6a51df449" },
"vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" },
"which-key.nvim": { "branch": "main", "commit": "d871f2b664afd5aed3dc1d1573bef2fb24ce0484" },
diff --git a/.config/nvim/lua/plugins/catppuccin.lua b/.config/nvim/lua/plugins/catppuccin.lua
index bddf31a..aa00b3f 100644
--- a/.config/nvim/lua/plugins/catppuccin.lua
+++ b/.config/nvim/lua/plugins/catppuccin.lua
@@ -13,7 +13,6 @@ return {
neotest = true,
which_key = true,
fidget = true,
- navic = { enabled = true },
},
})
vim.cmd.colorscheme("catppuccin")
diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua
index 19b091f..b085a9f 100644
--- a/.config/nvim/lua/plugins/cmp.lua
+++ b/.config/nvim/lua/plugins/cmp.lua
@@ -4,7 +4,6 @@ return {
dependencies = {
"hrsh7th/cmp-buffer",
"hrsh7th/cmp-path",
- "petertriho/cmp-git",
"nvim-lua/plenary.nvim",
"hrsh7th/cmp-nvim-lsp",
"saadparwaiz1/cmp_luasnip",
@@ -57,13 +56,10 @@ return {
{ name = "nvim_lsp" },
{ name = "path" },
{ name = "conjure" },
- { name = "git" },
}, {
{ name = "buffer" },
}),
})
-
- require("cmp_git").setup()
end,
},
{
diff --git a/.config/nvim/lua/plugins/editor.lua b/.config/nvim/lua/plugins/editor.lua
index 99c4647..c9a7900 100644
--- a/.config/nvim/lua/plugins/editor.lua
+++ b/.config/nvim/lua/plugins/editor.lua
@@ -3,7 +3,6 @@ return {
{ "folke/todo-comments.nvim", event = { "BufReadPre", "BufNewFile" }, opts = {} },
{ "kylechui/nvim-surround", event = "VeryLazy", opts = {} },
{ "numtostr/comment.nvim", event = "VeryLazy", opts = {} },
- { "folke/neodev.nvim", ft = "lua", opts = {} },
{ "simrat39/rust-tools.nvim", ft = "rust", opts = {} },
{
"iamcco/markdown-preview.nvim",
diff --git a/.config/nvim/lua/plugins/illuminate.lua b/.config/nvim/lua/plugins/illuminate.lua
deleted file mode 100644
index 125f6d8..0000000
--- a/.config/nvim/lua/plugins/illuminate.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-return {
- {
- "RRethy/vim-illuminate",
- event = { "BufReadPre", "BufNewFile" },
- config = function()
- require("illuminate").configure({
- providers = { "lsp", "treesitter" },
- })
- vim.api.nvim_set_hl(0, "IlluminatedWordText", { link = "illuminatedWord" })
- vim.api.nvim_set_hl(0, "IlluminatedWordRead", { link = "illuminatedWord" })
- vim.api.nvim_set_hl(0, "IlluminatedWordWrite", { link = "illuminatedWord" })
- end,
- },
-}
-
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index 4d169c1..b3c673e 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -3,13 +3,6 @@ return {
"neovim/nvim-lspconfig",
dependencies = {
"hrsh7th/cmp-nvim-lsp",
- "jose-elias-alvarez/null-ls.nvim",
- {
- "SmiteshP/nvim-navic",
- opts = {
- highlight = true,
- },
- },
},
event = { "BufReadPre", "BufNewFile" },
config = function()
@@ -17,11 +10,6 @@ return {
local capabilities = require("cmp_nvim_lsp").default_capabilities()
local common = {
capabilities = capabilities,
- on_attach = function(client, bufnr)
- if client.server_capabilities.documentSymbolProvider then
- require("nvim-navic").attach(client, bufnr)
- end
- end,
}
local lsps = {
@@ -36,7 +24,6 @@ return {
local wk = require("which-key")
wk.register({
- ["<leader>q"] = { vim.diagnostic.open_float, "Show diagnostics in a floating window" },
["[d"] = { vim.diagnostic.goto_prev, "Previous diagnostic" },
["]d"] = { vim.diagnostic.goto_next, "Next diagnostic" },
})
@@ -74,15 +61,6 @@ return {
}, {buffer=ev.buf})
end,
})
-
- local nls = require("null-ls")
- nls.setup({
- sources = {
- nls.builtins.formatting.stylua,
- nls.builtins.formatting.shfmt,
- nls.builtins.code_actions.gitsigns,
- },
- })
end,
},
{
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-16 09:59:37 +0000