diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml index b386251..f2c4a3d 100644 --- a/alacritty/alacritty.toml +++ b/alacritty/alacritty.toml @@ -56,6 +56,11 @@ key = "E" mode = "Vi" mods = "Control" +[[keyboard.bindings]] +key = "F" +mods = "Control|Shift" +action = "ReceiveChar" + [[keyboard.bindings]] chars = "\u001B[72;6u" key = "H" diff --git a/nvim/lua/lazy_config.lua b/nvim/lua/lazy_config.lua index a83d85c..753e828 100644 --- a/nvim/lua/lazy_config.lua +++ b/nvim/lua/lazy_config.lua @@ -11,4 +11,9 @@ if not vim.loop.fs_stat(lazypath) then }) end vim.opt.rtp:prepend(lazypath) -require("lazy").setup("plugins") +require("lazy").setup("plugins", { + change_detection = { + enabled = false, + notify = false, -- get a notification when changes are found + } +}) diff --git a/nvim/lua/plugins/catppuccin.lua b/nvim/lua/plugins/catppuccin.lua index 51387e7..c8f163a 100644 --- a/nvim/lua/plugins/catppuccin.lua +++ b/nvim/lua/plugins/catppuccin.lua @@ -6,7 +6,6 @@ return { integrations = { mason = true, lsp_trouble = true, - vimwiki = true }, custom_highlights = function(colors) return { @@ -14,7 +13,7 @@ return { TelescopeBorder = { bg = "#191926", fg = "#191926" }, TelescopePromptBorder = { bg = "#191926", fg = "#191926" }, TelescopeTitle = { fg = colors.blue }, - WinSeparator = { fg = "#023269" } + WinSeparator = { fg = "#023269" }, } end, color_overrides = { diff --git a/nvim/lua/plugins/obsidian.lua b/nvim/lua/plugins/obsidian.lua index a621d9e..bdc26e9 100644 --- a/nvim/lua/plugins/obsidian.lua +++ b/nvim/lua/plugins/obsidian.lua @@ -21,17 +21,24 @@ return { workspaces = { { name = "Lumentis", - path = "~/Workspace/DnD/Lumentis Campaign Setting/", + path = "~/Workspace/DnD/Lumentis/", }, }, - disable_frontmatter = true, + disable_frontmatter = true, + ui = { + hl_groups = { + ObsidianRefText = { fg = "#61afef" }, + } + } }, keys = { {"", handle_enter, ft = "markdown" }, {"", ":ObsidianLink", ft = "markdown", mode = "v"}, - {"gd", handle_enter, ft = "markdown" }, {"rn", ":ObsidianRename", ft = "markdown" }, {"", ":set nohlsearch/\\[[^\\[\\]]*\\]([^()]*):let @/ = \"\":set hlsearch", ft = "markdown", silent = true }, }, detect_cwd = true, + config = function (_, opts) + require("obsidian").setup(opts) + end } diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index 5b16f51..a93b45f 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/nvim/lua/plugins/telescope.lua @@ -55,6 +55,7 @@ return { keys = { { "u", require("telescope").extensions.undo.undo}, { "", require("telescope.builtin").oldfiles}, + { "", function () require"telescope.builtin".live_grep({ path_display = { 'smart' }, }) end}, { "", function () -- git files local opts = require('telescope.themes').get_ivy({}) opts["show_untracked"] = true @@ -73,7 +74,7 @@ return { opts["layout_config"] = {height=0.2} require"telescope.builtin".buffers(opts) end}, - { "", function () -- fuzzy search + { "", function () -- fuzzy search require"telescope.builtin".grep_string({ path_display = { 'smart' }, only_sort_text = true, diff --git a/nvim/lua/plugins/vimwiki.lua b/nvim/lua/plugins/vimwiki.lua deleted file mode 100644 index 2f97edc..0000000 --- a/nvim/lua/plugins/vimwiki.lua +++ /dev/null @@ -1,70 +0,0 @@ -return {} --- local pickers = require("telescope.pickers") --- local actions = require "telescope.actions" --- local action_state = require("telescope.actions.state") --- local finders = require("telescope.finders") --- local conf = require("telescope.config").values --- --- local root_path = '/home/user/Workspace/DnD/Lumentis Campaign Setting' --- --- local function get_title(file) --- for line in io.lines(file) do --- line = string.gsub(line, "#", "") --- line = string.gsub(line, "^%s*", "") --- line = string.gsub(line, "%s*$", "") --- return line --- end --- end --- --- local function choose_link(opts, titles, links) --- opts = opts or {} --- pickers.new(opts, { --- prompt_title = "Choose a file", --- finder = finders.new_table { --- results = titles --- }, --- sorter = conf.generic_sorter(opts), --- attach_mappings = function(prompt_bufnr, _) --- actions.select_default:replace(function() --- actions.close(prompt_bufnr) --- local selection = action_state.get_selected_entry() --- vim.api.nvim_put({ links[selection['index']] }, "", false, true) --- end) --- return true --- end, --- }):find() --- end --- --- local function insert_link() --- local scan = require("plenary.scandir").scan_dir(root_path) --- local titles = {} --- local links = {} --- for _, v in ipairs(scan) do --- if v:match("^.+(%..+)$") == ".md" then --- local absolute_filename = string.sub(v, root_path:len()+1, v:len()) --- local title = get_title(v) --- if title:len() > 0 then --- local link = "[" .. title .. "](" .. absolute_filename .. ")" --- table.insert(titles, title) --- table.insert(links, link) --- end --- end --- end --- choose_link(require("telescope.themes").get_dropdown{}, titles, links) --- end --- --- return { --- 'vimwiki/vimwiki', --- dependencies = {'nvim-lua/plenary.nvim', 'nvim-telescope/telescope.nvim'}, --- init = function () --- vim.g.vimwiki_list = {{path = '~/Workspace/DnD/Lumentis Campaign Setting/', syntax = 'markdown', ext = '.md'}} --- vim.g.vimwiki_key_mappings = { table_mappings = 0 } --- vim.g.vimwiki_markdown_link_ext = 1 --- vim.g.vimwiki_global_ext = 0 --- end, --- lazy = false, --- keys = { --- {"l", insert_link}, --- {"l", insert_link, mode="i"} --- } --- } diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua index 849100d..07cf794 100644 --- a/nvim/lua/settings.lua +++ b/nvim/lua/settings.lua @@ -38,7 +38,7 @@ vim.g.rooter_patterns = {".git", "Makefile", "CMakeLists.txt", "build/", "meson. vim.g.rooter_silent_chdir = 1 vim.opt.shada = "!,'2000,f1,<50,s10,h" vim.o.updatetime = 250 -vim.opt.conceallevel = 1 +vim.opt.conceallevel = 2 -- Vimtex vim.g.tex_flavor = 'latex'