diff --git a/init.lua b/init.lua index c860c99..53dffc5 100644 --- a/init.lua +++ b/init.lua @@ -8,7 +8,7 @@ vim.cmd([[ highlight HellValue ctermfg=red guifg=#00ffff set number - colorscheme gruvbox + colorscheme everforest set background=dark let g:airline_theme='base16' @@ -29,3 +29,38 @@ require'nvim-treesitter.configs'.setup { enable = true, }, } + +require'lualine'.setup({ + options = { + icons_enabled = true, + theme = cozynight, + component_separators = { left = '', right = '' }, + section_separators = { left = '', right = '' }, + disabled_filetypes = {}, + always_divide_middle = true + }, + sections = { + lualine_a = { 'mode' }, + lualine_b = { 'branch', 'diff', + { + 'diagnostics', + sources = { "nvim_diagnostic" }, + symbols = { error = ' ', warn = ' ', info = ' ', hint = ' ' } + } + }, + lualine_c = { 'filename' }, + lualine_x = { 'copilot' ,'encoding', 'fileformat', 'filetype' }, -- I added copilot here + lualine_y = { 'progress' }, + lualine_z = { 'location' } + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { 'filename' }, + lualine_x = { 'location' }, + lualine_y = {}, + lualine_z = {} + }, + tabline = {}, + extensions = {} +}) diff --git a/lua/plugins.lua b/lua/plugins.lua index 7e4ffbc..b88e237 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -24,5 +24,18 @@ return require('packer').startup(function(use) end, } use 'shaunsingh/nord.nvim' + use 'folke/noice.nvim' + use 'rcarriga/nvim-notify' + use 'MunifTanjim/nui.nvim' +-- use { +-- 'zbirenbaum/copilot.lua', +-- cmd = "Copilot", +-- event = "InsertEnter", +-- config = function() +-- require("copilot").setup({}) +-- end, +-- } + +-- use 'AndreM222/copilot-lualine' end) diff --git a/plugin/lualine.lua b/plugin/lualine.lua index d9a5fa0..43fb5d7 100644 --- a/plugin/lualine.lua +++ b/plugin/lualine.lua @@ -1,8 +1,9 @@ require('lualine').setup { options = { icons_enabled = true, + theme = 'everforest', -- theme = 'nord', - theme = 'gruvbox-material', + -- theme = 'gruvbox-material', component_separators = { left = '', right = ''}, section_separators = { left = '', right = ''}, disabled_filetypes = { diff --git a/plugin/noice.lua b/plugin/noice.lua new file mode 100644 index 0000000..0e6fbeb --- /dev/null +++ b/plugin/noice.lua @@ -0,0 +1,18 @@ +require("noice").setup({ + lsp = { + -- override markdown rendering so that **cmp** and other plugins use **Treesitter** + override = { + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, + ["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp + }, + }, + -- you can enable a preset for easier configuration + presets = { + bottom_search = true, -- use a classic bottom cmdline for search + command_palette = true, -- position the cmdline and popupmenu together + long_message_to_split = true, -- long messages will be sent to a split + inc_rename = false, -- enables an input dialog for inc-rename.nvim + lsp_doc_border = false, -- add a border to hover docs and signature help + }, +}) diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index d45ddc1..4238ee2 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -49,8 +49,8 @@ local function save_profiles(threshold) end time([[Luarocks path setup]], true) -local package_path_str = "/home/arco/.cache/nvim/packer_hererocks/2.1.1710088188/share/lua/5.1/?.lua;/home/arco/.cache/nvim/packer_hererocks/2.1.1710088188/share/lua/5.1/?/init.lua;/home/arco/.cache/nvim/packer_hererocks/2.1.1710088188/lib/luarocks/rocks-5.1/?.lua;/home/arco/.cache/nvim/packer_hererocks/2.1.1710088188/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/arco/.cache/nvim/packer_hererocks/2.1.1710088188/lib/lua/5.1/?.so" +local package_path_str = "/home/arco/.cache/nvim/packer_hererocks/2.1.1741730670/share/lua/5.1/?.lua;/home/arco/.cache/nvim/packer_hererocks/2.1.1741730670/share/lua/5.1/?/init.lua;/home/arco/.cache/nvim/packer_hererocks/2.1.1741730670/lib/luarocks/rocks-5.1/?.lua;/home/arco/.cache/nvim/packer_hererocks/2.1.1741730670/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/arco/.cache/nvim/packer_hererocks/2.1.1741730670/lib/lua/5.1/?.so" if not string.find(package.path, package_path_str, 1, true) then package.path = package.path .. ';' .. package_path_str end @@ -91,11 +91,26 @@ _G.packer_plugins = { path = "/home/arco/.local/share/nvim/site/pack/packer/start/lualine.nvim", url = "https://github.com/nvim-lualine/lualine.nvim" }, + ["noice.nvim"] = { + loaded = true, + path = "/home/arco/.local/share/nvim/site/pack/packer/start/noice.nvim", + url = "https://github.com/folke/noice.nvim" + }, ["nord.nvim"] = { loaded = true, path = "/home/arco/.local/share/nvim/site/pack/packer/start/nord.nvim", url = "https://github.com/shaunsingh/nord.nvim" }, + ["nui.nvim"] = { + loaded = true, + path = "/home/arco/.local/share/nvim/site/pack/packer/start/nui.nvim", + url = "https://github.com/MunifTanjim/nui.nvim" + }, + ["nvim-notify"] = { + loaded = true, + path = "/home/arco/.local/share/nvim/site/pack/packer/start/nvim-notify", + url = "https://github.com/rcarriga/nvim-notify" + }, ["nvim-treesitter"] = { loaded = true, path = "/home/arco/.local/share/nvim/site/pack/packer/start/nvim-treesitter", diff --git a/syntax/hell.vim b/syntax/hell.vim index ef21c30..a48f4ce 100644 --- a/syntax/hell.vim +++ b/syntax/hell.vim @@ -6,6 +6,7 @@ syntax keyword hellKeyword import func syntax keyword hellKeyword if then else while for switch case syntax keyword hellKeyword writeln syntax keyword hellType int str float void double bool +syntax keyword hellType integer decimal character large_decimal CLion syntax keyword hellGlobalContainer hell highlight link hellKeyword Keyword diff --git a/syntax/pcd.vim b/syntax/pcd.vim index cd0ff3e..c16e061 100644 --- a/syntax/pcd.vim +++ b/syntax/pcd.vim @@ -4,14 +4,22 @@ endif syntax keyword pcdKeyword func syntax keyword pcdKeyword if then else while for switch case and -syntax keyword pcdKeyword break until end default return exec do in -syntax keyword pcdKeyword print break fetch exclude def from as alloc unalloc using catch -syntax keyword pcdKeyword pcode start stop -syntax keyword pcdKeyword int vd chr str stat flt db tab const long +syntax keyword pcdKeyword break until end default return do in +syntax keyword pcdKeyword break fetch exclude def from as alloc unalloc using catch vect_create vect_destroy vect_size args args3 proc io arr class +syntax keyword pcdFunction pcode start stop size_short size_long init populate_db throw err fork print exec size +syntax keyword pcdKeyword stat const usign +syntax keyword pcdKeyword i64 i32 i16 i8 ui64 ui32 ui16 ui8 v0 f64 f32 f16 f8 syntax keyword pcdKeyword global local +syntax keyword pcdKeyword true false + +syntax keyword pcdType int vd chr short sshort str flt db tab long vector +syntax keyword pcdType i64 i32 i16 i8 ui64 ui32 ui16 ui8 v0 f64 f32 f16 f8 +syntax keyword pcdType ctx syntax keyword pcdKeyword pcdver +highlight link pcdType Type + highlight link pcdKeyword Keyword highlight link pcdFunction Function @@ -26,6 +34,7 @@ syntax match pcdOperator "\v/\=" syntax match pcdOperator "\v\+\=" syntax match pcdOperator "\v-\=" syntax match pcdOperator "\v\!\=" +syntax keyword pcdOperator NULL highlight link pcdOperator Operator diff --git a/syntax/ph.vim b/syntax/ph.vim index 9e0a4ed..c16e061 100644 --- a/syntax/ph.vim +++ b/syntax/ph.vim @@ -2,36 +2,47 @@ if exists("b:current_syntax") finish endif -syntax keyword phKeyword func -syntax keyword phKeyword if then else while for switch case -syntax keyword phKeyword break until end default return exec -syntax keyword phKeyword print break fetch def from alloc unalloc -syntax keyword phKeyword head start stop -syntax keyword phKeyword int chr vd stat flt db tab +syntax keyword pcdKeyword func +syntax keyword pcdKeyword if then else while for switch case and +syntax keyword pcdKeyword break until end default return do in +syntax keyword pcdKeyword break fetch exclude def from as alloc unalloc using catch vect_create vect_destroy vect_size args args3 proc io arr class +syntax keyword pcdFunction pcode start stop size_short size_long init populate_db throw err fork print exec size +syntax keyword pcdKeyword stat const usign +syntax keyword pcdKeyword i64 i32 i16 i8 ui64 ui32 ui16 ui8 v0 f64 f32 f16 f8 +syntax keyword pcdKeyword global local +syntax keyword pcdKeyword true false -syntax keyword phKeyword phver +syntax keyword pcdType int vd chr short sshort str flt db tab long vector +syntax keyword pcdType i64 i32 i16 i8 ui64 ui32 ui16 ui8 v0 f64 f32 f16 f8 +syntax keyword pcdType ctx -highlight link phKeyword Keyword -highlight link phFunction Function +syntax keyword pcdKeyword pcdver -syntax match phOperator "\v\=" -syntax match phOperator "\v\*" -syntax match phOperator "\v/" -syntax match phOperator "\v\+" -syntax match phOperator "\v-" -syntax match phOperator "\v\?" -syntax match phOperator "\v\*\=" -syntax match phOperator "\v/\=" -syntax match phOperator "\v\+\=" -syntax match phOperator "\v-\=" +highlight link pcdType Type -highlight link phOperator Operator +highlight link pcdKeyword Keyword +highlight link pcdFunction Function -syntax region phString start=/\v"/ skip=/\v\\./ end=/\v"/ -syntax region phString start=/\v'/ skip=/\v\\./ end=/\v'/ -highlight link phString String +syntax match pcdOperator "\v\=" +syntax match pcdOperator "\v\*" +syntax match pcdOperator "\v/" +syntax match pcdOperator "\v\+" +syntax match pcdOperator "\v-" +syntax match pcdOperator "\v\?" +syntax match pcdOperator "\v\*\=" +syntax match pcdOperator "\v/\=" +syntax match pcdOperator "\v\+\=" +syntax match pcdOperator "\v-\=" +syntax match pcdOperator "\v\!\=" +syntax keyword pcdOperator NULL -syntax match phComment "\v//.*$" -highlight link phComment Comment +highlight link pcdOperator Operator -let b:current_syntax = "ph" +syntax region pcdString start=/\v"/ skip=/\v\\./ end=/\v"/ +syntax region pcdString start=/\v'/ skip=/\v\\./ end=/\v'/ +highlight link pcdString String + +syntax match pcdComment "\v//.*$" +highlight link pcdComment Comment + +let b:current_syntax = "pcd"