From 497a49f55d3b0123045211c4b423d89707639957 Mon Sep 17 00:00:00 2001 From: Ray Andrew <4437323+rayandrew@users.noreply.github.com> Date: Thu, 14 Dec 2023 17:39:57 -0600 Subject: [PATCH] update --- after/ftplugin/latex.lua | 1 + after/ftplugin/tex.lua | 3 +++ after/ftplugin/text.lua | 11 +++++++++++ lazy-lock.json | 20 ++++++++++---------- lua/rayandrew/filetype.lua | 1 + lua/rayandrew/init.lua | 2 +- lua/rayandrew/plugins.lua | 11 +++++++++-- lua/rayandrew/util.lua | 9 +++++++++ 8 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 after/ftplugin/latex.lua create mode 100644 after/ftplugin/tex.lua create mode 100644 after/ftplugin/text.lua diff --git a/after/ftplugin/latex.lua b/after/ftplugin/latex.lua new file mode 100644 index 0000000..66003d7 --- /dev/null +++ b/after/ftplugin/latex.lua @@ -0,0 +1 @@ +vim.cmd([[runtime! ftplugin/tex.lua]]) diff --git a/after/ftplugin/tex.lua b/after/ftplugin/tex.lua new file mode 100644 index 0000000..c0e027a --- /dev/null +++ b/after/ftplugin/tex.lua @@ -0,0 +1,3 @@ +vim.opt_local.wrap = true +vim.opt_local.breakindent = true +vim.opt_local.breakindentopt = "shift:2" diff --git a/after/ftplugin/text.lua b/after/ftplugin/text.lua new file mode 100644 index 0000000..99f53e1 --- /dev/null +++ b/after/ftplugin/text.lua @@ -0,0 +1,11 @@ +vim.opt_local.tabstop = 4 +vim.opt_local.softtabstop = 4 +vim.opt_local.shiftwidth = 4 +vim.opt_local.expandtab = false +vim.opt_local.wrap = true +-- disable indentation +vim.opt_local.autoindent = false +vim.opt_local.smartindent = false +vim.opt_local.cindent = false +-- vim.opt_local.indentexpr = "" +-- vim.opt_local.paste = true diff --git a/lazy-lock.json b/lazy-lock.json index 739e8c8..b9a0661 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "954c81b53989097faaff0fabc11c29575288c3e1" }, + "LuaSnip": { "branch": "master", "commit": "6a001360cea89df50f7c5cc8c7a75e6a21f1ef5c" }, "bufresize.nvim": { "branch": "master", "commit": "3b19527ab936d6910484dcc20fb59bdb12322d8b" }, "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" }, "cloak.nvim": { "branch": "main", "commit": "951b163e55ce7639eb320c450bde9283c4fe968b" }, @@ -8,11 +8,11 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "copilot.vim": { "branch": "release", "commit": "2c31989063b145830d5f0bea8ab529d2aef2427b" }, + "copilot.vim": { "branch": "release", "commit": "5b19fb001d7f31c4c7c5556d7a97b243bd29f45f" }, "distant.nvim": { "branch": "v0.3", "commit": "998724f62386c8022a4e6c885f4509cf9477451a" }, "focus.nvim": { "branch": "master", "commit": "c83be53de558f6f0824c8cefcad61719c87ce157" }, "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "gitsigns.nvim": { "branch": "main", "commit": "017c924e20e52096796fe8bb89b9718acb5a067c" }, + "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, "glow.nvim": { "branch": "main", "commit": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5" }, "harpoon": { "branch": "master", "commit": "867e212ac153e793f95b316d1731f3ca1894625e" }, "image.nvim": { "branch": "master", "commit": "41f0f2643a09631bc0d8e2837b514667d423e440" }, @@ -30,29 +30,29 @@ "nabla.nvim": { "branch": "master", "commit": "f5aff14fa3d60f4be568c444be84400812823648" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "230ff118613fa07138ba579b89d13ec2201530b9" }, "neoconf.nvim": { "branch": "main", "commit": "64437787dba70fce50dad7bfbb97d184c5bc340f" }, - "neodev.nvim": { "branch": "main", "commit": "c4ce017bd4bacf60bf59330cec9e93c5d5e104a6" }, + "neodev.nvim": { "branch": "main", "commit": "ef351fae5df2559956398923c5d38c9b64e7d898" }, "neorg": { "branch": "main", "commit": "baaf13a3145534144b795ad37db22bfffd2ad343" }, "neorg-telescope": { "branch": "main", "commit": "6a7a677c40fa3c348924a4e2a06a513e0b34c056" }, "nui.nvim": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "nvim-bqf": { "branch": "main", "commit": "bdc2a4e5bb670b3c0e33ada9c0eec636d93a0748" }, - "nvim-cmp": { "branch": "main", "commit": "41d7633e4146dce1072de32cea31ee31b056a131" }, - "nvim-lspconfig": { "branch": "master", "commit": "bd405e45c5fb122c16af8f87fa2dd7ab1981b243" }, + "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, + "nvim-lspconfig": { "branch": "master", "commit": "84f2dd42efffa20d505ac44c78568d778ca7e0a1" }, "nvim-spectre": { "branch": "master", "commit": "a18a58015b46f02b4fe537ebfffd82e46110ff24" }, "nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" }, - "nvim-treesitter": { "branch": "master", "commit": "b6b9ca448b7f236e2e60f8393a729902511f9db9" }, + "nvim-treesitter": { "branch": "master", "commit": "ab818bf5a2ee21515ade9afcf428e98056b6197b" }, "nvim-treesitter-context": { "branch": "master", "commit": "cfa8ee19ac9bae9b7fb2958eabe2b45b70c56ccb" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" }, "nvim-ufo": { "branch": "main", "commit": "9fa77fb7e4365a053a5303b773aaf5eaf806d1f4" }, - "nvim-web-devicons": { "branch": "master", "commit": "8b2e5ef9eb8a717221bd96cb8422686d65a09ed5" }, + "nvim-web-devicons": { "branch": "master", "commit": "a1425903ab52a0a0460622519e827f224e5b4fee" }, "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, "rasmus": { "branch": "main", "commit": "f824de95d446686e479781c0c2b778c177da528f" }, "refactoring.nvim": { "branch": "master", "commit": "156532476deb10b1b2a32cb38e1078b3f9951c42" }, "rose-pine": { "branch": "main", "commit": "92762f4fa2144c05db760ea254f4c399a56a7ef5" }, - "smart-splits.nvim": { "branch": "master", "commit": "c970c7a3cc7ba635fd73d43c81b40f04c00f5058" }, + "smart-splits.nvim": { "branch": "master", "commit": "f0003bf9c3f11b8b9209264f865b8864453ca926" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope.nvim": { "branch": "master", "commit": "6213322ab56eb27356fdc09a5078e41e3ea7f3bc" }, @@ -67,7 +67,7 @@ "vim-rsi": { "branch": "master", "commit": "45540637ead22f011e8215f1c90142e49d946a54" }, "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, "vim-tmux-navigator": { "branch": "master", "commit": "7db70e08ea03b3e4d91f63713d76134512e28d7e" }, - "vimtex": { "branch": "master", "commit": "8dad59abe76c7a9ad3485d3015b8101b2e737892" }, + "vimtex": { "branch": "master", "commit": "29b6c052707b2d713fe2097cd5df54ce12ba2f90" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, "zen-mode.nvim": { "branch": "main", "commit": "50e2e2a36cc97847d9ab3b1a3555ba2ef6839b50" } } \ No newline at end of file diff --git a/lua/rayandrew/filetype.lua b/lua/rayandrew/filetype.lua index 1507852..4397410 100644 --- a/lua/rayandrew/filetype.lua +++ b/lua/rayandrew/filetype.lua @@ -10,6 +10,7 @@ function M.setup() -- set tabs=4 and use tabs in txt files autocmd("filetype", { pattern = "text", + -- pattern = "BufEnter *.txt", group = group, callback = function() vim.bo.tabstop = 4 diff --git a/lua/rayandrew/init.lua b/lua/rayandrew/init.lua index 6afe2de..fabf2e1 100644 --- a/lua/rayandrew/init.lua +++ b/lua/rayandrew/init.lua @@ -6,7 +6,7 @@ function M.setup() require("rayandrew.autocmds") require("rayandrew.remap") require("rayandrew.theme").setup() - require("rayandrew.filetype").setup() + -- require("rayandrew.filetype").setup() -- require("rayandrew.statusline").setup() end diff --git a/lua/rayandrew/plugins.lua b/lua/rayandrew/plugins.lua index c9a2016..1d73631 100644 --- a/lua/rayandrew/plugins.lua +++ b/lua/rayandrew/plugins.lua @@ -299,6 +299,10 @@ return { }, { "nvim-treesitter/nvim-treesitter-context", + opts = { + multiline_threshold = 1, + }, + config = true, }, ------------------------------ @@ -358,7 +362,10 @@ return { ["R"] = "rename", ["y"] = function(state) local node = state.tree:get_node() - local filename = node.name + -- get relative path + local filepath = node:get_id() + local filename = vim.fn.fnamemodify(filepath, ":.") + -- local filename = node.name vim.fn.setreg("+", filename) vim.notify("Copied: " .. filename) end, @@ -952,7 +959,7 @@ return { "prettier", "eslint_d", - -- "black", + "black", "isort", "shfmt", diff --git a/lua/rayandrew/util.lua b/lua/rayandrew/util.lua index bb5532e..a8d6271 100644 --- a/lua/rayandrew/util.lua +++ b/lua/rayandrew/util.lua @@ -168,4 +168,13 @@ function M.has(plugin) return require("lazy.core.config").spec.plugins[plugin] ~= nil end +function M.on_very_lazy(fn) + vim.api.nvim_create_autocmd("User", { + pattern = "VeryLazy", + callback = function() + fn() + end, + }) +end + return M