Skip to content

Commit f761c6b

Browse files
committed
Add files via upload
1 parent 2ba39c6 commit f761c6b

File tree

1 file changed

+43
-9
lines changed

1 file changed

+43
-9
lines changed

init.lua

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,26 @@ P.S. You can delete this when you're done too. It's your config now! :)
8989
-- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used)
9090
vim.g.mapleader = ' '
9191
vim.g.maplocalleader = ' '
92-
92+
vim.g.loaded_netrw = 1
93+
vim.g.loaded_netrwPlugin = 1
9394
-- Set to true if you have a Nerd Font installed and selected in the terminal
94-
vim.g.have_nerd_font = false
95-
95+
vim.g.have_nerd_font = true
96+
vim.opt.tabstop = 2
97+
vim.opt.shiftwidth = 2
98+
vim.opt.encoding = 'UTF-8'
99+
vim.opt.wrap = false
100+
vim.opt.termguicolors = true
101+
vim.opt.autoindent = true
102+
vim.api.nvim_create_augroup('neotree', {})
103+
vim.api.nvim_create_autocmd('UiEnter', {
104+
desc = 'Open Neotree automatically',
105+
group = 'neotree',
106+
callback = function()
107+
if vim.fn.argc() == 0 then
108+
vim.cmd 'NvimTreeToggle'
109+
end
110+
end,
111+
})
96112
-- [[ Setting options ]]
97113
-- See `:help vim.opt`
98114
-- NOTE: You can change these options as you wish!
@@ -176,10 +192,10 @@ vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagn
176192
vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
177193

178194
-- TIP: Disable arrow keys in normal mode
179-
-- vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
180-
-- vim.keymap.set('n', '<right>', '<cmd>echo "Use l to move!!"<CR>')
181-
-- vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
182-
-- vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
195+
vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
196+
vim.keymap.set('n', '<right>', '<cmd>echo "Use l to move!!"<CR>')
197+
vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
198+
vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
183199

184200
-- Keybinds to make split navigation easier.
185201
-- Use CTRL+<hjkl> to switch between windows
@@ -673,7 +689,7 @@ require('lazy').setup({
673689
}
674690
end,
675691
},
676-
692+
{ 'anuvyklack/pretty-fold.nvim', config = true },
677693
{ -- Autoformat
678694
'stevearc/conform.nvim',
679695
event = { 'BufWritePre' },
@@ -707,6 +723,7 @@ require('lazy').setup({
707723
}
708724
end,
709725
formatters_by_ft = {
726+
cpp = { 'clang_format' },
710727
lua = { 'stylua' },
711728
-- Conform can also run multiple formatters sequentially
712729
-- python = { "isort", "black" },
@@ -844,7 +861,7 @@ require('lazy').setup({
844861
-- Load the colorscheme here.
845862
-- Like many other themes, this one has different styles, and you could load
846863
-- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
847-
vim.cmd.colorscheme 'tokyonight-night'
864+
vim.cmd.colorscheme 'wildcharm'
848865

849866
-- You can configure highlights by doing something like:
850867
vim.cmd.hi 'Comment gui=none'
@@ -937,6 +954,23 @@ require('lazy').setup({
937954
-- This is the easiest way to modularize your config.
938955
--
939956
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
957+
<<<<<<< HEAD
958+
=======
959+
-- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
960+
{ 'kdheepak/lazygit.nvim' },
961+
{
962+
'nvim-tree/nvim-tree.lua',
963+
config = function()
964+
require('nvim-tree').setup {
965+
sort_by = 'case_sensitive',
966+
view = {
967+
width = 30,
968+
preserve_window_proportions = true,
969+
},
970+
}
971+
end,
972+
},
973+
>>>>>>> b708f3d (Add files via upload)
940974
-- { import = 'custom.plugins' },
941975
--
942976
-- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`

0 commit comments

Comments
 (0)