From 783a40f4f430b2daec157e5396e5bd4d3ea65657 Mon Sep 17 00:00:00 2001 From: philw Date: Sat, 11 Jan 2025 18:35:10 +0100 Subject: Remove redundant deps, rewrite file tree --- init.lua | 174 +++++++++++++++++++++++++++++++++++---------------------- lazy-lock.json | 23 ++++++++ 2 files changed, 129 insertions(+), 68 deletions(-) create mode 100644 lazy-lock.json diff --git a/init.lua b/init.lua index 8e47b86..b6a456b 100644 --- a/init.lua +++ b/init.lua @@ -1,8 +1,17 @@ ---@diagnostic disable: undefined-global, local option = vim.opt local keymap = vim.keymap -vim.g.loaded_netrw = 1 -vim.g.loaded_netrwPlugin = 1 + +vim.loader.enable() + +-- vim.g.loaded_netrw = 1 +-- vim.g.loaded_netrwPlugin = 1 +vim.g.netrw_banner = 0 +vim.g.netrw_liststyle = 3 +vim.g.netrw_altv = 0 +vim.g.netrw_winsize = 25 +vim.g.netrw_browse_split = 4 + vim.g.rustfmt_autosave = 1 vim.g.mkdp_auto_start = 1 @@ -32,13 +41,42 @@ augroup RunPfOnSave autocmd! autocmd BufWritePost *.js,*.ts,*.jsx,*json,*.tsx,*.css,*.html,*.yaml,*.md silent! !prettier --write % autocmd BufWritePost *.tex silent! :VimtexCompile -autocmd BufWritePost *.md silent! :MarkdownPreview -autocmd BufWritePost *.php silent! !php-cs-fixer fix % +" autocmd BufWritePost *.php silent! !php-cs-fixer fix % augroup END ]]) + +vim.cmd([[ +augroup AutoDeleteNetrwHiddenBuffers + au! + au FileType netrw setlocal bufhidden=wipe +augroup end +]]) + +vim.cmd([[ +function! ToggleVExplorer() + if exists("t:expl_buf_num") + let expl_win_num = bufwinnr(t:expl_buf_num) + if expl_win_num != -1 + let cur_win_id = win_getid() + exec expl_win_num . 'windo close' + let prev_win_num = win_id2win(cur_win_id) + if prev_win_num != 0 + exec prev_win_num . 'wincmd w' + endif + endif + unlet t:expl_buf_num + else + exec '1wincmd w' + Vexplore + let t:expl_buf_num = bufnr("%") + endif +endfunction +]]) + + -- Gui options -vim.o.guifont = "Fira Code:h7" +-- vim.o.guifont = "Fira Code:h7" vim.g.vimtex_view_method = "zathura" vim.g.vimtex_compiler_method = "latexmk" vim.g.vimtex_quickfix_mode = 0 @@ -62,35 +100,36 @@ end vim.opt.rtp:prepend(lazypath) require("lazy").setup({ "nvim-lua/plenary.nvim", - { - 'barrientosvctor/abyss.nvim', - lazy = false, - priority = 1000, - opts = {} - }, - 'ryanoasis/vim-devicons', + -- { + -- 'barrientosvctor/abyss.nvim', + -- lazy = false, + -- priority = 1000, + -- opts = {} + -- }, + -- 'ryanoasis/vim-devicons', "airblade/vim-gitgutter", "lervag/vimtex", - "nvim-tree/nvim-tree.lua", + -- "nvim-tree/nvim-tree.lua", "norcalli/nvim-colorizer.lua", "nvim-treesitter/nvim-treesitter", "neovim/nvim-lspconfig", "williamboman/mason.nvim", - "nvim-tree/nvim-web-devicons", + -- "nvim-tree/nvim-web-devicons", "williamboman/mason-lspconfig.nvim", - "iamcco/markdown-preview.nvim", - cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, - build = "cd app && yarn install", - init = function() - vim.g.mkdp_filetypes = { "markdown" } - end, - ft = { "markdown" }, - { - 'nvimdev/lspsaga.nvim', - config = function() - require('lspsaga').setup({}) - end - }, + -- "iamcco/markdown-preview.nvim", + -- cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, + -- build = "cd app && yarn install", + -- init = function() + -- vim.g.mkdp_filetypes = { "markdown" } + -- end, + -- ft = { "markdown" } + -- , + -- { + -- 'nvimdev/lspsaga.nvim', + -- config = function() + -- require('lspsaga').setup({}) + -- end + -- }, 'nvim-telescope/telescope.nvim', tag = '0.1.5', dependencies = { 'nvim-lua/plenary.nvim' }, @@ -134,26 +173,25 @@ vim.api.nvim_create_autocmd("BufWritePre", { }) local lsp_servers = { - clangd = {}, - lua_ls = {}, - rust_analyzer = { - imports = { - granularity = { - group = 'module', - }, - prefix = 'self', - }, - cargo = { - buildScripts = { - enable = true, - }, - }, - procMacro = { - enable = true, - }, - }, + -- rust_analyzer = { + -- imports = { + -- granularity = { + -- group = 'module', + -- }, + -- prefix = 'self', + -- }, + -- cargo = { + -- buildScripts = { + -- enable = true, + -- }, + -- }, + -- procMacro = { + -- enable = true, + -- }, + -- }, } + require("mason").setup() require("mason-lspconfig").setup { ensure_installed = lsp_servers, @@ -174,31 +212,31 @@ for lsp, settings in pairs(lsp_servers) do })) end -require("nvim-tree").setup({ - sort = { - sorter = "case_sensitive", - }, - view = { - width = 30, - }, - renderer = { - group_empty = true, - }, - filters = { - dotfiles = true, - }, -}) +-- require("nvim-tree").setup({ +-- sort = { +-- sorter = "case_sensitive", +-- }, +-- view = { +-- width = 30, +-- }, +-- renderer = { +-- group_empty = true, +-- }, +-- filters = { +-- dotfiles = true, +-- }, +-- }) -require('abyss').setup({ - italic_comments = true, - italic = true, - bold = true, - transparent_background = true, - overrides = {} -}) +-- require('abyss').setup({ +-- italic_comments = true, +-- italic = true, +-- bold = true, +-- transparent_background = true, +-- overrides = {} +-- }) -vim.cmd.colorscheme("abyss") +-- vim.cmd.colorscheme("abyss") vim.cmd([[ highlight GitGutterAdd ctermbg=none guibg=none highlight GitGutterDelete guibg=none ctermbg=none @@ -244,7 +282,7 @@ highlight DiagnosticVirtualTextHint ctermbg=none guibg=none --Keybinds vim.g.mapleader = " " -keymap.set("n", "e", vim.cmd.NvimTreeToggle) +keymap.set("n", "e", ":call ToggleVExplorer() ") keymap.set("n", "z", [[:%s/\<\>//gI]]) keymap.set("n", "a", "ggVG") keymap.set("n", "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 @@ +{ + "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, + "abyss.nvim": { "branch": "main", "commit": "ba2b8fd54dedcbd77d4b950a600004bf9686575b" }, + "coq.artifacts": { "branch": "artifacts", "commit": "a1ffcee295905171d87b40ee456001d45b10329b" }, + "coq_nvim": { "branch": "coq", "commit": "976012b0c13763a47edbd55492ba53b03b498cdd" }, + "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, + "lspsaga.nvim": { "branch": "main", "commit": "5fce15331ac6c3a3ec3ac91ab0e85ed82f5cbba0" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, + "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" }, + "nvim-tree.lua": { "branch": "master", "commit": "68fc4c20f5803444277022c681785c5edd11916d" }, + "nvim-treesitter": { "branch": "master", "commit": "4b222913486ec0a5983efa82b0649a2ab87cf1f0" }, + "nvim-web-devicons": { "branch": "master", "commit": "4adeeaa7a32d46cf3b5833341358c797304f950a" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" }, + "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }, + "vim-devicons": { "branch": "master", "commit": "71f239af28b7214eebb60d4ea5bd040291fb7e33" }, + "vim-gitgutter": { "branch": "main", "commit": "7b0b5098e3e57be86bb96cfbf2b8902381eef57c" }, + "vimtex": { "branch": "master", "commit": "b8bb79b5fb27e9030ade92e75cd9375416f2c666" } +} -- cgit v1.2.3