aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--README.md7
-rw-r--r--demos/sc1.pngbin0 -> 493238 bytes
-rw-r--r--init.lua178
-rw-r--r--lazy-lock.json23
4 files changed, 144 insertions, 64 deletions
diff --git a/README.md b/README.md
index 4b71bd8..3ab13b8 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
2 2
3![nvim](https://user-images.githubusercontent.com/91333841/212791030-440472c6-1568-4754-9181-c47e69bc42d6.png) 3![nvim](https://user-images.githubusercontent.com/91333841/212791030-440472c6-1568-4754-9181-c47e69bc42d6.png)
4 4
5### Features
5### Installation 6### Installation
6 7
7Run checkhealth in your nvim to satisfy it's requirements 8Run checkhealth in your nvim to satisfy it's requirements
@@ -14,10 +15,6 @@ Make sure you analyzed the output properly:
14 15
15- Your neovim must be >= 0.7.0 to run this config 16- Your neovim must be >= 0.7.0 to run this config
16 17
17```vim
18git clone --depth 1 https://github.com/wbthomason/packer.nvim\
19 ~/.local/share/nvim/site/pack/packer/start/packer.nvim
20```
21### Installation 18### Installation
22 19
23> Easy way 20> Easy way
@@ -25,7 +22,7 @@ git clone --depth 1 https://github.com/wbthomason/packer.nvim\
25You can just clone this repo to your .config folder 22You can just clone this repo to your .config folder
26 23
27```bash 24```bash
28git clone https://codeberg.com/philw/nvim ~/.config 25git clone https://codeberg.org/philw/nvim ~/.config
29``` 26```
30 27
31> My way 28> My way
diff --git a/demos/sc1.png b/demos/sc1.png
new file mode 100644
index 0000000..be01afb
--- /dev/null
+++ b/demos/sc1.png
Binary files differ
diff --git a/init.lua b/init.lua
index 3afc76a..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,15 +41,47 @@ 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 = "latexrun" 81vim.g.vimtex_compiler_method = "latexmk"
82vim.g.vimtex_quickfix_mode = 0
83vim.g.tex_conceal = "abdmg"
84vim.g.tex_flavor = "latex"
44vim.g.gitgutter_set_sign_backgrounds = 1 85vim.g.gitgutter_set_sign_backgrounds = 1
45 86
46 87
@@ -59,29 +100,36 @@ end
59vim.opt.rtp:prepend(lazypath) 100vim.opt.rtp:prepend(lazypath)
60require("lazy").setup({ 101require("lazy").setup({
61 "nvim-lua/plenary.nvim", 102 "nvim-lua/plenary.nvim",
62 'chriskempson/base16-vim', 103 -- {
104 -- 'barrientosvctor/abyss.nvim',
105 -- lazy = false,
106 -- priority = 1000,
107 -- opts = {}
108 -- },
109 -- 'ryanoasis/vim-devicons',
63 "airblade/vim-gitgutter", 110 "airblade/vim-gitgutter",
64 "lervag/vimtex", 111 "lervag/vimtex",
65 "nvim-tree/nvim-tree.lua", 112 -- "nvim-tree/nvim-tree.lua",
66 "norcalli/nvim-colorizer.lua", 113 "norcalli/nvim-colorizer.lua",
67 "nvim-treesitter/nvim-treesitter", 114 "nvim-treesitter/nvim-treesitter",
68 "neovim/nvim-lspconfig", 115 "neovim/nvim-lspconfig",
69 "williamboman/mason.nvim", 116 "williamboman/mason.nvim",
70 "nvim-tree/nvim-web-devicons", 117 -- "nvim-tree/nvim-web-devicons",
71 "williamboman/mason-lspconfig.nvim", 118 "williamboman/mason-lspconfig.nvim",
72 { 119 -- "iamcco/markdown-preview.nvim",
73 "iamcco/markdown-preview.nvim", 120 -- cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
74 cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, 121 -- build = "cd app && yarn install",
75 build = "cd app && yarn install", 122 -- init = function()
76 init = function() 123 -- vim.g.mkdp_filetypes = { "markdown" }
77 vim.g.mkdp_filetypes = { "markdown" } 124 -- end,
78 end, 125 -- ft = { "markdown" }
79 ft = { "markdown" }, 126 -- ,
80 }, 127 -- {
81 'nvimdev/lspsaga.nvim', 128 -- 'nvimdev/lspsaga.nvim',
82 config = function() 129 -- config = function()
83 require('lspsaga').setup({}) 130 -- require('lspsaga').setup({})
84 end, 131 -- end
132 -- },
85 'nvim-telescope/telescope.nvim', 133 'nvim-telescope/telescope.nvim',
86 tag = '0.1.5', 134 tag = '0.1.5',
87 dependencies = { 'nvim-lua/plenary.nvim' }, 135 dependencies = { 'nvim-lua/plenary.nvim' },
@@ -100,6 +148,7 @@ require("lazy").setup({
100 { 148 {
101 'windwp/nvim-autopairs', 149 'windwp/nvim-autopairs',
102 event = "InsertEnter", 150 event = "InsertEnter",
151
103 opts = {} 152 opts = {}
104 }, 153 },
105 { 154 {
@@ -124,29 +173,25 @@ vim.api.nvim_create_autocmd("BufWritePre", {
124}) 173})
125 174
126local lsp_servers = { 175local lsp_servers = {
127 clangd = {}, 176 -- rust_analyzer = {
128 lua_ls = {}, 177 -- imports = {
129 rust_analyzer = { 178 -- granularity = {
130 imports = { 179 -- group = 'module',
131 granularity = { 180 -- },
132 group = 'module', 181 -- prefix = 'self',
133 }, 182 -- },
134 prefix = 'self', 183 -- cargo = {
135 }, 184 -- buildScripts = {
136 cargo = { 185 -- enable = true,
137 buildScripts = { 186 -- },
138 enable = true, 187 -- },
139 }, 188 -- procMacro = {
140 }, 189 -- enable = true,
141 procMacro = { 190 -- },
142 enable = true, 191 -- },
143 },
144 },
145} 192}
146 193
147 194
148require('lspsaga').setup({})
149
150require("mason").setup() 195require("mason").setup()
151require("mason-lspconfig").setup { 196require("mason-lspconfig").setup {
152 ensure_installed = lsp_servers, 197 ensure_installed = lsp_servers,
@@ -167,22 +212,31 @@ for lsp, settings in pairs(lsp_servers) do
167 })) 212 }))
168end 213end
169 214
170require("nvim-tree").setup({ 215-- require("nvim-tree").setup({
171 sort = { 216-- sort = {
172 sorter = "case_sensitive", 217-- sorter = "case_sensitive",
173 }, 218-- },
174 view = { 219-- view = {
175 width = 30, 220-- width = 30,
176 }, 221-- },
177 renderer = { 222-- renderer = {
178 group_empty = true, 223-- group_empty = true,
179 }, 224-- },
180 filters = { 225-- filters = {
181 dotfiles = true, 226-- dotfiles = true,
182 }, 227-- },
183}) 228-- })
184 229
185vim.cmd.colorscheme("base16-brewer") 230
231-- require('abyss').setup({
232-- italic_comments = true,
233-- italic = true,
234-- bold = true,
235-- transparent_background = true,
236-- overrides = {}
237-- })
238
239-- vim.cmd.colorscheme("abyss")
186vim.cmd([[ 240vim.cmd([[
187highlight GitGutterAdd ctermbg=none guibg=none 241highlight GitGutterAdd ctermbg=none guibg=none
188highlight GitGutterDelete guibg=none ctermbg=none 242highlight GitGutterDelete guibg=none ctermbg=none
@@ -205,6 +259,9 @@ highlight DiagnosticVirtualWarn ctermbg=none guibg=none
205highlight DiagnosticVirtualInfo ctermbg=none guibg=none 259highlight DiagnosticVirtualInfo ctermbg=none guibg=none
206highlight DiagnosticVirtualHint ctermbg=none guibg=none 260highlight DiagnosticVirtualHint ctermbg=none guibg=none
207 261
262highlight LspFloatWinNormal ctermbg=none guibg=none
263highlight NormalFloat ctermbg=none guibg=none
264
208highlight LineNr ctermbg=none guibg=none 265highlight LineNr ctermbg=none guibg=none
209highlight StatusLineNc ctermbg=none guibg=none 266highlight StatusLineNc ctermbg=none guibg=none
210highlight StatusLineNc ctermfg=none guifg=none 267highlight StatusLineNc ctermfg=none guifg=none
@@ -225,7 +282,7 @@ highlight DiagnosticVirtualTextHint ctermbg=none guibg=none
225 282
226--Keybinds 283--Keybinds
227vim.g.mapleader = " " 284vim.g.mapleader = " "
228keymap.set("n", "<leader>e", vim.cmd.NvimTreeToggle) 285keymap.set("n", "<leader>e", "<cmd>:call ToggleVExplorer() <cr>")
229keymap.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>]])
230keymap.set("n", "<leader>a", "ggVG") 287keymap.set("n", "<leader>a", "ggVG")
231keymap.set("n", "<leader>y", "cc") 288keymap.set("n", "<leader>y", "cc")
@@ -233,7 +290,10 @@ keymap.set("n", "<C-c>", "yy")
233keymap.set("n", "<C-v>", "p") 290keymap.set("n", "<C-v>", "p")
234keymap.set("n", "<C-z>", "u") 291keymap.set("n", "<C-z>", "u")
235keymap.set("v", "J", ":m '>+1<CR>gv=gv") 292keymap.set("v", "J", ":m '>+1<CR>gv=gv")
293keymap.set("n", "j", "5j")
294keymap.set("n", "k", "5k")
236keymap.set("v", "K", ":m '<-2<CR>gv=gv") 295keymap.set("v", "K", ":m '<-2<CR>gv=gv")
237keymap.set("n", "<leader>ca", "<cmd>Lspsaga code_action<cr>") 296keymap.set("n", "<leader>ca", "<cmd>Lspsaga code_action<cr>")
238keymap.set("n", "<leader>f", "<cmd>Telescope find_files<cr>") 297keymap.set("n", "<leader>f", "<cmd>Telescope find_files<cr>")
239keymap.set("n", "<leader>g", "<cmd>Telescope live_grep<cr>") 298keymap.set("n", "<leader>g", "<cmd>Telescope live_grep<cr>")
299keymap.set("n", "<leader>t", "<cmd>Lspsaga term_toggle <cr>")
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}