diff options
| -rw-r--r-- | ar/.config/TheSiahxyz/lua/thesiahxyz/core/autocmds.lua | 14 | ||||
| -rw-r--r-- | ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/markdown.lua | 46 | ||||
| -rw-r--r-- | ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/mini.lua | 2 | ||||
| -rw-r--r-- | ar/.config/tmux/tmux.conf | 9 |
4 files changed, 51 insertions, 20 deletions
diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/core/autocmds.lua b/ar/.config/TheSiahxyz/lua/thesiahxyz/core/autocmds.lua index 5ff20f9..e6eba4c 100644 --- a/ar/.config/TheSiahxyz/lua/thesiahxyz/core/autocmds.lua +++ b/ar/.config/TheSiahxyz/lua/thesiahxyz/core/autocmds.lua @@ -142,10 +142,10 @@ autocmd("BufWritePre", { group = file_save, pattern = "*", callback = function() - -- Remove trailing spaces - vim.cmd([[ %s/\s\+$//e ]]) - -- Remove trailing newlines - vim.cmd([[ %s/\n\+\%$//e ]]) + local cursor_pos = vim.api.nvim_win_get_cursor(0) + vim.cmd([[ %s/\s\+$//e ]]) -- Remove trailing spaces + vim.cmd([[ %s/\n\+\%$//e ]]) -- Remove trailing newlines + vim.api.nvim_win_set_cursor(0, cursor_pos) end, }) @@ -256,9 +256,9 @@ vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { }) -- TeX for .tex files -vim.api.nvim_create_autocmd("VimLeavePre", { - pattern = "*.tex", - command = "!latexmk -c %", +vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { + pattern = { "*.tex" }, + command = "set filetype=tex", }) -- When shortcut files are updated, renew bash and lf configs with new material: diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/markdown.lua b/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/markdown.lua index 82346b5..4e41a99 100644 --- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/markdown.lua +++ b/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/markdown.lua @@ -11,7 +11,7 @@ local function select_cell() -- Find the start of the cell (looking for opening markers or headers) for line = current_row, 1, -1 do local line_content = vim.api.nvim_buf_get_lines(bufnr, line - 1, line, false)[1] - if line_content:match("^```%s*[%w_%-]+") or line_content:match("^%s*#+%s") then + if line_content:match("^```%s*[%w_%-]+") then start_line = line break end @@ -25,7 +25,7 @@ local function select_cell() -- Find the end of the cell (looking for the next opening marker or header) for line = start_line + 1, line_count do local line_content = vim.api.nvim_buf_get_lines(bufnr, line - 1, line, false)[1] - if line_content:match("^```%s*[%w_%-]+") or line_content:match("^%s*#+%s") then + if line_content:match("^```%s*[%w_%-]+") then end_line = line - 1 break end @@ -143,9 +143,6 @@ return { ---@type render.md.UserConfig opts = {}, config = function() - local filename = vim.api.nvim_buf_get_name(0) - local is_ipynb = filename:sub(-6) == ".ipynb" - -- require("obsidian").get_client().opts.ui.enable = false -- vim.api.nvim_buf_clear_namespace(0, vim.api.nvim_get_namespaces()["ObsidianUI"], 0, -1) require("render-markdown").setup({ @@ -154,16 +151,45 @@ return { enabled = true, }, code = { - enabled = not is_ipynb, -- disable code rendering for .ipynb files - sign = not is_ipynb, + enabled = true, -- disable code rendering for .ipynb files + sign = true, }, + file_types = { "markdown", "vimwiki" }, heading = { sign = false, icons = { " ", " ", " ", " ", " ", " " }, }, - file_types = { "markdown", "vimwiki" }, + ignore = function(bufnr) + local name = vim.api.nvim_buf_get_name(bufnr) + return name:lower():match("%.ipynb$") ~= nil + end, }) vim.treesitter.language.register("markdown", "vimwiki") + + vim.keymap.set("n", "<leader>mrt", function() + require("render-markdown").buf_toggle() + end, { desc = "Toggle render-markdown" }) + vim.keymap.set("n", "<leader>mre", function() + require("render-markdown").buf_enable() + end, { desc = "Enable render-markdown" }) + vim.keymap.set("n", "<leader>mrx", function() + require("render-markdown").buf_disable() + end, { desc = "Disable render-markdown" }) + vim.keymap.set("n", "<leader>mr+", function() + require("render-markdown").expand() + end, { desc = "Expand conceal margin" }) + vim.keymap.set("n", "<leader>mr-", function() + require("render-markdown").contract() + end, { desc = "Contract conceal margin" }) + vim.keymap.set("n", "<leader>mrl", function() + require("render-markdown").log() + end, { desc = "Open render-markdown log" }) + vim.keymap.set("n", "<leader>mrc", function() + require("render-markdown").config() + end, { desc = "Show render-markdown config diff" }) + vim.keymap.set("n", "<leader>mrd", function() + require("render-markdown").debug() + end, { desc = "Debug render-markdown marks" }) end, }, { @@ -448,8 +474,8 @@ return { config = function() -- image nvim options table. Pass to `require('image').setup` vim.keymap.set("n", "<leader>jJ", ":MoltenInit<CR>", { silent = true, desc = "Init molten" }) - vim.keymap.set("n", "<leader>j[", ":MoltenNext<CR>", { silent = true, desc = "Go to next code cell" }) - vim.keymap.set("n", "<leader>j]", ":MoltenPrev<CR>", { silent = true, desc = "Go to prev code cell" }) + vim.keymap.set("n", "<leader>j[", ":MoltenPrev<CR>", { silent = true, desc = "Go to prev code cell" }) + vim.keymap.set("n", "<leader>j]", ":MoltenNext<CR>", { silent = true, desc = "Go to next code cell" }) vim.keymap.set( "n", "<leader>jo", diff --git a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/mini.lua b/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/mini.lua index b8630d8..7a91208 100644 --- a/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/mini.lua +++ b/ar/.config/TheSiahxyz/lua/thesiahxyz/plugins/mini.lua @@ -1077,7 +1077,7 @@ return { end, keys = { { "<leader>mo", "<cmd>lua MiniMap.open()<cr>", desc = "Open map" }, - { "<leader>mr", "<cmd>lua MiniMap.refresh()<cr>", desc = "Refresh map" }, + { "<leader>mm", "<cmd>lua MiniMap.refresh()<cr>", desc = "Refresh map" }, { "<leader>mc", "<cmd>lua MiniMap.close()<cr>", desc = "Close map" }, { "<leader>mtm", "<cmd>lua MiniMap.toggle()<cr>", desc = "Toggle map" }, { "<leader>mts", "<cmd>lua MiniMap.toggle_side()<cr>", desc = "Toggle side map" }, diff --git a/ar/.config/tmux/tmux.conf b/ar/.config/tmux/tmux.conf index bd4f347..75979a0 100644 --- a/ar/.config/tmux/tmux.conf +++ b/ar/.config/tmux/tmux.conf @@ -208,6 +208,11 @@ bind 'C-w' run-shell -b "~/.local/bin/tmux/tmux-fzf/scripts/window.sh" # tpm set -g @tpm-clean 'X' +# weather +set -g @tmux-weather-interval 60 # in minutes +set -g @tmux-weather-location "Seoul,KR" +set -g @tmux-weather-format "%c+%t+%w" +set -g @tmux-weather-units "m" # u for USCS, m for metric system ### --- Theme --- ### # catppuccin @@ -272,8 +277,8 @@ set -ga status-right "#{?#{<=:#{battery_percentage},0},#{#[bg=default,fg=#{@thm_ set -ga status-right "#[bg=default,fg=#{@thm_overlay_0},none]│" set -ga status-right "#[bg=default]#{?#{==:#{online_status},ok},#[fg=#{@thm_pink}] ,#[fg=#{@thm_red},bold]#[reverse] }" set -ga status-right "#[bg=default,fg=#{@thm_overlay_0},none]│" -set -ga status-right "#[bg=default,fg=#{@thm_red}] #{weather} " -set -ga status-right "#[bg=default,fg=#{@thm_overlay_0},none]│" +# set -ga status-right "#[bg=default,fg=#{@thm_red}] #{weather} " +# set -ga status-right "#[bg=default,fg=#{@thm_overlay_0},none]│" set -ga status-right "#[bg=default,fg=#{@thm_rosewater}] #(uptime | awk -F 'up ' '{print $2}' | awk -F ',' '{print $1}' | sed 's/:/h /;s/$/m/;s/^ //') " set -ga status-right "#[bg=default,fg=#{@thm_overlay_0},none]│" set -ga status-right "#[bg=default,fg=#{@thm_blue}] %a,%d %H:%M " |