aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--init.lua174
-rw-r--r--lazy-lock.json23
2 files changed, 129 insertions, 68 deletions
diff --git a/init.lua b/init.lua
index 8e47b86..b6a456b 100644
--- a/init.lua
+++ b/init.lua
@@ -1,8 +1,17 @@
1---@diagnostic disable: undefined-global, 1---@diagnostic disable: undefined-global,
2local option = vim.opt 2local option = vim.opt
3local keymap = vim.keymap 3local keymap = vim.keymap
4vim.g.loaded_netrw = 1 4
5vim.g.loaded_netrwPlugin = 1 5vim.loader.enable()
6
7-- vim.g.loaded_netrw = 1
8-- vim.g.loaded_netrwPlugin = 1
9vim.g.netrw_banner = 0
10vim.g.netrw_liststyle = 3
11vim.g.netrw_altv = 0
12vim.g.netrw_winsize = 25
13vim.g.netrw_browse_split = 4
14
6vim.g.rustfmt_autosave = 1 15vim.g.rustfmt_autosave = 1
7vim.g.mkdp_auto_start = 1 16vim.g.mkdp_auto_start = 1
8 17
@@ -32,13 +41,42 @@ augroup RunPfOnSave
32autocmd! 41autocmd!
33autocmd BufWritePost *.js,*.ts,*.jsx,*json,*.tsx,*.css,*.html,*.yaml,*.md silent! !prettier --write % 42autocmd BufWritePost *.js,*.ts,*.jsx,*json,*.tsx,*.css,*.html,*.yaml,*.md silent! !prettier --write %
34autocmd BufWritePost *.tex silent! :VimtexCompile 43autocmd BufWritePost *.tex silent! :VimtexCompile
35autocmd BufWritePost *.md silent! :MarkdownPreview 44" autocmd BufWritePost *.php silent! !php-cs-fixer fix %
36autocmd BufWritePost *.php silent! !php-cs-fixer fix %
37augroup END 45augroup END
38]]) 46]])
39 47
48
49vim.cmd([[
50augroup AutoDeleteNetrwHiddenBuffers
51 au!
52 au FileType netrw setlocal bufhidden=wipe
53augroup end
54]])
55
56vim.cmd([[
57function! ToggleVExplorer()
58 if exists("t:expl_buf_num")
59 let expl_win_num = bufwinnr(t:expl_buf_num)
60 if expl_win_num != -1
61 let cur_win_id = win_getid()
62 exec expl_win_num . 'windo close'
63 let prev_win_num = win_id2win(cur_win_id)
64 if prev_win_num != 0
65 exec prev_win_num . 'wincmd w'
66 endif
67 endif
68 unlet t:expl_buf_num
69 else
70 exec '1wincmd w'
71 Vexplore
72 let t:expl_buf_num = bufnr("%")
73 endif
74endfunction
75]])
76
77
40-- Gui options 78-- Gui options
41vim.o.guifont = "Fira Code:h7" 79-- vim.o.guifont = "Fira Code:h7"
42vim.g.vimtex_view_method = "zathura" 80vim.g.vimtex_view_method = "zathura"
43vim.g.vimtex_compiler_method = "latexmk" 81vim.g.vimtex_compiler_method = "latexmk"
44vim.g.vimtex_quickfix_mode = 0 82vim.g.vimtex_quickfix_mode = 0
@@ -62,35 +100,36 @@ end
62vim.opt.rtp:prepend(lazypath) 100vim.opt.rtp:prepend(lazypath)
63require("lazy").setup({ 101require("lazy").setup({
64 "nvim-lua/plenary.nvim", 102 "nvim-lua/plenary.nvim",
65 { 103 -- {
66 'barrientosvctor/abyss.nvim', 104 -- 'barrientosvctor/abyss.nvim',
67 lazy = false, 105 -- lazy = false,
68 priority = 1000, 106 -- priority = 1000,
69 opts = {} 107 -- opts = {}
70 }, 108 -- },
71 'ryanoasis/vim-devicons', 109 -- 'ryanoasis/vim-devicons',
72 "airblade/vim-gitgutter", 110 "airblade/vim-gitgutter",
73 "lervag/vimtex", 111 "lervag/vimtex",
74 "nvim-tree/nvim-tree.lua", 112 -- "nvim-tree/nvim-tree.lua",
75 "norcalli/nvim-colorizer.lua", 113 "norcalli/nvim-colorizer.lua",
76 "nvim-treesitter/nvim-treesitter", 114 "nvim-treesitter/nvim-treesitter",
77 "neovim/nvim-lspconfig", 115 "neovim/nvim-lspconfig",
78 "williamboman/mason.nvim", 116 "williamboman/mason.nvim",
79 "nvim-tree/nvim-web-devicons", 117 -- "nvim-tree/nvim-web-devicons",
80 "williamboman/mason-lspconfig.nvim", 118 "williamboman/mason-lspconfig.nvim",
81 "iamcco/markdown-preview.nvim", 119 -- "iamcco/markdown-preview.nvim",
82 cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, 120 -- cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
83 build = "cd app && yarn install", 121 -- build = "cd app && yarn install",
84 init = function() 122 -- init = function()
85 vim.g.mkdp_filetypes = { "markdown" } 123 -- vim.g.mkdp_filetypes = { "markdown" }
86 end, 124 -- end,
87 ft = { "markdown" }, 125 -- ft = { "markdown" }
88 { 126 -- ,
89 'nvimdev/lspsaga.nvim', 127 -- {
90 config = function() 128 -- 'nvimdev/lspsaga.nvim',
91 require('lspsaga').setup({}) 129 -- config = function()
92 end 130 -- require('lspsaga').setup({})
93 }, 131 -- end
132 -- },
94 'nvim-telescope/telescope.nvim', 133 'nvim-telescope/telescope.nvim',
95 tag = '0.1.5', 134 tag = '0.1.5',
96 dependencies = { 'nvim-lua/plenary.nvim' }, 135 dependencies = { 'nvim-lua/plenary.nvim' },
@@ -134,26 +173,25 @@ vim.api.nvim_create_autocmd("BufWritePre", {
134}) 173})
135 174
136local lsp_servers = { 175local lsp_servers = {
137 clangd = {}, 176 -- rust_analyzer = {
138 lua_ls = {}, 177 -- imports = {
139 rust_analyzer = { 178 -- granularity = {
140 imports = { 179 -- group = 'module',
141 granularity = { 180 -- },
142 group = 'module', 181 -- prefix = 'self',
143 }, 182 -- },
144 prefix = 'self', 183 -- cargo = {
145 }, 184 -- buildScripts = {
146 cargo = { 185 -- enable = true,
147 buildScripts = { 186 -- },
148 enable = true, 187 -- },
149 }, 188 -- procMacro = {
150 }, 189 -- enable = true,
151 procMacro = { 190 -- },
152 enable = true, 191 -- },
153 },
154 },
155} 192}
156 193
194
157require("mason").setup() 195require("mason").setup()
158require("mason-lspconfig").setup { 196require("mason-lspconfig").setup {
159 ensure_installed = lsp_servers, 197 ensure_installed = lsp_servers,
@@ -174,31 +212,31 @@ for lsp, settings in pairs(lsp_servers) do
174 })) 212 }))
175end 213end
176 214
177require("nvim-tree").setup({ 215-- require("nvim-tree").setup({
178 sort = { 216-- sort = {
179 sorter = "case_sensitive", 217-- sorter = "case_sensitive",
180 }, 218-- },
181 view = { 219-- view = {
182 width = 30, 220-- width = 30,
183 }, 221-- },
184 renderer = { 222-- renderer = {
185 group_empty = true, 223-- group_empty = true,
186 }, 224-- },
187 filters = { 225-- filters = {
188 dotfiles = true, 226-- dotfiles = true,
189 }, 227-- },
190}) 228-- })
191 229
192 230
193require('abyss').setup({ 231-- require('abyss').setup({
194 italic_comments = true, 232-- italic_comments = true,
195 italic = true, 233-- italic = true,
196 bold = true, 234-- bold = true,
197 transparent_background = true, 235-- transparent_background = true,
198 overrides = {} 236-- overrides = {}
199}) 237-- })
200 238
201vim.cmd.colorscheme("abyss") 239-- vim.cmd.colorscheme("abyss")
202vim.cmd([[ 240vim.cmd([[
203highlight GitGutterAdd ctermbg=none guibg=none 241highlight GitGutterAdd ctermbg=none guibg=none
204highlight GitGutterDelete guibg=none ctermbg=none 242highlight GitGutterDelete guibg=none ctermbg=none
@@ -244,7 +282,7 @@ highlight DiagnosticVirtualTextHint ctermbg=none guibg=none
244 282
245--Keybinds 283--Keybinds
246vim.g.mapleader = " " 284vim.g.mapleader = " "
247keymap.set("n", "<leader>e", vim.cmd.NvimTreeToggle) 285keymap.set("n", "<leader>e", "<cmd>:call ToggleVExplorer() <cr>")
248keymap.set("n", "<leader>z", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]]) 286keymap.set("n", "<leader>z", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
249keymap.set("n", "<leader>a", "ggVG") 287keymap.set("n", "<leader>a", "ggVG")
250keymap.set("n", "<leader>y", "cc") 288keymap.set("n", "<leader>y", "cc")
diff --git a/lazy-lock.json b/lazy-lock.json
new file mode 100644
index 0000000..3f99bfe
--- /dev/null
+++ b/lazy-lock.json
@@ -0,0 +1,23 @@
1{
2 "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
3 "abyss.nvim": { "branch": "main", "commit": "ba2b8fd54dedcbd77d4b950a600004bf9686575b" },
4 "coq.artifacts": { "branch": "artifacts", "commit": "a1ffcee295905171d87b40ee456001d45b10329b" },
5 "coq_nvim": { "branch": "coq", "commit": "976012b0c13763a47edbd55492ba53b03b498cdd" },
6 "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
7 "lspsaga.nvim": { "branch": "main", "commit": "5fce15331ac6c3a3ec3ac91ab0e85ed82f5cbba0" },
8 "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
9 "mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" },
10 "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
11 "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
12 "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
13 "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" },
14 "nvim-tree.lua": { "branch": "master", "commit": "68fc4c20f5803444277022c681785c5edd11916d" },
15 "nvim-treesitter": { "branch": "master", "commit": "4b222913486ec0a5983efa82b0649a2ab87cf1f0" },
16 "nvim-web-devicons": { "branch": "master", "commit": "4adeeaa7a32d46cf3b5833341358c797304f950a" },
17 "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
18 "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
19 "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
20 "vim-devicons": { "branch": "master", "commit": "71f239af28b7214eebb60d4ea5bd040291fb7e33" },
21 "vim-gitgutter": { "branch": "main", "commit": "7b0b5098e3e57be86bb96cfbf2b8902381eef57c" },
22 "vimtex": { "branch": "master", "commit": "b8bb79b5fb27e9030ade92e75cd9375416f2c666" }
23}