Skip to content

Commit eb9daec

Browse files
OleJoikOleJoik
committed
sidebar things
1 parent d8cf5bf commit eb9daec

21 files changed

+412
-153
lines changed

‎init.lua‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ vim.g.mapleader = ' '
33
vim.g.maplocalleader = ' '
44
vim.o.clipboard = "unnamedplus"
55

6+
require("globals")
7+
68

79

810
local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
@@ -21,6 +23,9 @@ end
2123
vim.opt.rtp:prepend(lazypath)
2224

2325
require('lazy').setup({
26+
27+
"tpope/vim-fugitive",
28+
'Mofiqul/vscode.nvim',
2429
{
2530
"kdheepak/lazygit.nvim",
2631
dependencies = {
@@ -38,6 +43,7 @@ require('lazy').setup({
3843
},
3944
},
4045

46+
4147
"mg979/vim-visual-multi",
4248

4349
"nvim-pack/nvim-spectre",
@@ -58,11 +64,6 @@ require('lazy').setup({
5864
end
5965
},
6066

61-
{
62-
"ThePrimeagen/harpoon",
63-
branch = "harpoon2",
64-
dependencies = { "nvim-lua/plenary.nvim" }
65-
},
6667
"nvimtools/none-ls.nvim",
6768

6869
-- deletes buffers without fucking up the window layout
@@ -78,35 +79,42 @@ require('lazy').setup({
7879

7980
-- "gc" to comment visual regions/lines
8081
{ 'numToStr/Comment.nvim', opts = {} },
81-
}, {})
82-
83-
84-
require("setup.templ")
8582

86-
require("setup.colors")
87-
require("setup.options")
88-
require("setup.keymaps")
89-
90-
91-
require("setup.yank-highlight")
83+
"yamatsum/nvim-cursorline",
84+
}, {})
9285

93-
require("setup.telescope")
94-
require("setup.harpoon")
9586

96-
require("setup.treesitter")
9787

9888
-- Setup neovim lua configuration
99-
require('neodev').setup()
89+
--
10090

101-
require("lsp.setup_servers").setup_servers()
91+
require('neodev').setup()
10292

103-
require("lsp.nvim-cmp")
104-
require("lsp.null_ls")
10593

106-
require("setup.markdown-preview")
94+
require("lsp")
10795

10896
require("scrollbar").setup()
10997

11098

11199
require("play")
112100
require("floating")
101+
102+
vim.api.nvim_create_autocmd("FileType", {
103+
pattern = "help",
104+
callback = function()
105+
vim.cmd("wincmd H")
106+
vim.cmd("vert resize 90")
107+
end,
108+
})
109+
require('nvim-cursorline').setup {
110+
cursorline = {
111+
enable = true,
112+
timeout = 300,
113+
number = false,
114+
},
115+
cursorword = {
116+
enable = true,
117+
min_length = 3,
118+
hl = { underline = true },
119+
}
120+
}

‎lazy-lock.json‎

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,44 @@
11
{
2-
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
2+
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
33
"LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
4-
"barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" },
4+
"barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
55
"bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" },
6-
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
7-
"diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
6+
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
7+
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
88
"fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
9-
"flash.nvim": { "branch": "main", "commit": "7bb4a9c75d1e20cd24185afedeaa11681829ba23" },
10-
"friendly-snippets": { "branch": "main", "commit": "fa36367422da5a38560892e3db6d090a635d9d41" },
11-
"gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
12-
"harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
13-
"lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
14-
"lazygit.nvim": { "branch": "main", "commit": "0ada6c6e7e138df92f5009b6952f4ac41248305a" },
15-
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
9+
"flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
10+
"friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
11+
"gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" },
12+
"lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" },
13+
"lazygit.nvim": { "branch": "main", "commit": "2432b447483f42ff2e18b2d392cb2bb27e495c08" },
14+
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
1615
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
17-
"mason-lspconfig.nvim": { "branch": "main", "commit": "05744f0f1967b5757bd05c08df4271ab8ec990aa" },
18-
"mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
19-
"neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" },
20-
"neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
21-
"noice.nvim": { "branch": "main", "commit": "f4decbc7a80229ccc9f86026b74bdcf0c39e38a7" },
22-
"none-ls.nvim": { "branch": "main", "commit": "f5632db2491fbe02b54f1a321a98548a8ba2bd15" },
23-
"nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" },
24-
"nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
25-
"nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" },
26-
"nvim-dap-python": { "branch": "master", "commit": "3dffa58541d1f52c121fe58ced046268c838d802" },
27-
"nvim-dap-virtual-text": { "branch": "master", "commit": "3e8e207513e6ef520894950acd76b79902714103" },
28-
"nvim-lspconfig": { "branch": "master", "commit": "9a5a3ebd63b0bf7f8528ed2ca65c8c8bcd2bbeae" },
29-
"nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
30-
"nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
31-
"nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" },
32-
"nvim-surround": { "branch": "main", "commit": "6d0dc3dbb557bcc6a024969da461df4ba803fc48" },
33-
"nvim-treesitter": { "branch": "master", "commit": "da0efd7398713a3177da5ce8690f0e5c5415763d" },
34-
"nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" },
35-
"nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
36-
"nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
37-
"plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
38-
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
39-
"telescope.nvim": { "branch": "0.1.x", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
40-
"tokyonight.nvim": { "branch": "main", "commit": "4b386e66a9599057587c30538d5e6192e3d1c181" },
41-
"venv-selector.nvim": { "branch": "main", "commit": "9b1bfe5aea225853e14358f504c656d4af007035" },
42-
"vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
43-
"vim-visual-multi": { "branch": "master", "commit": "b84a6d42c1c10678928b0bf8327f378c8bc8af5a" },
44-
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
16+
"mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
17+
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
18+
"neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
19+
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
20+
"none-ls.nvim": { "branch": "main", "commit": "9b98991e15dce8fc502993e23caac2528b8b667f" },
21+
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
22+
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
23+
"nvim-cursorline": { "branch": "main", "commit": "804f0023692653b2b2368462d67d2a87056947f9" },
24+
"nvim-dap": { "branch": "master", "commit": "90616ae6ae40053103dc66872886fc26b94c70c8" },
25+
"nvim-dap-python": { "branch": "master", "commit": "db72bf6ab9f75fe841e8e11e772ee7fef6f484f1" },
26+
"nvim-dap-virtual-text": { "branch": "master", "commit": "3497eb39bf413a57ab5b7e7e2e192683e462148c" },
27+
"nvim-lspconfig": { "branch": "master", "commit": "b064131428f6bbbbc905f4451ba6779fda334a3a" },
28+
"nvim-scrollbar": { "branch": "main", "commit": "d09f14aa16c9f2748e77008f9da7b1f76e4e7b85" },
29+
"nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" },
30+
"nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
31+
"nvim-treesitter": { "branch": "master", "commit": "b8ad0473f4d5d7b59e17a67ad0b68711b0232486" },
32+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "bf8d2ad35d1d1a687eae6c065c3d524f7ab61b23" },
33+
"nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
34+
"nvim-web-devicons": { "branch": "master", "commit": "26220156aafb198b2de6a4cf80c1b120a3768da0" },
35+
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
36+
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
37+
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
38+
"venv-selector.nvim": { "branch": "main", "commit": "f16c25bf16ac6e8bbdbcc9e9b3a1a00729d00c99" },
39+
"vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
40+
"vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
41+
"vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" },
42+
"vscode.nvim": { "branch": "main", "commit": "7de58b7a6d55fe48475d0ba2fddbcec871717761" },
43+
"which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" }
4544
}

