@@ -7,6 +7,9 @@ vim.g.maplocalleader = ' '
77-- Set to true if you have a Nerd Font installed and selected in the terminal
88vim .g .have_nerd_font = true
99
10+ -- Set global theme
11+ vim .g .theme = ' oxocarbon'
12+
1013-- [[ Setting options ]]
1114-- See `:help vim.opt`
1215-- NOTE: You can change these options as you wish!
@@ -139,6 +142,7 @@ vim.opt.rtp:prepend(lazypath)
139142-- To update plugins you can run
140143-- :Lazy update
141144--
145+ --
142146-- NOTE: Here is where you install your plugins.
143147require (' lazy' ).setup ({
144148 -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
@@ -158,16 +162,7 @@ require('lazy').setup({
158162 -- See `:help gitsigns` to understand what the configuration keys do
159163 { -- Adds git related signs to the gutter, as well as utilities for managing changes
160164 ' lewis6991/gitsigns.nvim' ,
161- opts = {
162- signs = {
163- add = { text = ' ┃' },
164- change = { text = ' ┃' },
165- delete = { text = ' _' },
166- topdelete = { text = ' ‾' },
167- changedelete = { text = ' ~' },
168- untracked = { text = ' ┆' },
169- },
170- },
165+ opts = {},
171166 },
172167
173168 -- NOTE: Plugins can also be configured to run Lua code when they are loaded.
@@ -592,9 +587,11 @@ require('lazy').setup({
592587 vim .list_extend (ensure_installed , {
593588 ' stylua' , -- Used to format Lua code
594589 ' black' , -- Used to format python code
595- ' sonarlint-language-server ' , -- Helpful linting and diagnostics
590+ ' debugpy ' , -- Python Debugger
596591 ' css-lsp' , -- css
597592 ' emmet-language-server' , -- emmet
593+ ' sonarlint-language-server' , -- Helpful linting and diagnostics
594+ ' markdownlint' ,
598595 })
599596 require (' mason-tool-installer' ).setup { ensure_installed = ensure_installed }
600597
@@ -792,17 +789,35 @@ require('lazy').setup({
792789 -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
793790 ' folke/tokyonight.nvim' ,
794791 priority = 1000 , -- Make sure to load this before all the other start plugins.
795- init = function ()
796- -- Load the colorscheme here.
797- -- Like many other themes, this one has different styles, and you could load
798- -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
799- vim .cmd .colorscheme ' tokyonight-night'
800-
801- -- You can configure highlights by doing something like:
802- vim .cmd .hi ' Comment gui=none'
792+ -- init = function()
793+ -- -- Load the colorscheme here.
794+ -- -- Like many other themes, this one has different styles, and you could load
795+ -- -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
796+ -- vim.cmd.colorscheme 'tokyonight-night'
797+ --
798+ -- -- You can configure highlights by doing something like:
799+ -- vim.cmd.hi 'Comment gui=none'
800+ -- end,
801+ },
802+ {
803+ ' Mofiqul/adwaita.nvim' ,
804+ lazy = false ,
805+ priority = 1000 ,
806+ config = function ()
807+ vim .cmd .colorscheme (vim .g .theme )
803808 end ,
804809 },
805-
810+ {
811+ ' uloco/bluloco.nvim' ,
812+ lazy = false ,
813+ priority = 1000 ,
814+ dependencies = { ' rktjmp/lush.nvim' },
815+ },
816+ {
817+ ' nyoom-engineering/oxocarbon.nvim' ,
818+ lazy = false ,
819+ priority = 1000 ,
820+ },
806821 -- Highlight todo, notes, etc in comments
807822 { ' folke/todo-comments.nvim' , event = ' VimEnter' , dependencies = { ' nvim-lua/plenary.nvim' }, opts = { signs = false } },
808823
@@ -824,21 +839,7 @@ require('lazy').setup({
824839 -- - sr)' - [S]urround [R]eplace [)] [']
825840 require (' mini.surround' ).setup ()
826841
827- -- Simple and easy statusline.
828- -- You could remove this setup call if you don't like it,
829- -- and try some other statusline plugin
830- local statusline = require ' mini.statusline'
831- -- set use_icons to true if you have a Nerd Font
832- statusline .setup { use_icons = vim .g .have_nerd_font }
833-
834- -- You can configure sections in the statusline by overriding their
835- -- default behavior. For example, here we set the section for
836- -- cursor location to LINE:COLUMN
837- --- @diagnostic disable-next-line : duplicate-set-field
838- statusline .section_location = function ()
839- return ' %2l:%-2v'
840- end
841-
842+ require (' mini.icons' ).setup ()
842843 -- ... and there is more!
843844 -- Check out: https://github.com/echasnovski/mini.nvim
844845 end ,
@@ -849,7 +850,22 @@ require('lazy').setup({
849850 main = ' nvim-treesitter.configs' , -- Sets main module to use for opts
850851 -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
851852 opts = {
852- ensure_installed = { ' bash' , ' c' , ' diff' , ' html' , ' lua' , ' luadoc' , ' markdown' , ' markdown_inline' , ' query' , ' vim' , ' vimdoc' },
853+ ensure_installed = {
854+ ' bash' ,
855+ ' c' ,
856+ ' diff' ,
857+ ' html' ,
858+ ' lua' ,
859+ ' luadoc' ,
860+ ' markdown' ,
861+ ' markdown_inline' ,
862+ ' query' ,
863+ ' vim' ,
864+ ' vimdoc' ,
865+ ' javascript' ,
866+ ' typescript' ,
867+ ' jsdoc' ,
868+ },
853869 -- Autoinstall languages that are not installed
854870 auto_install = true ,
855871 highlight = {
@@ -913,5 +929,8 @@ require('lazy').setup({
913929 },
914930})
915931
932+ -- Setup python provider
933+ vim .g .python3_host_prog = ' $HOME/.asdf/shims/python'
934+
916935-- The line beneath this is called `modeline`. See `:help modeline`
917936-- vim: ts=2 sts=2 sw=2 et
0 commit comments