Skip to content

Commit b8cbd79

Browse files
committed
Added some things, but not really configed
1 parent d350db2 commit b8cbd79

File tree

3 files changed

+155
-10
lines changed

3 files changed

+155
-10
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ test.sh
44
nvim
55

66
spell/
7-
lazy-lock.json
7+

init.lua

Lines changed: 115 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ vim.g.mapleader = ' '
9191
vim.g.maplocalleader = ' '
9292

9393
-- Set to true if you have a Nerd Font installed and selected in the terminal
94-
vim.g.have_nerd_font = false
94+
vim.g.have_nerd_font = true
9595

9696
-- [[ Setting options ]]
9797
-- See `:help vim.opt`
@@ -109,6 +109,7 @@ vim.opt.mouse = 'a'
109109

110110
-- Don't show the mode, since it's already in the status line
111111
vim.opt.showmode = false
112+
vim.opt.termguicolors = true
112113

113114
-- Sync clipboard between OS and Neovim.
114115
-- Schedule the setting after `UiEnter` because it can increase startup-time.
@@ -154,7 +155,7 @@ vim.opt.inccommand = 'split'
154155
vim.opt.cursorline = true
155156

156157
-- Minimal number of screen lines to keep above and below the cursor.
157-
vim.opt.scrolloff = 10
158+
vim.opt.scrolloff = 15
158159

