Skip to content

Commit d158e80

Browse files
committed
Customization
1 parent 2abcb39 commit d158e80

File tree

2 files changed

+34
-12
lines changed

2 files changed

+34
-12
lines changed

init.lua

Lines changed: 29 additions & 11 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`
@@ -102,7 +102,7 @@ vim.g.have_nerd_font = false
102102
vim.opt.number = true
103103
-- You can also add relative line numbers, to help with jumping.
104104
-- Experiment for yourself to see if you like it!
105-
-- vim.opt.relativenumber = true
105+
vim.opt.relativenumber = true
106106

107107
-- Enable mouse mode, can be useful for resizing splits for example!
108108
vim.opt.mouse = 'a'
@@ -663,10 +663,11 @@ require('lazy').setup({
663663
-- - settings (table): Override the default settings passed when initializing the server.
664664
-- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
665665
local servers = {
666-
-- clangd = {},
666+
clangd = {},
667667
-- gopls = {},
668668
-- pyright = {},
669-
-- rust_analyzer = {},
669+
rust_analyzer = {},
670+
zls = {},
670671
-- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
671672
--
672673
-- Some languages (like typescript) have entire language plugins that can be useful:
@@ -907,7 +908,7 @@ require('lazy').setup({
907908
-- Load the colorscheme here.
908909
-- Like many other themes, this one has different styles, and you could load
909910
-- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
910-
vim.cmd.colorscheme 'tokyonight-night'
911+
vim.cmd.colorscheme 'tokyonight-storm'
911912
end,
912913
},
913914

@@ -957,7 +958,7 @@ require('lazy').setup({
957958
main = 'nvim-treesitter.configs', -- Sets main module to use for opts
958959
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
959960
opts = {
960-
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
961+
ensure_installed = { 'bash', 'cpp', 'python', 'zig', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
961962
-- Autoinstall languages that are not installed
962963
auto_install = true,
963964
highlight = {
@@ -987,17 +988,17 @@ require('lazy').setup({
987988
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
988989
--
989990
-- require 'kickstart.plugins.debug',
990-
-- require 'kickstart.plugins.indent_line',
991+
require 'kickstart.plugins.indent_line',
991992
-- require 'kickstart.plugins.lint',
992-
-- require 'kickstart.plugins.autopairs',
993-
-- require 'kickstart.plugins.neo-tree',
994-
-- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
993+
require 'kickstart.plugins.autopairs',
994+
require 'kickstart.plugins.neo-tree',
995+
require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
995996

996997
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
997998
-- This is the easiest way to modularize your config.
998999
--
9991000
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
1000-
-- { import = 'custom.plugins' },
1001+
{ import = 'custom.plugins' },
10011002
--
10021003
-- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
10031004
-- Or use telescope!
@@ -1027,3 +1028,20 @@ require('lazy').setup({
10271028

10281029
-- The line beneath this is called `modeline`. See `:help modeline`
10291030
-- vim: ts=2 sts=2 sw=2 et
1031+
vim.opt.expandtab = true -- Use spaces instead of tabs
1032+
vim.opt.shiftwidth = 4 -- Shift 4 spaces when tab
1033+
vim.opt.tabstop = 4 -- 1 tab == 4 spaces
1034+
vim.opt.smartindent = true -- Autoindent new lines
1035+
vim.opt.colorcolumn = '80'
1036+
1037+
vim.keymap.set('n', '<C-b>', '<Cmd>Neotree toggle<CR>', { silent = true })
1038+
vim.keymap.set('n', '<C-s>', '<Cmd>w<CR>', { silent = true })
1039+
vim.keymap.set('n', '<leader>x', '<Cmd>bdelete<CR>', { silent = true })
1040+
vim.keymap.set('n', '<Tab>', '<Cmd>bnext<CR>', { silent = true })
1041+
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous [D]iagnostic message' })
1042+
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next [D]iagnostic message' })
1043+
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Show diagnostic [E]rror messages' })
1044+
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
1045+
1046+
vim.opt.termguicolors = true
1047+
require('bufferline').setup {}

lua/custom/plugins/init.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@
22
-- I promise not to create any merge conflicts in this directory :)
33
--
44
-- See the kickstart.nvim README for more information
5-
return {}
5+
return {
6+
{ 'akinsho/bufferline.nvim', version = '*', dependencies = 'nvim-tree/nvim-web-devicons', opts = {} },
7+
'mbbill/undotree',
8+
'github/copilot.vim',
9+
}

0 commit comments

Comments
 (0)