From c130f7285f250077336d0930898dbbeddb00b9f7 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 15 Mar 2023 15:03:55 +0100 Subject: chnaged tlast to 'user' to be more generic --- config/essentials/nvim/lua/tlast/aucommands.vim | 21 ----- config/essentials/nvim/lua/tlast/cmp/arduino.lua | 3 - config/essentials/nvim/lua/tlast/cmp/bash.lua | 1 - config/essentials/nvim/lua/tlast/cmp/clangd.lua | 2 - config/essentials/nvim/lua/tlast/cmp/css.lua | 1 - config/essentials/nvim/lua/tlast/cmp/emmet.lua | 1 - config/essentials/nvim/lua/tlast/cmp/html.lua | 7 -- config/essentials/nvim/lua/tlast/cmp/init.lua | 12 --- config/essentials/nvim/lua/tlast/cmp/java.lua | 1 - config/essentials/nvim/lua/tlast/cmp/js.lua | 1 - config/essentials/nvim/lua/tlast/cmp/lua.lua | 20 ----- config/essentials/nvim/lua/tlast/cmp/python.lua | 1 - config/essentials/nvim/lua/tlast/cmp/setup.lua | 49 ----------- config/essentials/nvim/lua/tlast/init.lua | 6 -- config/essentials/nvim/lua/tlast/packer.lua | 57 ------------- config/essentials/nvim/lua/tlast/remap.lua | 101 ----------------------- config/essentials/nvim/lua/tlast/set.lua | 43 ---------- config/essentials/nvim/lua/tlast/zk.lua | 56 ------------- config/essentials/nvim/lua/user/aucommands.vim | 21 +++++ config/essentials/nvim/lua/user/cmp/arduino.lua | 3 + config/essentials/nvim/lua/user/cmp/bash.lua | 1 + config/essentials/nvim/lua/user/cmp/clangd.lua | 2 + config/essentials/nvim/lua/user/cmp/css.lua | 1 + config/essentials/nvim/lua/user/cmp/emmet.lua | 1 + config/essentials/nvim/lua/user/cmp/html.lua | 7 ++ config/essentials/nvim/lua/user/cmp/init.lua | 12 +++ config/essentials/nvim/lua/user/cmp/java.lua | 1 + config/essentials/nvim/lua/user/cmp/js.lua | 1 + config/essentials/nvim/lua/user/cmp/lua.lua | 20 +++++ config/essentials/nvim/lua/user/cmp/python.lua | 1 + config/essentials/nvim/lua/user/cmp/setup.lua | 49 +++++++++++ config/essentials/nvim/lua/user/init.lua | 6 ++ config/essentials/nvim/lua/user/packer.lua | 57 +++++++++++++ config/essentials/nvim/lua/user/remap.lua | 101 +++++++++++++++++++++++ config/essentials/nvim/lua/user/set.lua | 43 ++++++++++ config/essentials/nvim/lua/user/zk.lua | 56 +++++++++++++ 36 files changed, 383 insertions(+), 383 deletions(-) delete mode 100644 config/essentials/nvim/lua/tlast/aucommands.vim delete mode 100644 config/essentials/nvim/lua/tlast/cmp/arduino.lua delete mode 100644 config/essentials/nvim/lua/tlast/cmp/bash.lua delete mode 100644 config/essentials/nvim/lua/tlast/cmp/clangd.lua delete mode 100644 config/essentials/nvim/lua/tlast/cmp/css.lua delete mode 100644 config/essentials/nvim/lua/tlast/cmp/emmet.lua delete mode 100644 config/essentials/nvim/lua/tlast/cmp/html.lua delete mode 100644 config/essentials/nvim/lua/tlast/cmp/init.lua delete mode 100644 config/essentials/nvim/lua/tlast/cmp/java.lua delete mode 100644 config/essentials/nvim/lua/tlast/cmp/js.lua delete mode 100644 config/essentials/nvim/lua/tlast/cmp/lua.lua delete mode 100644 config/essentials/nvim/lua/tlast/cmp/python.lua delete mode 100644 config/essentials/nvim/lua/tlast/cmp/setup.lua delete mode 100644 config/essentials/nvim/lua/tlast/init.lua delete mode 100644 config/essentials/nvim/lua/tlast/packer.lua delete mode 100644 config/essentials/nvim/lua/tlast/remap.lua delete mode 100644 config/essentials/nvim/lua/tlast/set.lua delete mode 100644 config/essentials/nvim/lua/tlast/zk.lua create mode 100644 config/essentials/nvim/lua/user/aucommands.vim create mode 100644 config/essentials/nvim/lua/user/cmp/arduino.lua create mode 100644 config/essentials/nvim/lua/user/cmp/bash.lua create mode 100644 config/essentials/nvim/lua/user/cmp/clangd.lua create mode 100644 config/essentials/nvim/lua/user/cmp/css.lua create mode 100644 config/essentials/nvim/lua/user/cmp/emmet.lua create mode 100644 config/essentials/nvim/lua/user/cmp/html.lua create mode 100644 config/essentials/nvim/lua/user/cmp/init.lua create mode 100644 config/essentials/nvim/lua/user/cmp/java.lua create mode 100644 config/essentials/nvim/lua/user/cmp/js.lua create mode 100644 config/essentials/nvim/lua/user/cmp/lua.lua create mode 100644 config/essentials/nvim/lua/user/cmp/python.lua create mode 100644 config/essentials/nvim/lua/user/cmp/setup.lua create mode 100644 config/essentials/nvim/lua/user/init.lua create mode 100644 config/essentials/nvim/lua/user/packer.lua create mode 100644 config/essentials/nvim/lua/user/remap.lua create mode 100644 config/essentials/nvim/lua/user/set.lua create mode 100644 config/essentials/nvim/lua/user/zk.lua (limited to 'config') diff --git a/config/essentials/nvim/lua/tlast/aucommands.vim b/config/essentials/nvim/lua/tlast/aucommands.vim deleted file mode 100644 index 732985f..0000000 --- a/config/essentials/nvim/lua/tlast/aucommands.vim +++ /dev/null @@ -1,21 +0,0 @@ -" Absolute numbers if window isn't focused -augroup numbertoggle - autocmd! - autocmd BufEnter,FocusGained,WinEnter * if &nu | set rnu | endif - autocmd BufLeave,FocusLost,WinLeave * if &nu | set nornu | endif -augroup END - -" terminal specific layout -augroup neovim_terminal autocmd! - autocmd TermOpen * startinsert - autocmd TermOpen * :GitGutterBufferDisable - autocmd TermOpen * :set nonumber norelativenumber signcolumn=no - autocmd TermOpen * nnoremap i -augroup END - -" Return to last edit position -autocmd BufReadPost * - \ if line("'\"") > 1 && line("'\"") <= line("$") | - \ exe "normal! g`\"" | - \ endif - diff --git a/config/essentials/nvim/lua/tlast/cmp/arduino.lua b/config/essentials/nvim/lua/tlast/cmp/arduino.lua deleted file mode 100644 index 777df8d..0000000 --- a/config/essentials/nvim/lua/tlast/cmp/arduino.lua +++ /dev/null @@ -1,3 +0,0 @@ -require'lspconfig'.arduino_language_server.setup{ - cmd = {"arduino-language-server", "-cli-config", "~/.arduinoIDE/arduino-cli.yaml"} -} diff --git a/config/essentials/nvim/lua/tlast/cmp/bash.lua b/config/essentials/nvim/lua/tlast/cmp/bash.lua deleted file mode 100644 index 91b6fba..0000000 --- a/config/essentials/nvim/lua/tlast/cmp/bash.lua +++ /dev/null @@ -1 +0,0 @@ -require'lspconfig'.bashls.setup{} diff --git a/config/essentials/nvim/lua/tlast/cmp/clangd.lua b/config/essentials/nvim/lua/tlast/cmp/clangd.lua deleted file mode 100644 index 810aa42..0000000 --- a/config/essentials/nvim/lua/tlast/cmp/clangd.lua +++ /dev/null @@ -1,2 +0,0 @@ --- c cpp -require'lspconfig'.clangd.setup{} diff --git a/config/essentials/nvim/lua/tlast/cmp/css.lua b/config/essentials/nvim/lua/tlast/cmp/css.lua deleted file mode 100644 index 07cb8bc..0000000 --- a/config/essentials/nvim/lua/tlast/cmp/css.lua +++ /dev/null @@ -1 +0,0 @@ -require'lspconfig'.cssls.setup{} diff --git a/config/essentials/nvim/lua/tlast/cmp/emmet.lua b/config/essentials/nvim/lua/tlast/cmp/emmet.lua deleted file mode 100644 index 3193727..0000000 --- a/config/essentials/nvim/lua/tlast/cmp/emmet.lua +++ /dev/null @@ -1 +0,0 @@ -require'lspconfig'.emmet_ls.setup{} diff --git a/config/essentials/nvim/lua/tlast/cmp/html.lua b/config/essentials/nvim/lua/tlast/cmp/html.lua deleted file mode 100644 index 69ed29d..0000000 --- a/config/essentials/nvim/lua/tlast/cmp/html.lua +++ /dev/null @@ -1,7 +0,0 @@ --- html -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities.textDocument.completion.completionItem.snippetSupport = true - -require'lspconfig'.html.setup { - capabilities = capabilities, -} diff --git a/config/essentials/nvim/lua/tlast/cmp/init.lua b/config/essentials/nvim/lua/tlast/cmp/init.lua deleted file mode 100644 index a80856c..0000000 --- a/config/essentials/nvim/lua/tlast/cmp/init.lua +++ /dev/null @@ -1,12 +0,0 @@ -require("tlast.cmp.setup") - -require("tlast.cmp.arduino") -require("tlast.cmp.bash") -require("tlast.cmp.clangd") -require("tlast.cmp.html") -require("tlast.cmp.css") -require("tlast.cmp.java") -require("tlast.cmp.js") -require("tlast.cmp.emmet") -require("tlast.cmp.lua") -require("tlast.cmp.python") diff --git a/config/essentials/nvim/lua/tlast/cmp/java.lua b/config/essentials/nvim/lua/tlast/cmp/java.lua deleted file mode 100644 index 7d13fb3..0000000 --- a/config/essentials/nvim/lua/tlast/cmp/java.lua +++ /dev/null @@ -1 +0,0 @@ -require'lspconfig'.jdtls.setup{} diff --git a/config/essentials/nvim/lua/tlast/cmp/js.lua b/config/essentials/nvim/lua/tlast/cmp/js.lua deleted file mode 100644 index 7188a22..0000000 --- a/config/essentials/nvim/lua/tlast/cmp/js.lua +++ /dev/null @@ -1 +0,0 @@ -require'lspconfig'.tsserver.setup{} diff --git a/config/essentials/nvim/lua/tlast/cmp/lua.lua b/config/essentials/nvim/lua/tlast/cmp/lua.lua deleted file mode 100644 index e594870..0000000 --- a/config/essentials/nvim/lua/tlast/cmp/lua.lua +++ /dev/null @@ -1,20 +0,0 @@ --- lua -require'lspconfig'.lua_ls.setup { - settings = { - Lua = { - runtime = { - version = 'LuaJIT', - }, - diagnostics = { - globals = {'vim'}, - }, - workspace = { - library = vim.api.nvim_get_runtime_file("", true), - checkThirdParty = false, -- no prompt for luassert :) - }, - telemetry = { - enable = false, - }, - }, - }, -} diff --git a/config/essentials/nvim/lua/tlast/cmp/python.lua b/config/essentials/nvim/lua/tlast/cmp/python.lua deleted file mode 100644 index aec86bd..0000000 --- a/config/essentials/nvim/lua/tlast/cmp/python.lua +++ /dev/null @@ -1 +0,0 @@ -require'lspconfig'.jedi_language_server.setup{} diff --git a/config/essentials/nvim/lua/tlast/cmp/setup.lua b/config/essentials/nvim/lua/tlast/cmp/setup.lua deleted file mode 100644 index ed8a2d2..0000000 --- a/config/essentials/nvim/lua/tlast/cmp/setup.lua +++ /dev/null @@ -1,49 +0,0 @@ -local cmp = require'cmp' -cmp.setup({ - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end, - }, - window = { - -- completion = cmp.config.window.bordered(), - -- documentation = cmp.config.window.bordered(), - }, - mapping = cmp.mapping.preset.insert({ - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.abort(), - [''] = cmp.mapping.confirm({ select = true }), - }), - sources = cmp.config.sources({ - { name = 'nvim_lua' }, - { name = 'nvim_lsp'}, - { name = 'path' }, - { name = 'luasnip' }, - { name = 'nvim_lsp_signature_help' }, - { name = 'buffer', keyword_length = 4 }, - }), - preselect = cmp.PreselectMode.None, -}) - -cmp.setup.filetype('gitcommit', { - sources = cmp.config.sources({ - { name = 'cmp_git' }, - { name = 'buffer', keyword_length = 4 }, - }) -}) - -cmp.setup.cmdline({ '/', '?' }, { - mapping = cmp.mapping.preset.cmdline(), - sources = { - { name = 'buffer', keyword_length = 4 } - }, -}) -cmp.setup.cmdline(':', { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ - { name = 'path' }, - { name = 'cmdline', keyword_length = 4 } - }), -}) diff --git a/config/essentials/nvim/lua/tlast/init.lua b/config/essentials/nvim/lua/tlast/init.lua deleted file mode 100644 index 9a9f387..0000000 --- a/config/essentials/nvim/lua/tlast/init.lua +++ /dev/null @@ -1,6 +0,0 @@ -require("tlast.packer") -require("tlast.remap") -require("tlast.set") -require("tlast.cmp") -require("tlast.zk") -vim.cmd.source(vim.fn.stdpath("config") .. "/lua/tlast/aucommands.vim") diff --git a/config/essentials/nvim/lua/tlast/packer.lua b/config/essentials/nvim/lua/tlast/packer.lua deleted file mode 100644 index 931e7d4..0000000 --- a/config/essentials/nvim/lua/tlast/packer.lua +++ /dev/null @@ -1,57 +0,0 @@ -return require('packer').startup(function(use) - use('wbthomason/packer.nvim') - - -- files - use { - 'nvim-telescope/telescope.nvim', tag = '0.1.1', - requires = { {'nvim-lua/plenary.nvim'} } - } - use('nvim-telescope/telescope-symbols.nvim') - use('theprimeagen/harpoon') - - -- colors - use('shaunsingh/nord.nvim') - use('norcalli/nvim-colorizer.lua') - - use('airblade/vim-gitgutter') - - use('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'}) - use('nvim-treesitter/playground') - - use('mbbill/undotree') - - use('tpope/vim-capslock') - use('tpope/vim-commentary') - use('tpope/vim-endwise') - use('tpope/vim-fugitive') - use('tpope/vim-repeat') - use('tpope/vim-surround') - use('tpope/vim-vinegar') - - -- utils - use('godlygeek/tabular') - use('renerocksai/calendar-vim') - use('LordTlasT/live-server') - use('ojroques/vim-oscyank', {branch = "main"}) - use("potamides/pantran.nvim") - - -- objects - use('michaeljsmith/vim-indent-object') - - -- completion - use('neovim/nvim-lspconfig') - use('hrsh7th/nvim-cmp') - use('hrsh7th/cmp-nvim-lua') - use('hrsh7th/cmp-nvim-lsp') - use('hrsh7th/cmp-buffer') - use('hrsh7th/cmp-path') - use('hrsh7th/cmp-cmdline') - use('hrsh7th/cmp-nvim-lsp-signature-help') - use('alvan/vim-closetag') - -- snippets - use('L3MON4D3/LuaSnip') - use('saadparwaiz1/cmp_luasnip') - - -- notes - use('renerocksai/telekasten.nvim') -end) diff --git a/config/essentials/nvim/lua/tlast/remap.lua b/config/essentials/nvim/lua/tlast/remap.lua deleted file mode 100644 index c2d4c0b..0000000 --- a/config/essentials/nvim/lua/tlast/remap.lua +++ /dev/null @@ -1,101 +0,0 @@ -vim.g.mapleader = " " -vim.g.maplocalleader = "\\" - --- -- vinegar is already doing this --- vim.keymap.set("n", "-", vim.cmd.Ex) - --- moving -vim.keymap.set("i", "", "I", { noremap = true }) -vim.keymap.set("i", "", "A", { noremap = true }) -vim.keymap.set("i", "", "D", { noremap = true }) - -vim.keymap.set("i", "{", "{}O", { noremap = true }) -vim.keymap.set("i", "{;", "{};O", { noremap = true }) - --- buffers -vim.keymap.set("n", "gb", "buffers:buffer", { noremap = true }) -vim.keymap.set("n", "q", "q!", { noremap = true }) -vim.keymap.set("n", "Q", "qa!", { noremap = true }) - --- Windows -vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "h", { noremap = true }) -vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "j", { noremap = true }) -vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "k", { noremap = true }) -vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "l", { noremap = true }) -vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "o", { noremap = true }) --- command line -vim.keymap.set("c", "", "", { noremap = true }) -vim.keymap.set("c", "", "", { noremap = true }) -vim.keymap.set("c", "", "", { noremap = true }) - --- move visual selection up/down wards -vim.keymap.set("v", "J", "m '>+1gv=gv", { noremap = true }) -vim.keymap.set("v", "K", "m '<-2gv=gv", { noremap = true }) - --- clipboard -vim.keymap.set("n", "y", "\"+y", { noremap = true }) -vim.keymap.set("n", "o", "OSCYank", { noremap = true }) - --- templates -vim.keymap.set("n", "rt", ":-1r " .. vim.fn.stdpath("config") .. "/templates", { noremap = true }) - --- hide all -local s = {hidden_all = 0} -vim.keymap.set("n", "", function () - s.hidden_all = 1 - s.hidden_all - local opt = s.hidden_all == 0 - vim.opt.showmode = opt - vim.opt.ruler = opt - vim.opt.nu = opt - vim.opt.rnu = opt - vim.opt.showcmd = opt - vim.opt.laststatus = opt and 2 or 0 - vim.opt.signcolumn = opt and "yes" or "no" -end, { noremap = true }) - --- utils -vim.keymap.set("i", "r", "r!echo -n $RANDOMkJA", { noremap = true }) --- ordered list -vim.keymap.set("v", "n", "I0. gvg", { noremap = true }) -vim.keymap.set("v", "u", "'<,'>s/^[0-9]\\+\\. //", { noremap = true }) --- scripts -vim.keymap.set("n", "x", "!chmod +x %", { noremap = true, silent = true}) --- replace -vim.keymap.set("n", "sf", [[:%s/\<\>//gI]]) -vim.keymap.set("n", "sl", [[:s/\<\>//gI]]) - --- write -vim.keymap.set("n", "w", "write", { noremap = true }) -vim.keymap.set("n", "W", "write!", { noremap = true }) -vim.keymap.set("n", "e", "edit", { noremap = true }) -vim.keymap.set("n", "s", function () - vim.cmd.source() - print("sourced.") -end, { noremap = true }) - --- Packer -vim.keymap.set("n", "P", "PackerSync", { noremap = true }) - --- spelling -vim.keymap.set("n", "", "setlocal spell!", { noremap = true }) - --- open terminal in file's parent director --- this needs to be asynchrous -vim.keymap.set("n", "", function () - local cmd = "cd " .. vim.fn.expand("%:p:h") .. "; setsid st" - -- asynchrous go brr - vim.fn.jobstart(cmd, { on_exit = function(job_id, exit_code, event_type) end }) -end, { noremap = true }) - - --- clear registers -vim.keymap.set("n", "rc", function () - local regs = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', - 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', - 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '/', '-', '"'} - for _, r in ipairs(regs) do - vim.fn.setreg(r, {}) - end -end, { noremap = true }) diff --git a/config/essentials/nvim/lua/tlast/set.lua b/config/essentials/nvim/lua/tlast/set.lua deleted file mode 100644 index 69ee4ae..0000000 --- a/config/essentials/nvim/lua/tlast/set.lua +++ /dev/null @@ -1,43 +0,0 @@ -local opt = vim.opt - -opt.clipboard = "unnamed" - -opt.termguicolors = true - -opt.number = true -opt.relativenumber = true -opt.showmatch = true -opt.matchtime = 0 -opt.showcmd = true -opt.cursorline = true -opt.ruler = true - -opt.path:append("**") - -opt.wildmenu = true -opt.incsearch = true -opt.hlsearch = false - -opt.mouse = "" - -opt.tabstop = 4 -opt.shiftwidth = 4 -opt.backspace = "indent,eol,start" - -opt.signcolumn = "yes" -opt.updatetime = 100 -opt.laststatus = 2 -opt.history = 200 -opt.encoding = "utf-8" - -opt.smartindent = true -opt.scrolloff = 8 - -opt.ignorecase = true -opt.smartcase = true - -opt.swapfile = false -opt.backup = false - -opt.spelllang = "en_us,nl" -opt.formatoptions = "cqrnj" diff --git a/config/essentials/nvim/lua/tlast/zk.lua b/config/essentials/nvim/lua/tlast/zk.lua deleted file mode 100644 index a3cdefb..0000000 --- a/config/essentials/nvim/lua/tlast/zk.lua +++ /dev/null @@ -1,56 +0,0 @@ -local home = vim.fn.expand("~/docs/zk") -require('telekasten').setup({ - home = home, - take_over_my_home = true, - auto_set_filetype = true, - auto_set_syntax = true, - dailies = home .. '/' .. 'daily', - weeklies = home .. '/' .. 'weekly', - templates = home .. '/' .. 'templates', - image_subdir = "img", - extension = ".md", - new_note_filename = "title", - uuid_type = "%Y%m%d%H%M", - uuid_sep = "-", - filename_space_subst = nil, - follow_creates_nonexisting = true, - dailies_create_nonexisting = true, - weeklies_create_nonexisting = true, - journal_auto_open = false, - template_new_note = home .. '/' .. 'templates/new_note.md', - template_new_daily = home .. '/' .. 'templates/daily.md', - template_new_weekly= home .. '/' .. 'templates/weekly.md', - image_link_style = "markdown", - sort = "filename", - plug_into_calendar = true, - calendar_opts = { - weeknm = 4, - calendar_monday = 1, - calendar_mark = 'left-fit', - }, - close_after_yanking = false, - insert_after_inserting = true, - tag_notation = "#tag", - command_palette_theme = "dropdown", - show_tags_theme = "ivy", - subdirs_in_links = true, - template_handling = "smart", - new_note_location = "smart", - rename_update_links = true, - media_previewer = "telescope-media-files", - follow_url_fallback = nil, -}) - -vim.keymap.set("n", "z", "Telekasten panel") -vim.keymap.set("n", "zN", "Telekasten new_templated_note") -vim.keymap.set("n", "zT", "Telekasten goto_today") -vim.keymap.set("n", "zW", "Telekasten goto_thisweek") -vim.keymap.set("n", "zd", "Telekasten find_daily_notes") -vim.keymap.set("n", "zf", "Telekasten find_notes") -vim.keymap.set("n", "zg", "Telekasten search_notes") -vim.keymap.set("n", "zm", "Telekasten browse_media") -vim.keymap.set("n", "zn", "Telekasten new_note") -vim.keymap.set("n", "zp", "Telekasten preview_img") -vim.keymap.set("n", "zs", "Telekasten switch_vault") -vim.keymap.set("n", "zw", "Telekasten find_weekly_notes") -vim.keymap.set("n", "#", "Telekasten show_tags") diff --git a/config/essentials/nvim/lua/user/aucommands.vim b/config/essentials/nvim/lua/user/aucommands.vim new file mode 100644 index 0000000..732985f --- /dev/null +++ b/config/essentials/nvim/lua/user/aucommands.vim @@ -0,0 +1,21 @@ +" Absolute numbers if window isn't focused +augroup numbertoggle + autocmd! + autocmd BufEnter,FocusGained,WinEnter * if &nu | set rnu | endif + autocmd BufLeave,FocusLost,WinLeave * if &nu | set nornu | endif +augroup END + +" terminal specific layout +augroup neovim_terminal autocmd! + autocmd TermOpen * startinsert + autocmd TermOpen * :GitGutterBufferDisable + autocmd TermOpen * :set nonumber norelativenumber signcolumn=no + autocmd TermOpen * nnoremap i +augroup END + +" Return to last edit position +autocmd BufReadPost * + \ if line("'\"") > 1 && line("'\"") <= line("$") | + \ exe "normal! g`\"" | + \ endif + diff --git a/config/essentials/nvim/lua/user/cmp/arduino.lua b/config/essentials/nvim/lua/user/cmp/arduino.lua new file mode 100644 index 0000000..777df8d --- /dev/null +++ b/config/essentials/nvim/lua/user/cmp/arduino.lua @@ -0,0 +1,3 @@ +require'lspconfig'.arduino_language_server.setup{ + cmd = {"arduino-language-server", "-cli-config", "~/.arduinoIDE/arduino-cli.yaml"} +} diff --git a/config/essentials/nvim/lua/user/cmp/bash.lua b/config/essentials/nvim/lua/user/cmp/bash.lua new file mode 100644 index 0000000..91b6fba --- /dev/null +++ b/config/essentials/nvim/lua/user/cmp/bash.lua @@ -0,0 +1 @@ +require'lspconfig'.bashls.setup{} diff --git a/config/essentials/nvim/lua/user/cmp/clangd.lua b/config/essentials/nvim/lua/user/cmp/clangd.lua new file mode 100644 index 0000000..810aa42 --- /dev/null +++ b/config/essentials/nvim/lua/user/cmp/clangd.lua @@ -0,0 +1,2 @@ +-- c cpp +require'lspconfig'.clangd.setup{} diff --git a/config/essentials/nvim/lua/user/cmp/css.lua b/config/essentials/nvim/lua/user/cmp/css.lua new file mode 100644 index 0000000..07cb8bc --- /dev/null +++ b/config/essentials/nvim/lua/user/cmp/css.lua @@ -0,0 +1 @@ +require'lspconfig'.cssls.setup{} diff --git a/config/essentials/nvim/lua/user/cmp/emmet.lua b/config/essentials/nvim/lua/user/cmp/emmet.lua new file mode 100644 index 0000000..3193727 --- /dev/null +++ b/config/essentials/nvim/lua/user/cmp/emmet.lua @@ -0,0 +1 @@ +require'lspconfig'.emmet_ls.setup{} diff --git a/config/essentials/nvim/lua/user/cmp/html.lua b/config/essentials/nvim/lua/user/cmp/html.lua new file mode 100644 index 0000000..69ed29d --- /dev/null +++ b/config/essentials/nvim/lua/user/cmp/html.lua @@ -0,0 +1,7 @@ +-- html +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities.textDocument.completion.completionItem.snippetSupport = true + +require'lspconfig'.html.setup { + capabilities = capabilities, +} diff --git a/config/essentials/nvim/lua/user/cmp/init.lua b/config/essentials/nvim/lua/user/cmp/init.lua new file mode 100644 index 0000000..a545f12 --- /dev/null +++ b/config/essentials/nvim/lua/user/cmp/init.lua @@ -0,0 +1,12 @@ +require("user.cmp.setup") + +require("user.cmp.arduino") +require("user.cmp.bash") +require("user.cmp.clangd") +require("user.cmp.html") +require("user.cmp.css") +require("user.cmp.java") +require("user.cmp.js") +require("user.cmp.emmet") +require("user.cmp.lua") +require("user.cmp.python") diff --git a/config/essentials/nvim/lua/user/cmp/java.lua b/config/essentials/nvim/lua/user/cmp/java.lua new file mode 100644 index 0000000..7d13fb3 --- /dev/null +++ b/config/essentials/nvim/lua/user/cmp/java.lua @@ -0,0 +1 @@ +require'lspconfig'.jdtls.setup{} diff --git a/config/essentials/nvim/lua/user/cmp/js.lua b/config/essentials/nvim/lua/user/cmp/js.lua new file mode 100644 index 0000000..7188a22 --- /dev/null +++ b/config/essentials/nvim/lua/user/cmp/js.lua @@ -0,0 +1 @@ +require'lspconfig'.tsserver.setup{} diff --git a/config/essentials/nvim/lua/user/cmp/lua.lua b/config/essentials/nvim/lua/user/cmp/lua.lua new file mode 100644 index 0000000..e594870 --- /dev/null +++ b/config/essentials/nvim/lua/user/cmp/lua.lua @@ -0,0 +1,20 @@ +-- lua +require'lspconfig'.lua_ls.setup { + settings = { + Lua = { + runtime = { + version = 'LuaJIT', + }, + diagnostics = { + globals = {'vim'}, + }, + workspace = { + library = vim.api.nvim_get_runtime_file("", true), + checkThirdParty = false, -- no prompt for luassert :) + }, + telemetry = { + enable = false, + }, + }, + }, +} diff --git a/config/essentials/nvim/lua/user/cmp/python.lua b/config/essentials/nvim/lua/user/cmp/python.lua new file mode 100644 index 0000000..aec86bd --- /dev/null +++ b/config/essentials/nvim/lua/user/cmp/python.lua @@ -0,0 +1 @@ +require'lspconfig'.jedi_language_server.setup{} diff --git a/config/essentials/nvim/lua/user/cmp/setup.lua b/config/essentials/nvim/lua/user/cmp/setup.lua new file mode 100644 index 0000000..ed8a2d2 --- /dev/null +++ b/config/essentials/nvim/lua/user/cmp/setup.lua @@ -0,0 +1,49 @@ +local cmp = require'cmp' +cmp.setup({ + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end, + }, + window = { + -- completion = cmp.config.window.bordered(), + -- documentation = cmp.config.window.bordered(), + }, + mapping = cmp.mapping.preset.insert({ + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.abort(), + [''] = cmp.mapping.confirm({ select = true }), + }), + sources = cmp.config.sources({ + { name = 'nvim_lua' }, + { name = 'nvim_lsp'}, + { name = 'path' }, + { name = 'luasnip' }, + { name = 'nvim_lsp_signature_help' }, + { name = 'buffer', keyword_length = 4 }, + }), + preselect = cmp.PreselectMode.None, +}) + +cmp.setup.filetype('gitcommit', { + sources = cmp.config.sources({ + { name = 'cmp_git' }, + { name = 'buffer', keyword_length = 4 }, + }) +}) + +cmp.setup.cmdline({ '/', '?' }, { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = 'buffer', keyword_length = 4 } + }, +}) +cmp.setup.cmdline(':', { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = 'path' }, + { name = 'cmdline', keyword_length = 4 } + }), +}) diff --git a/config/essentials/nvim/lua/user/init.lua b/config/essentials/nvim/lua/user/init.lua new file mode 100644 index 0000000..a9ba9c4 --- /dev/null +++ b/config/essentials/nvim/lua/user/init.lua @@ -0,0 +1,6 @@ +require("user.packer") +require("user.remap") +require("user.set") +require("user.cmp") +require("user.zk") +vim.cmd.source(vim.fn.stdpath("config") .. "/lua/user/aucommands.vim") diff --git a/config/essentials/nvim/lua/user/packer.lua b/config/essentials/nvim/lua/user/packer.lua new file mode 100644 index 0000000..931e7d4 --- /dev/null +++ b/config/essentials/nvim/lua/user/packer.lua @@ -0,0 +1,57 @@ +return require('packer').startup(function(use) + use('wbthomason/packer.nvim') + + -- files + use { + 'nvim-telescope/telescope.nvim', tag = '0.1.1', + requires = { {'nvim-lua/plenary.nvim'} } + } + use('nvim-telescope/telescope-symbols.nvim') + use('theprimeagen/harpoon') + + -- colors + use('shaunsingh/nord.nvim') + use('norcalli/nvim-colorizer.lua') + + use('airblade/vim-gitgutter') + + use('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'}) + use('nvim-treesitter/playground') + + use('mbbill/undotree') + + use('tpope/vim-capslock') + use('tpope/vim-commentary') + use('tpope/vim-endwise') + use('tpope/vim-fugitive') + use('tpope/vim-repeat') + use('tpope/vim-surround') + use('tpope/vim-vinegar') + + -- utils + use('godlygeek/tabular') + use('renerocksai/calendar-vim') + use('LordTlasT/live-server') + use('ojroques/vim-oscyank', {branch = "main"}) + use("potamides/pantran.nvim") + + -- objects + use('michaeljsmith/vim-indent-object') + + -- completion + use('neovim/nvim-lspconfig') + use('hrsh7th/nvim-cmp') + use('hrsh7th/cmp-nvim-lua') + use('hrsh7th/cmp-nvim-lsp') + use('hrsh7th/cmp-buffer') + use('hrsh7th/cmp-path') + use('hrsh7th/cmp-cmdline') + use('hrsh7th/cmp-nvim-lsp-signature-help') + use('alvan/vim-closetag') + -- snippets + use('L3MON4D3/LuaSnip') + use('saadparwaiz1/cmp_luasnip') + + -- notes + use('renerocksai/telekasten.nvim') +end) diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua new file mode 100644 index 0000000..962ce46 --- /dev/null +++ b/config/essentials/nvim/lua/user/remap.lua @@ -0,0 +1,101 @@ +vim.g.mapleader = " " +vim.g.maplocalleader = "\\" + +-- -- vinegar is already doing this +-- vim.keymap.set("n", "-", vim.cmd.Ex) + +-- moving +vim.keymap.set("i", "", "I", { noremap = true }) +vim.keymap.set("i", "", "A", { noremap = true }) +vim.keymap.set("i", "", "D", { noremap = true }) + +vim.keymap.set("i", "{", "{}O", { noremap = true }) +vim.keymap.set("i", "{;", "{};O", { noremap = true }) + +-- buffers +vim.keymap.set("n", "gb", "buffers:buffer", { noremap = true }) +vim.keymap.set("n", "q", "q!", { noremap = true }) +vim.keymap.set("n", "Q", "qa!", { noremap = true }) + +-- Windows +vim.keymap.set("n", "", "h", { noremap = true }) +vim.keymap.set("n", "", "j", { noremap = true }) +vim.keymap.set("n", "", "k", { noremap = true }) +vim.keymap.set("n", "", "l", { noremap = true }) +vim.keymap.set("n", "", "o", { noremap = true }) +-- command line +vim.keymap.set("c", "", "", { noremap = true }) +vim.keymap.set("c", "", "", { noremap = true }) +vim.keymap.set("c", "", "", { noremap = true }) + +-- move visual selection up/down wards +vim.keymap.set("v", "J", "m '>+1gv=gv", { noremap = true }) +vim.keymap.set("v", "K", "m '<-2gv=gv", { noremap = true }) + +-- clipboard +vim.keymap.set("n", "y", "\"+y", { noremap = true }) +vim.keymap.set("n", "o", "OSCYank", { noremap = true }) + +-- templates +vim.keymap.set("n", "rt", ":-1r " .. vim.fn.stdpath("config") .. "/templates", { noremap = true }) + +-- hide all +local s = {hidden_all = 0} +vim.keymap.set("n", "", function () + s.hidden_all = 1 - s.hidden_all + local opt = s.hidden_all == 0 + vim.opt.showmode = opt + vim.opt.ruler = opt + vim.opt.nu = opt + vim.opt.rnu = opt + vim.opt.showcmd = opt + vim.opt.laststatus = opt and 2 or 0 + vim.opt.signcolumn = opt and "yes" or "no" +end, { noremap = true }) + +-- utils +vim.keymap.set("i", "r", "r!echo -n $RANDOMkJA", { noremap = true }) +-- ordered list +vim.keymap.set("n", "n", "0vapI0. gvg", { noremap = true }) +vim.keymap.set("v", "u", "'<,'>s/^[0-9]\\+\\. //", { noremap = true }) +-- scripts +vim.keymap.set("n", "x", "!chmod +x %", { noremap = true, silent = true}) +-- replace +vim.keymap.set("n", "sf", [[:%s/\<\>//gI]]) +vim.keymap.set("n", "sl", [[:s/\<\>//gI]]) + +-- write +vim.keymap.set("n", "w", "write", { noremap = true }) +vim.keymap.set("n", "W", "write!", { noremap = true }) +vim.keymap.set("n", "e", "edit", { noremap = true }) +vim.keymap.set("n", "s", function () + vim.cmd.source() + print("sourced.") +end, { noremap = true }) + +-- Packer +vim.keymap.set("n", "P", "PackerSync", { noremap = true }) + +-- spelling +vim.keymap.set("n", "", "setlocal spell!", { noremap = true }) + +-- open terminal in file's parent director +-- this needs to be asynchrous +vim.keymap.set("n", "", function () + local cmd = "cd " .. vim.fn.expand("%:p:h") .. "; setsid st" + -- asynchrous go brr + vim.fn.jobstart(cmd, { on_exit = function(job_id, exit_code, event_type) end }) +end, { noremap = true }) + + +-- clear registers +vim.keymap.set("n", "rc", function () + local regs = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', + 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', + 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '/', '-', '"'} + for _, r in ipairs(regs) do + vim.fn.setreg(r, {}) + end +end, { noremap = true }) diff --git a/config/essentials/nvim/lua/user/set.lua b/config/essentials/nvim/lua/user/set.lua new file mode 100644 index 0000000..69ee4ae --- /dev/null +++ b/config/essentials/nvim/lua/user/set.lua @@ -0,0 +1,43 @@ +local opt = vim.opt + +opt.clipboard = "unnamed" + +opt.termguicolors = true + +opt.number = true +opt.relativenumber = true +opt.showmatch = true +opt.matchtime = 0 +opt.showcmd = true +opt.cursorline = true +opt.ruler = true + +opt.path:append("**") + +opt.wildmenu = true +opt.incsearch = true +opt.hlsearch = false + +opt.mouse = "" + +opt.tabstop = 4 +opt.shiftwidth = 4 +opt.backspace = "indent,eol,start" + +opt.signcolumn = "yes" +opt.updatetime = 100 +opt.laststatus = 2 +opt.history = 200 +opt.encoding = "utf-8" + +opt.smartindent = true +opt.scrolloff = 8 + +opt.ignorecase = true +opt.smartcase = true + +opt.swapfile = false +opt.backup = false + +opt.spelllang = "en_us,nl" +opt.formatoptions = "cqrnj" diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua new file mode 100644 index 0000000..a3cdefb --- /dev/null +++ b/config/essentials/nvim/lua/user/zk.lua @@ -0,0 +1,56 @@ +local home = vim.fn.expand("~/docs/zk") +require('telekasten').setup({ + home = home, + take_over_my_home = true, + auto_set_filetype = true, + auto_set_syntax = true, + dailies = home .. '/' .. 'daily', + weeklies = home .. '/' .. 'weekly', + templates = home .. '/' .. 'templates', + image_subdir = "img", + extension = ".md", + new_note_filename = "title", + uuid_type = "%Y%m%d%H%M", + uuid_sep = "-", + filename_space_subst = nil, + follow_creates_nonexisting = true, + dailies_create_nonexisting = true, + weeklies_create_nonexisting = true, + journal_auto_open = false, + template_new_note = home .. '/' .. 'templates/new_note.md', + template_new_daily = home .. '/' .. 'templates/daily.md', + template_new_weekly= home .. '/' .. 'templates/weekly.md', + image_link_style = "markdown", + sort = "filename", + plug_into_calendar = true, + calendar_opts = { + weeknm = 4, + calendar_monday = 1, + calendar_mark = 'left-fit', + }, + close_after_yanking = false, + insert_after_inserting = true, + tag_notation = "#tag", + command_palette_theme = "dropdown", + show_tags_theme = "ivy", + subdirs_in_links = true, + template_handling = "smart", + new_note_location = "smart", + rename_update_links = true, + media_previewer = "telescope-media-files", + follow_url_fallback = nil, +}) + +vim.keymap.set("n", "z", "Telekasten panel") +vim.keymap.set("n", "zN", "Telekasten new_templated_note") +vim.keymap.set("n", "zT", "Telekasten goto_today") +vim.keymap.set("n", "zW", "Telekasten goto_thisweek") +vim.keymap.set("n", "zd", "Telekasten find_daily_notes") +vim.keymap.set("n", "zf", "Telekasten find_notes") +vim.keymap.set("n", "zg", "Telekasten search_notes") +vim.keymap.set("n", "zm", "Telekasten browse_media") +vim.keymap.set("n", "zn", "Telekasten new_note") +vim.keymap.set("n", "zp", "Telekasten preview_img") +vim.keymap.set("n", "zs", "Telekasten switch_vault") +vim.keymap.set("n", "zw", "Telekasten find_weekly_notes") +vim.keymap.set("n", "#", "Telekasten show_tags") -- cgit v1.2.3 From 148f3bfed154e393b388bb17faa10e165f008dc8 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 19 Mar 2023 23:06:37 +0100 Subject: changed tlast to user --- config/essentials/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/essentials/nvim/init.lua b/config/essentials/nvim/init.lua index 7772f90..ea49ffa 100644 --- a/config/essentials/nvim/init.lua +++ b/config/essentials/nvim/init.lua @@ -1 +1 @@ -require("tlast") +require("user") -- cgit v1.2.3