Skip to content

Commit e685dd7

Browse files
committed
update config, set new theme, add fugitive plugin
1 parent 2f559f5 commit e685dd7

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

init.lua

Lines changed: 8 additions & 8 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'
@@ -114,9 +114,9 @@ vim.opt.showmode = false
114114
-- Schedule the setting after `UiEnter` because it can increase startup-time.
115115
-- Remove this option if you want your OS clipboard to remain independent.
116116
-- See `:help 'clipboard'`
117-
vim.schedule(function()
118-
vim.opt.clipboard = 'unnamedplus'
119-
end)
117+
-- vim.schedule(function()
118+
-- vim.opt.clipboard = 'unnamedplus'
119+
-- end)
120120

121121
-- Enable break indent
122122
vim.opt.breakindent = true
@@ -838,13 +838,13 @@ require('lazy').setup({
838838
-- change the command in the config to whatever the name of that colorscheme is.
839839
--
840840
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
841-
'folke/tokyonight.nvim',
841+
'rose-pine/neovim',
842842
priority = 1000, -- Make sure to load this before all the other start plugins.
843843
init = function()
844844
-- Load the colorscheme here.
845845
-- Like many other themes, this one has different styles, and you could load
846846
-- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
847-
vim.cmd.colorscheme 'tokyonight-night'
847+
vim.cmd.colorscheme 'rose-pine'
848848

849849
-- You can configure highlights by doing something like:
850850
vim.cmd.hi 'Comment gui=none'
@@ -937,7 +937,7 @@ require('lazy').setup({
937937
-- This is the easiest way to modularize your config.
938938
--
939939
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
940-
-- { import = 'custom.plugins' },
940+
{ import = 'custom.plugins' },
941941
--
942942
-- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
943943
-- Or use telescope!

lazy-lock.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,24 @@
66
"conform.nvim": { "branch": "master", "commit": "6a28c90082a67f62a323ab90d988e000a718a8c7" },
77
"fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" },
88
"gitsigns.nvim": { "branch": "main", "commit": "7c27a30450130cd59c4994a6755e3c5d74d83e76" },
9-
"lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
9+
"lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
1010
"lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
1111
"luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
1212
"mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
1313
"mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
1414
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
1515
"mini.nvim": { "branch": "main", "commit": "0a8a1072137d916406507c941698a4bfa9dbbe7a" },
16+
"neovim": { "branch": "main", "commit": "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e" },
1617
"nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
1718
"nvim-lspconfig": { "branch": "master", "commit": "54617a18f4cf46f0c2f6d024fa6feb7515fe036d" },
1819
"nvim-treesitter": { "branch": "master", "commit": "f9e9370a6f710148f4a3f3f4f23d5349c85c2888" },
20+
"nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
1921
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
2022
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
2123
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
2224
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
2325
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
24-
"tokyonight.nvim": { "branch": "main", "commit": "2e1daa1d164ad8cc3e99b44ca68e990888a66038" },
26+
"vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
2527
"vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
2628
"which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
2729
}

lua/custom/plugins/init.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
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+
{ 'tpope/vim-fugitive' },
7+
}

0 commit comments

Comments
 (0)