‎lua/globals.lua‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
P = function(v)
2+
print(vim.inspect(v))
3+
return v
4+
end

‎lua/lsp/init.lua‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
require("lsp.setup_servers").setup_servers()
2+
require("lsp.nvim-cmp")
3+
require("lsp.null_ls")

‎lua/lsp/setup_servers.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ M = {
3232
on_attach = on_attach
3333
}
3434

35-
require('lspconfig').tsserver.setup {
35+
require('lspconfig').ts_ls.setup {
3636
capabilities = capabilities,
3737
on_attach = on_attach
3838
}

‎lua/package/colorscheme.lua‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎lua/package/gitsigns.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ M = {
5757
vim.keymap.set('n', '<leader>s', require('gitsigns').stage_hunk, { noremap = true, desc='[S]tage hunk' })
5858
vim.keymap.set('n', '<leader>ha', require('gitsigns').stage_buffer, { noremap = true, desc='Stage [A]ll hunks (buffer)' })
5959
vim.keymap.set('n', '<leader>hu', require('gitsigns').reset_buffer_index, { noremap = true, desc='[U]nstage all hunks (buffer)' })
60-
-- vim.keymap.set('n', '<leader>l', diffthis, {desc = 'display [H]unk [L]ines'})
60+
vim.keymap.set('n', '<leader>bb', function() require('gitsigns').blame{} end, {noremap = true, desc="Blame"})
61+
vim.keymap.set('n', '<leader>hl', diffthis, {desc = 'display [H]unk [L]ines'})
6162
end,
6263
},
6364
}

‎lua/package/lualine.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ M = {
3535
left = "",
3636
right = ""
3737
},
38-
theme = "tokyonight"
38+
-- theme = "vscode"
3939
},
4040
sections = {
4141
lualine_a = { "mode" },

‎lua/package/spectre.lua‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
M = {
2+
"nvim-pack/nvim-spectre",
3+
dependencies = {
4+
"nvim-lua/plenary.nvim",
5+
},
6+
config = function()
7+
require('spectre').setup{
8+
-- mapping={
9+
-- ['hello'] = {
10+
-- map = "<C-j>",
11+
-- cmd = "<cmd>lua require('spectre').resume_last_search()<CR>",
12+
-- desc = "repeat last search"
13+
-- }
14+
-- }
15+
highlight = {
16+
search = "DiffChange",
17+
replace = "DiffAdd"
18+
},
19+
20+
}
21+
22+
end
23+
}
24+
25+
return M

‎lua/setup/colors.lua‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)