From 06e5331c466817bd808ddf80e2a78e8ccb630829 Mon Sep 17 00:00:00 2001 From: foozzi Date: Fri, 23 Feb 2024 21:53:50 -0500 Subject: [PATCH] 23022024-4 --- global/.config/nvim/lazy-lock.json | 17 +++++++++-------- global/.config/nvim/lua/core/options.lua | 6 ++++++ global/.config/nvim/lua/plugins/mkdnflow.lua | 9 +++++++++ .../nvim/lua/plugins/nvim-treesitter.lua | 4 +++- global/.config/nvim/lua/plugins/telekasten.lua | 6 ++++++ 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/global/.config/nvim/lazy-lock.json b/global/.config/nvim/lazy-lock.json index 72314cc..3cb8734 100644 --- a/global/.config/nvim/lazy-lock.json +++ b/global/.config/nvim/lazy-lock.json @@ -2,12 +2,13 @@ "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, + "bullets.vim": { "branch": "master", "commit": "d9a47f114031d3030b1e4de3c0b6a664b1201524" }, "calendar-vim": { "branch": "master", "commit": "a7e73e02c92566bf427b2a1d6a61a8f23542cc21" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "bfae1d80d88607921e2ba5d75fd41bf88f0cd6c9" }, + "conform.nvim": { "branch": "master", "commit": "192a6d2ddace343f1840a8f72efe2315bd392243" }, "friendly-snippets": { "branch": "main", "commit": "dbd45e9ba76d535e4cba88afa1b7aa43bb765336" }, "hardtime.nvim": { "branch": "main", "commit": "860e912895176112868c97b46277f547e149f5e6" }, "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, @@ -15,26 +16,26 @@ "leap.nvim": { "branch": "main", "commit": "ff5522a0986cca1bbbeaa4f6d86d23ebf58a025c" }, "lsp-zero.nvim": { "branch": "v3.x", "commit": "abac76482ec3012a2b359ba956a74e2ffd33d46f" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "60f6805b12a12e8a912aeb2f975dec1794a8994e" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "mkdnflow.nvim": { "branch": "main", "commit": "09eeaec563033a501d797055c8c4448b4f087d53" }, - "neodev.nvim": { "branch": "main", "commit": "fdf6b3c58caf3ed1bfe40822d5dac340fc18c33b" }, + "mkdnflow.nvim": { "branch": "main", "commit": "9cdf9658df22c0b650090d9e6b8e72506f34b521" }, + "neodev.nvim": { "branch": "main", "commit": "f7f249b361e9fb245eea24cbcd9f5502e796c6ea" }, "neoscroll.nvim": { "branch": "master", "commit": "6e3546751076890304428150e53bd59198a4505d" }, "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, "nvim-autopairs": { "branch": "master", "commit": "90f824d37c0cb079d2764927e73af77faa9ba0ef" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, - "nvim-lint": { "branch": "master", "commit": "99f93757276ea55c35bbe74ad2a3d25fc504643b" }, - "nvim-lspconfig": { "branch": "master", "commit": "aa199c5bbdbb7fd28b56212a89206f13db02799e" }, + "nvim-lint": { "branch": "master", "commit": "6f6d866362c74ec2eb036c32b56fac50b02af669" }, + "nvim-lspconfig": { "branch": "master", "commit": "d5b6d4366dfd7a1071b930defd365e6d0be258de" }, "nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" }, "nvim-tree.lua": { "branch": "master", "commit": "030defdb6522f5f716d8201d20ca1a2baa57ca66" }, - "nvim-treesitter": { "branch": "master", "commit": "ebf0532d422cef34be5207e02929764885c47a05" }, + "nvim-treesitter": { "branch": "master", "commit": "adf72368f6af026b4cd19851d34a313a54159857" }, "nvim-treesitter-context": { "branch": "master", "commit": "98bdd713ffab5543f60ff1beaeba5c4918915e1b" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, "nvim-web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "tagbar": { "branch": "master", "commit": "12edcb59449b335555652898f82dd6d5c59d519a" }, - "telekasten.nvim": { "branch": "main", "commit": "d2b7c2c4d4727f31bb0676ed90e7ecdc8f67ae12" }, + "telekasten.nvim": { "branch": "main", "commit": "872b83f619ddfe4312acdc658d129b6828e1f418" }, "telescope.nvim": { "branch": "master", "commit": "54930e1abfc94409e1bb9266e752ef8379008592" }, "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" }, diff --git a/global/.config/nvim/lua/core/options.lua b/global/.config/nvim/lua/core/options.lua index fe82d38..76dec64 100644 --- a/global/.config/nvim/lua/core/options.lua +++ b/global/.config/nvim/lua/core/options.lua @@ -1,4 +1,5 @@ local opt = vim.opt +local api = vim.api -- Tab / Indentation opt.tabstop = 2 @@ -48,3 +49,8 @@ opt.modifiable = true -- "n-v-c:block,i-ci-ve:block,r-cr:hor20,o:hor50,a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor,sm:block-blinkwait175-blinkoff150-blinkon175" opt.encoding = "UTF-8" opt.cursorline = false + +api.nvim_set_option( + "langmap", + "йq,цw,уe,кr,еt,нy,гu,шi,щo,зp,х[,ъ],фa,ыs,вd,аf,пg,рh,оj,лk,дl,ж\\;,э',ё\\,яz,чx,сc,мv,иb,тn,ьm,б\\,,ю.,ЙQ,ЦW,УE,КR,ЕT,НY,ГU,ШI,ЩO,ЗP,Х{,Ъ},ФA,ЫS,ВD,АF,ПG,РH,ОJ,ЛK,ДL,Ж:,Э\",ЯZ,ЧX,СC,МV,ИB,ТN,ЬM,Б<,Ю>,Ё/|" +) diff --git a/global/.config/nvim/lua/plugins/mkdnflow.lua b/global/.config/nvim/lua/plugins/mkdnflow.lua index 93bae11..ace087e 100644 --- a/global/.config/nvim/lua/plugins/mkdnflow.lua +++ b/global/.config/nvim/lua/plugins/mkdnflow.lua @@ -18,6 +18,15 @@ return { cmp = true, }, filetypes = { md = true, rmd = true, markdown = true, telekasten = true }, + links = { + transform_explicit = function(text) + return text + end, + style = "wiki", + }, }) end, + dependencies = { + "bullets-vim/bullets.vim", + }, } diff --git a/global/.config/nvim/lua/plugins/nvim-treesitter.lua b/global/.config/nvim/lua/plugins/nvim-treesitter.lua index 38ce0ec..844fad6 100644 --- a/global/.config/nvim/lua/plugins/nvim-treesitter.lua +++ b/global/.config/nvim/lua/plugins/nvim-treesitter.lua @@ -1,4 +1,6 @@ local config = function() + local parser_configs = require("nvim-treesitter.parsers").get_parser_configs() + parser_configs.markdown.used_by = { "telekasten" } require("nvim-treesitter.configs").setup({ build = ":TSUpdate", indent = { @@ -49,5 +51,5 @@ end return { "nvim-treesitter/nvim-treesitter", lazy = false, - opts = config, + config = config, } diff --git a/global/.config/nvim/lua/plugins/telekasten.lua b/global/.config/nvim/lua/plugins/telekasten.lua index 828d29e..d245178 100644 --- a/global/.config/nvim/lua/plugins/telekasten.lua +++ b/global/.config/nvim/lua/plugins/telekasten.lua @@ -1,6 +1,12 @@ +local templates = vim.fn.expand("~/Dropbox/TextSync/99-templates") + local config = function() require("telekasten").setup({ home = vim.fn.expand("~/Dropbox/TextSync/00-zettel"), + -- dailies = vim.fn.expand("~/Dropbox/TextSync/00-zettel/dialy"), + templates = templates, + template_new_note = templates .. "/" .. "new_note", + template_new_daily = templates .. "/" .. "dialy_note", vim.api.nvim_command("hi tkLink ctermfg=36 cterm=bold,underline guifg=#10ac84 gui=bold,underline"), vim.api.nvim_command("hi tkBrackets ctermfg=gray guifg=gray"),