From fddf7fe6e3727c931d785900b7288bf4273646cc Mon Sep 17 00:00:00 2001 From: Liam Waldron Date: Fri, 26 Apr 2024 15:16:28 -0400 Subject: [PATCH] 4/26 --- ftdetect/emk.vim | 1 + ftdetect/emkfile.vim | 1 + ftdetect/hell.vim | 1 + ftdetect/pcd.vim | 1 + ftdetect/ph.vim | 1 + ftdetect/xmk.vim | 1 + init.vim | 2 +- lua/plugins.lua | 17 +++++++++++++ plugin/lualine.lua | 3 ++- plugin/packer_compiled.lua | 49 ++++++++++++++++++++++---------------- syntax/emk.vim | 17 +++++++++++++ syntax/emkfile.vim | 33 +++++++++++++++++++++++++ syntax/hell.vim | 49 ++++++++++++++++++++++++++++++++++++++ syntax/pcd.vim | 39 ++++++++++++++++++++++++++++++ syntax/ph.vim | 37 ++++++++++++++++++++++++++++ syntax/xmk.vim | 38 +++++++++++++++++++++++++++++ 16 files changed, 268 insertions(+), 22 deletions(-) create mode 100644 ftdetect/emk.vim create mode 100644 ftdetect/emkfile.vim create mode 100644 ftdetect/hell.vim create mode 100644 ftdetect/pcd.vim create mode 100644 ftdetect/ph.vim create mode 100644 ftdetect/xmk.vim create mode 100644 syntax/emk.vim create mode 100644 syntax/emkfile.vim create mode 100644 syntax/hell.vim create mode 100644 syntax/pcd.vim create mode 100644 syntax/ph.vim create mode 100644 syntax/xmk.vim diff --git a/ftdetect/emk.vim b/ftdetect/emk.vim new file mode 100644 index 0000000..f02ad58 --- /dev/null +++ b/ftdetect/emk.vim @@ -0,0 +1 @@ +autocmd BufRead,BufNewFile *.emk set filetype=emk diff --git a/ftdetect/emkfile.vim b/ftdetect/emkfile.vim new file mode 100644 index 0000000..d7956ac --- /dev/null +++ b/ftdetect/emkfile.vim @@ -0,0 +1 @@ +autocmd BufRead,BufNewFile emkfile set filetype=emkfile diff --git a/ftdetect/hell.vim b/ftdetect/hell.vim new file mode 100644 index 0000000..1d40ca3 --- /dev/null +++ b/ftdetect/hell.vim @@ -0,0 +1 @@ +autocmd BufRead,BufNewFile *.hell set filetype=hell diff --git a/ftdetect/pcd.vim b/ftdetect/pcd.vim new file mode 100644 index 0000000..2e94f29 --- /dev/null +++ b/ftdetect/pcd.vim @@ -0,0 +1 @@ +autocmd BufRead,BufNewFile *.pcd set filetype=pcd diff --git a/ftdetect/ph.vim b/ftdetect/ph.vim new file mode 100644 index 0000000..170c601 --- /dev/null +++ b/ftdetect/ph.vim @@ -0,0 +1 @@ +autocmd BufRead,BufNewFile *.ph set filetype=ph diff --git a/ftdetect/xmk.vim b/ftdetect/xmk.vim new file mode 100644 index 0000000..cbcbce9 --- /dev/null +++ b/ftdetect/xmk.vim @@ -0,0 +1 @@ +autocmd BufRead,BufNewFile *.xmk set filetype=xmk diff --git a/init.vim b/init.vim index ad54161..cf7136d 100644 --- a/init.vim +++ b/init.vim @@ -7,7 +7,7 @@ highlight HellKey ctermfg=cyan guifg=#00ffff highlight HellValue ctermfg=red guifg=#00ffff set number -colorscheme gruvbox +colorscheme nord set background=dark let g:airline_theme='base16' diff --git a/lua/plugins.lua b/lua/plugins.lua index eb66d85..7e4ffbc 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -8,4 +8,21 @@ return require('packer').startup(function(use) "ellisonleao/glow.nvim", config = function() require("glow").setup() end } + use { + 'Pocco81/auto-save.nvim', + config = function() + require("auto-save").setup { + enabled = true + } + end, + } + use { + 'nvim-treesitter/nvim-treesitter', + run = function() + local ts_update = require('nvim-treesitter.install').update({ with_sync = true }) + ts_update() + end, + } + use 'shaunsingh/nord.nvim' end) + diff --git a/plugin/lualine.lua b/plugin/lualine.lua index e216a42..05ce0c0 100644 --- a/plugin/lualine.lua +++ b/plugin/lualine.lua @@ -1,7 +1,8 @@ require('lualine').setup { options = { icons_enabled = true, - theme = 'gruvbox-material', + theme = 'nord', + -- theme = 'gruvbox-material', component_separators = { left = '', right = ''}, section_separators = { left = '', right = ''}, disabled_filetypes = { diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index 5ef0a33..d45ddc1 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.1700008891/share/lua/5.1/?.lua;/home/arco/.cache/nvim/packer_hererocks/2.1.1700008891/share/lua/5.1/?/init.lua;/home/arco/.cache/nvim/packer_hererocks/2.1.1700008891/lib/luarocks/rocks-5.1/?.lua;/home/arco/.cache/nvim/packer_hererocks/2.1.1700008891/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/arco/.cache/nvim/packer_hererocks/2.1.1700008891/lib/lua/5.1/?.so" +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" if not string.find(package.path, package_path_str, 1, true) then package.path = package.path .. ';' .. package_path_str end @@ -74,13 +74,16 @@ end time([[try_loadstring definition]], false) time([[Defining packer_plugins]], true) _G.packer_plugins = { + ["auto-save.nvim"] = { + config = { "\27LJ\2\nG\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\fenabled\2\nsetup\14auto-save\frequire\0" }, + loaded = true, + path = "/home/arco/.local/share/nvim/site/pack/packer/start/auto-save.nvim", + url = "https://github.com/Pocco81/auto-save.nvim" + }, ["glow.nvim"] = { - commands = { "Glow" }, - config = { true }, - loaded = false, - needs_bufread = false, - only_cond = false, - path = "/home/arco/.local/share/nvim/site/pack/packer/opt/glow.nvim", + config = { "\27LJ\2\n2\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\tglow\frequire\0" }, + loaded = true, + path = "/home/arco/.local/share/nvim/site/pack/packer/start/glow.nvim", url = "https://github.com/ellisonleao/glow.nvim" }, ["lualine.nvim"] = { @@ -88,6 +91,16 @@ _G.packer_plugins = { path = "/home/arco/.local/share/nvim/site/pack/packer/start/lualine.nvim", url = "https://github.com/nvim-lualine/lualine.nvim" }, + ["nord.nvim"] = { + loaded = true, + path = "/home/arco/.local/share/nvim/site/pack/packer/start/nord.nvim", + url = "https://github.com/shaunsingh/nord.nvim" + }, + ["nvim-treesitter"] = { + loaded = true, + path = "/home/arco/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + url = "https://github.com/nvim-treesitter/nvim-treesitter" + }, ["nvim-web-devicons"] = { loaded = false, needs_bufread = false, @@ -102,18 +115,14 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) - --- Command lazy-loads -time([[Defining lazy-load commands]], true) -pcall(vim.api.nvim_create_user_command, 'Glow', function(cmdargs) - require('packer.load')({'glow.nvim'}, { cmd = 'Glow', l1 = cmdargs.line1, l2 = cmdargs.line2, bang = cmdargs.bang, args = cmdargs.args, mods = cmdargs.mods }, _G.packer_plugins) - end, - {nargs = '*', range = true, bang = true, complete = function() - require('packer.load')({'glow.nvim'}, {}, _G.packer_plugins) - return vim.fn.getcompletion('Glow ', 'cmdline') - end}) -time([[Defining lazy-load commands]], false) - +-- Config for: auto-save.nvim +time([[Config for auto-save.nvim]], true) +try_loadstring("\27LJ\2\nG\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\fenabled\2\nsetup\14auto-save\frequire\0", "config", "auto-save.nvim") +time([[Config for auto-save.nvim]], false) +-- Config for: glow.nvim +time([[Config for glow.nvim]], true) +try_loadstring("\27LJ\2\n2\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\tglow\frequire\0", "config", "glow.nvim") +time([[Config for glow.nvim]], false) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then diff --git a/syntax/emk.vim b/syntax/emk.vim new file mode 100644 index 0000000..d5edc9e --- /dev/null +++ b/syntax/emk.vim @@ -0,0 +1,17 @@ +if exists("b:current_syntax") + finish +endif + +syntax keyword emkKeyword declare function include + +highlight link emkKeyword Keyword +highlight link emkFunction Function + +syntax region emkString start=/\v"/ skip=/\v\\./ end=/\v"/ +syntax region emkString start=/\v'/ skip=/\v\\./ end=/\v'/ +highlight link emkString String + +syntax match emkComment "\v//.*$" +highlight link emkComment Comment + +let b:current_syntax = "emk" diff --git a/syntax/emkfile.vim b/syntax/emkfile.vim new file mode 100644 index 0000000..246c3dc --- /dev/null +++ b/syntax/emkfile.vim @@ -0,0 +1,33 @@ +if exists("b:current_syntax") + finish +endif + +syntax keyword emkfileKeyword declare function include +syntax keyword emkfileKeyword if then else while for do +syntax keyword emkfileKeyword echo + +highlight link emkfileKeyword Keyword +highlight link emkfileFunction Function + +syntax match emkfileOperator "\v\=" +syntax match emkfileOperator "\v\*" +syntax match emkfileOperator "\v/" +syntax match emkfileOperator "\v\+" +syntax match emkfileOperator "\v-" +syntax match emkfileOperator "\v\?" +syntax match emkfileOperator "\v\*\=" +syntax match emkfileOperator "\v/\=" +syntax match emkfileOperator "\v\+\=" +syntax match emkfileOperator "\v-\=" +syntax match emkfileOperator "\v\!\=" + +highlight link emkfileOperator Operator + +syntax region emkfileString start=/\v"/ skip=/\v\\./ end=/\v"/ +syntax region emkfileString start=/\v'/ skip=/\v\\./ end=/\v'/ +highlight link emkfileString String + +syntax match emkfileComment "\v//.*$" +highlight link emkfileComment Comment + +let b:current_syntax = "emkfile" diff --git a/syntax/hell.vim b/syntax/hell.vim new file mode 100644 index 0000000..ef21c30 --- /dev/null +++ b/syntax/hell.vim @@ -0,0 +1,49 @@ +if exists("b:current_syntax") + finish +endif + +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 hellGlobalContainer hell + +highlight link hellKeyword Keyword +highlight link hellFunction Function +highlight link hellType Type +highlight link hellGlobalContainer Structure + +syntax match hellOperator "\v\=" +syntax match hellOperator "\v\*" +syntax match hellOperator "\v/" +syntax match hellOperator "\v\+" +syntax match hellOperator "\v-" +syntax match hellOperator "\v\?" +syntax match hellOperator "\v\*\=" +syntax match hellOperator "\v/\=" +syntax match hellOperator "\v\+\=" +syntax match hellOperator "\v-\=" +syntax match hellOperator "\v\!\=" + +syntax match hellNumber "0" +syntax match hellNumber "1" +syntax match hellNumber "2" +syntax match hellNumber "3" +syntax match hellNumber "4" +syntax match hellNumber "5" +syntax match hellNumber "6" +syntax match hellNumber "7" +syntax match hellNumber "8" +syntax match hellNumber "9" + +highlight link hellOperator Operator +highlight link hellNumber Constant + +syntax region hellString start=/\v"/ skip=/\v\\./ end=/\v"/ +syntax region hellString start=/\v'/ skip=/\v\\./ end=/\v'/ +highlight link hellString String + +syntax match hellComment "\v//.*$" +highlight link hellComment Comment + +let b:current_syntax = "hell" diff --git a/syntax/pcd.vim b/syntax/pcd.vim new file mode 100644 index 0000000..cd0ff3e --- /dev/null +++ b/syntax/pcd.vim @@ -0,0 +1,39 @@ +if exists("b:current_syntax") + finish +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 global local + +syntax keyword pcdKeyword pcdver + +highlight link pcdKeyword Keyword +highlight link pcdFunction Function + +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\!\=" + +highlight link pcdOperator Operator + +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" diff --git a/syntax/ph.vim b/syntax/ph.vim new file mode 100644 index 0000000..9e0a4ed --- /dev/null +++ b/syntax/ph.vim @@ -0,0 +1,37 @@ +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 phKeyword phver + +highlight link phKeyword Keyword +highlight link phFunction Function + +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 phOperator Operator + +syntax region phString start=/\v"/ skip=/\v\\./ end=/\v"/ +syntax region phString start=/\v'/ skip=/\v\\./ end=/\v'/ +highlight link phString String + +syntax match phComment "\v//.*$" +highlight link phComment Comment + +let b:current_syntax = "ph" diff --git a/syntax/xmk.vim b/syntax/xmk.vim new file mode 100644 index 0000000..ea61332 --- /dev/null +++ b/syntax/xmk.vim @@ -0,0 +1,38 @@ +if exists("b:current_syntax") + finish +endif + +syntax keyword xmkKeyword DECLARE FUNCTION INCLUDE +syntax keyword xmkKeyword if then else while for switch case and +syntax keyword xmkKeyword break until end default return exec do in +syntax keyword xmkKeyword print break fetch exclude def from alloc unalloc using +syntax keyword xmkKeyword pcode start stop +syntax keyword xmkKeyword int vd chr str stat flt db tab const + +syntax keyword xmkKeyword xmkver + +highlight link xmkKeyword Keyword +highlight link xmkFunction Function + +syntax match xmkOperator "\v\=" +syntax match xmkOperator "\v\*" +syntax match xmkOperator "\v/" +syntax match xmkOperator "\v\+" +syntax match xmkOperator "\v-" +syntax match xmkOperator "\v\?" +syntax match xmkOperator "\v\*\=" +syntax match xmkOperator "\v/\=" +syntax match xmkOperator "\v\+\=" +syntax match xmkOperator "\v-\=" +syntax match xmkOperator "\v\!\=" + +highlight link xmkOperator Operator + +syntax region xmkString start=/\v"/ skip=/\v\\./ end=/\v"/ +syntax region xmkString start=/\v'/ skip=/\v\\./ end=/\v'/ +highlight link xmkString String + +syntax match xmkComment "\v//.*$" +highlight link xmkComment Comment + +let b:current_syntax = "xmk"