159160
-- if performing an operation that would fail due to unsaved changes in the buffer (like `:q`),
160161
-- instead raise a dialog asking if you wish to save the current file(s)
@@ -246,8 +247,112 @@ require('lazy').setup({
246247
-- keys can be used to configure plugin behavior/loading/etc.
247248
--
248249
-- Use `opts = {}` to automatically pass options to a plugin's `setup()` function, forcing the plugin to be loaded.
249-
--
250+
{
251+
'nvim-lualine/lualine.nvim',
252+
dependencies = { 'nvim-tree/nvim-web-devicons' },
253+
},
254+
255+
{ 'KeitaNakamura/neodark.vim' },
256+
257+
{ 'liuchengxu/space-vim-dark' },
258+
259+
{
260+
'saecki/crates.nvim',
261+
event = { 'BufRead Cargo.toml' },
262+
config = function()
263+
require('crates').setup()
264+
end,
265+
},
266+
{
267+
'goolord/alpha-nvim',
268+
event = 'VimEnter',
269+
enabled = true,
270+
opts = function()
271+
local dashboard = require 'alpha.themes.dashboard'
272+
local logo = [[
273+
JVIM :p
274+
]]
275+
276+
dashboard.section.header.val = vim.split(logo, '\n')
277+
-- stylua: ignore
278+
dashboard.section.buttons.val = {
279+
dashboard.button("f", "" .. " Find file", [[<cmd> Telescope find_files <cr>]]),
280+
dashboard.button("n", "" .. " New file", [[<cmd> ene <BAR> startinsert <cr>]]),
281+
dashboard.button("r", "" .. " Recent files", [[<cmd> lua LazyVim.pick("oldfiles")() <cr>]]),
282+
dashboard.button("g", "" .. " Open finder", [[<cmd> Neotree dir=~ position=current<cr>]]),
283+
dashboard.button("c", "" .. " Config", [[<cmd> edit ~/AppData/Local/nvim/init.lua <cr>]]),
284+
dashboard.button("s", "" .. " Restore Session", [[<cmd> lua require("persistence").load() <cr>]]),
285+
dashboard.button("l", "󰒲 " .. " Lazy", "<cmd> Lazy <cr>"),
286+
dashboard.button("q", "" .. " Quit", "<cmd> qa <cr>"),
287+
}
288+
for _, button in ipairs(dashboard.section.buttons.val) do
289+
button.opts.hl = 'AlphaButtons'
290+
button.opts.hl_shortcut = 'AlphaShortcut'
291+
end
292+
dashboard.section.header.opts.hl = 'AlphaHeader'
293+
dashboard.section.buttons.opts.hl = 'AlphaButtons'
294+
dashboard.section.footer.opts.hl = 'AlphaFooter'
295+
dashboard.opts.layout[1].val = 8
296+
return dashboard
297+
end,
298+
config = function(_, dashboard)
299+
-- close Lazy and re-open when the dashboard is ready
300+
if vim.o.filetype == 'lazy' then
301+
vim.cmd.close()
302+
vim.api.nvim_create_autocmd('User', {
303+
once = true,
304+
pattern = 'AlphaReady',
305+
callback = function()
306+
require('lazy').show()
307+
end,
308+
})
309+
end
310+
311+
require('alpha').setup(dashboard.opts)
250312

313+
vim.api.nvim_create_autocmd('User', {
314+
once = true,
315+
pattern = 'LazyVimStarted',
316+
callback = function()
317+
local stats = require('lazy').stats()
318+
local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100)
319+
dashboard.section.footer.val = '⚡ Neovim loaded ' .. stats.loaded .. '/' .. stats.count .. ' plugins in ' .. ms .. 'ms'
320+
pcall(vim.cmd.AlphaRedraw)
321+
end,
322+
})
323+
end,
324+
},
325+
326+
{
327+
'NeogitOrg/neogit',
328+
dependencies = {
329+
'nvim-lua/plenary.nvim', -- required
330+
'sindrets/diffview.nvim', -- optional - Diff integration
331+
332+
-- Only one of these is needed.
333+
'nvim-telescope/telescope.nvim', -- optional
334+
'ibhagwan/fzf-lua', -- optional
335+
'echasnovski/mini.pick', -- optional
336+
},
337+
},
338+
339+
{
340+
'romgrk/barbar.nvim',
341+
dependencies = {
342+
'lewis6991/gitsigns.nvim', -- OPTIONAL: for git status
343+
'nvim-tree/nvim-web-devicons', -- OPTIONAL: for file icons
344+
},
345+
init = function()
346+
vim.g.barbar_auto_setup = false
347+
end,
348+
opts = {
349+
-- lazy.nvim will automatically call setup for you. put your options here, anything missing will use the default:
350+
-- animation = true,
351+
-- insert_at_start = true,
352+
-- …etc.
353+
},
354+
version = '^1.0.0', -- optional: only update when a new 1.x version is released
355+
},
251356
-- Alternatively, use `config = function() ... end` for full control over the configuration.
252357
-- If you prefer to call `setup` explicitly, use:
253358
-- {
@@ -470,6 +575,7 @@ require('lazy').setup({
470575
{
471576
-- Main LSP Configuration
472577
'neovim/nvim-lspconfig',
578+
473579
dependencies = {
474580
-- Automatically install LSPs and related tools to stdpath for Neovim
475581
-- Mason must be loaded before its dependents so we need to set it up here.
@@ -886,7 +992,7 @@ require('lazy').setup({
886992
-- Load the colorscheme here.
887993
-- Like many other themes, this one has different styles, and you could load
888994
-- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
889-
vim.cmd.colorscheme 'tokyonight-night'
995+
vim.cmd.colorscheme 'habamax'
890996
end,
891997
},
892998

@@ -966,17 +1072,17 @@ require('lazy').setup({
9661072
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
9671073
--
9681074
-- require 'kickstart.plugins.debug',
969-
-- require 'kickstart.plugins.indent_line',
970-
-- require 'kickstart.plugins.lint',
971-
-- require 'kickstart.plugins.autopairs',
972-
-- require 'kickstart.plugins.neo-tree',
1075+
require 'kickstart.plugins.indent_line',
1076+
require 'kickstart.plugins.lint',
1077+
require 'kickstart.plugins.autopairs',
1078+
require 'kickstart.plugins.neo-tree',
9731079
-- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
9741080

9751081
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
9761082
-- This is the easiest way to modularize your config.
9771083
--
9781084
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
979-
-- { import = 'custom.plugins' },
1085+
{ import = 'custom.plugins' },
9801086
--
9811087
-- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
9821088
-- Or use telescope!

lazy-lock.json

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
3+
"alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
4+
"barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
5+
"blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" },
6+
"conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" },
7+
"crates.nvim": { "branch": "main", "commit": "73d2c590c74a0c582144987a4decb4a642755859" },
8+
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
9+
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
10+
"fzf-lua": { "branch": "main", "commit": "dc693475c4463463d84a0c7c43d463b8a8cd3aea" },
11+
"gitsigns.nvim": { "branch": "main", "commit": "fcfa7a989cd6fed10abf02d9880dc76d7a38167d" },
12+
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
13+
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
14+
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
15+
"lualine.nvim": { "branch": "master", "commit": "86fe39534b7da729a1ac56c0466e76f2c663dc42" },
16+
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
17+
"mason-tool-installer.nvim": { "branch": "main", "commit": "1255518cb067e038a4755f5cb3e980f79b6ab89c" },
18+
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
19+
"mini.nvim": { "branch": "main", "commit": "b418d585d99bd1c1a4b04dc8b2c585471665173a" },
20+
"mini.pick": { "branch": "main", "commit": "6cad781797f3a9b0e69f2e9a2d63de8b1c1824f5" },
21+
"neo-tree.nvim": { "branch": "main", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" },
22+
"neodark.vim": { "branch": "master", "commit": "57b559faa535215c0466afd451f0114626e70c85" },
23+
"neogit": { "branch": "master", "commit": "97f83f1dc51dee41e08e3c7a8adf00e1083e3178" },
24+
"nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
25+
"nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
26+
"nvim-lint": { "branch": "master", "commit": "5b1bdf306bd3e565908145279e8bbfc594dac3b3" },
27+
"nvim-lspconfig": { "branch": "master", "commit": "81920264a264144bd075f7f48f0c4356fc2c6236" },
28+
"nvim-treesitter": { "branch": "master", "commit": "7bbed4b548d9a81c14351bda93d16336edefd067" },
29+
"nvim-web-devicons": { "branch": "master", "commit": "c90dee4e930ab9f49fa6d77f289bff335b49e972" },
30+
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
31+
"space-vim-dark": { "branch": "master", "commit": "0ab698bd2a3959e3bed7691ac55ba4d8abefd143" },
32+
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
33+
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
34+
"telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
35+
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
36+
"tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
37+
"vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
38+
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
39+
}

0 commit comments

Comments
 (0)