diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index d22daa0..2e6e902 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -3,25 +3,25 @@ "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" }, "bats.vim": { "branch": "master", "commit": "6a5d2ef22b0ede503d867770afd02ebb1f97b709" }, - "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" }, - "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" }, + "blink.cmp": { "branch": "main", "commit": "dcda20d3aa345025699a920c45b0a0603551f41d" }, + "blink.compat": { "branch": "main", "commit": "b0c87b64f9c669d3bcfaea8a80396fbc16e0fcb5" }, "cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" }, "cmp-pandoc.nvim": { "branch": "main", "commit": "30faa4456a7643c4cb02d8fa18438fd484ed7602" }, "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, - "codecompanion.nvim": { "branch": "main", "commit": "88111765a8d7d1f9b359f74bb6ec44e4c0f5f0b2" }, + "codecompanion.nvim": { "branch": "main", "commit": "855c4bce42eca5209a0ef53f7a4188d78d520ed1" }, "conform.nvim": { "branch": "master", "commit": "a6f5bdb78caa305496357d17e962bbc4c0b392e2" }, - "copilot.vim": { "branch": "release", "commit": "a9228e015528c9307890c48083c925eb98a64a79" }, - "dial.nvim": { "branch": "master", "commit": "2c7e2750372918f072a20f3cf754d845e143d7c9" }, + "copilot.vim": { "branch": "release", "commit": "5015939f131627a6a332c9e3ecad9a7cb4c2e549" }, + "dial.nvim": { "branch": "master", "commit": "34bbd9c387c358190e61ce71017faad3dffa7a74" }, "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" }, "fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" }, "flash.nvim": { "branch": "main", "commit": "ec0bf2842189f65f60fd40bf3557cac1029cc932" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "fwatch.nvim": { "branch": "main", "commit": "a691f7349dc66285cd75a1a698dd28bca45f2bf8" }, - "fzf-lua": { "branch": "main", "commit": "6488ada2f376e47789391dc353b6d91a3f9de6f6" }, + "fzf-lua": { "branch": "main", "commit": "15d5cd9a74da7f8739030a5c411c046c70f66a60" }, "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" }, - "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, + "gitsigns.nvim": { "branch": "main", "commit": "6668f379ca634c36b8e11453118590b91bf8b295" }, "glance.nvim": { "branch": "master", "commit": "cb19b86349cbe634eec0ea768b9a27fdd6d24f34" }, - "grug-far.nvim": { "branch": "main", "commit": "9411a99390014231753bbb7a2afe6886fda99257" }, + "grug-far.nvim": { "branch": "main", "commit": "3e72486d0123d08f5b253847ab6e00ca12353242" }, "helpview.nvim": { "branch": "main", "commit": "49e8d4782ae73274a35d606fde2844b6e958a0c7" }, "hunk.nvim": { "branch": "master", "commit": "b475ba0011e4b8ef7d7ddecd9764ee1a5f41366d" }, "image.nvim": { "branch": "master", "commit": "a4638ec549c6aa56264cb0371255192ff37a8a90" }, @@ -30,7 +30,7 @@ "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" }, "ltex_extra.nvim": { "branch": "dev", "commit": "09dc879b1873001f855bca5ad1f024ca15b9bbaf" }, - "lualine.nvim": { "branch": "master", "commit": "482ae358c67aec2a4939d68a1a4fe4c8064ccd16" }, + "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, "luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" }, "magick": { "branch": "master", "commit": "aa96e77b6d08983707941727a574752445de0d70" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, @@ -42,7 +42,7 @@ "mdeval.nvim": { "branch": "master", "commit": "0e1b248db174a9659a9ab16eb8c90ff3aec55264" }, "mini.nvim": { "branch": "main", "commit": "0420076298c4457f200c2de468f65d080597a347" }, "molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" }, - "neo-tree.nvim": { "branch": "main", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" }, + "neo-tree.nvim": { "branch": "main", "commit": "16854ed5559b940f69a6f7138906ebb22c15c553" }, "neogen": { "branch": "main", "commit": "b2e78708876f4da507839726816010a68e33fec8" }, "neotest": { "branch": "master", "commit": "d66cf4e05a116957f0d3a7755a24291c7d1e1f72" }, "neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" }, @@ -50,41 +50,41 @@ "nvim-FeMaco.lua": { "branch": "main", "commit": "96bbf843595dbe865838b3f2484b73557f34700c" }, "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" }, "nvim-coverage": { "branch": "main", "commit": "a939e425e363319d952a6c35fb3f38b34041ded2" }, - "nvim-lint": { "branch": "master", "commit": "81e8ba7655cc4395b1092ef4e1b6e83f54cd54ad" }, + "nvim-lint": { "branch": "master", "commit": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8" }, "nvim-lspconfig": { "branch": "master", "commit": "6b63bdf2399b9bedf93297d98419550523a9ad68" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" }, + "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" }, "nvim-toggleterm.lua": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, - "nvim-treesitter": { "branch": "master", "commit": "523a9e148919f58eb5a013f76787e57696e00c93" }, - "nvim-treesitter-context": { "branch": "master", "commit": "a25c56c96c3bcc4be6245f8941108330100de330" }, - "nvim-treesitter-endwise": { "branch": "master", "commit": "63a8f855c6b6019ef9f7f63b5c59b8a00c215d0d" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" }, + "nvim-treesitter": { "branch": "master", "commit": "8b79cddc708cb8549562f0101f7f509ad7cebf97" }, + "nvim-treesitter-context": { "branch": "master", "commit": "198720b4016af04c9590f375d714d5bf8afecc1a" }, + "nvim-treesitter-endwise": { "branch": "master", "commit": "cb718aab7fa66e43187674e875713097492a6618" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "143856b1cee509a190cc8c17ddb0638002171235" }, "nvim-treesitter-textsubjects": { "branch": "master", "commit": "abcbb0e537c9c24800b03b9ca33bee5806604629" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "otter.nvim": { "branch": "main", "commit": "b00b642eb990a1a48cbe75aa73d6cb8be9cc4812" }, + "otter.nvim": { "branch": "main", "commit": "34b0575c6eb2ca30eb064493bf93bccf608953c0" }, "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "quarto-nvim": { "branch": "main", "commit": "3c25bf3e9afff07c4396d98f0b2c39bc994037ad" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "1ab18259472d9fe5756750fec722c31bab1712da" }, - "render-markdown": { "branch": "main", "commit": "bfbb46af43c95115a06419ef290e16e2fa2a1941" }, + "quarto-nvim": { "branch": "main", "commit": "abc417c7e7422033f1090c0da5f30ef3ecb0c7ca" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "dc788723f717bdd3041838b8db34cce53c9aa920" }, + "render-markdown": { "branch": "main", "commit": "a03ed82dfdeb1a4980093609ffe94c171ace8059" }, "smartcolumn.nvim": { "branch": "main", "commit": "d01b99355c7fab13233f48d0f28dc097e68a03f7" }, "stickybuf.nvim": { "branch": "master", "commit": "2160fcd536d81f5fa43f7167dba6634e814e3154" }, "texpresso.vim": { "branch": "main", "commit": "907838c08bbf99ad6bed3c908f1d0551a92ab4e0" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tree-sitter-nu": { "branch": "main", "commit": "d5c71a10b4d1b02e38967b05f8de70e847448dd1" }, + "tree-sitter-nu": { "branch": "main", "commit": "c10340b5bb3789f69182acf8f34c3d4fc24d2fe1" }, "trouble.nvim": { "branch": "main", "commit": "748ca2789044607f19786b1d837044544c55e80a" }, "twilight.nvim": { "branch": "main", "commit": "8bb7fa7b918baab1ca81b977102ddb54afa63512" }, - "typst-preview.nvim": { "branch": "master", "commit": "ddcc71126f910ec83037622bc8d506f91a290ade" }, + "typst-preview.nvim": { "branch": "master", "commit": "00ff6829030f302e8ff24d0e3a68625dd1a3ac40" }, "undotree": { "branch": "main", "commit": "eab459ab87dd249617b5f7187bb69e614a083047" }, "vifm.vim": { "branch": "master", "commit": "617e3dc7c9af1f03cc664124aff2fe98fafcf1b2" }, "vim-criticmarkup": { "branch": "master", "commit": "d15dc134eb177a170c79f6377f81eb02a9d20b02" }, "vim-numbertoggle": { "branch": "main", "commit": "df9b1fe616507340718716204ba7f434125bdf7a" }, - "vim-spellsync": { "branch": "master", "commit": "ea9f431483ceb40ede8bd5b126a03eccd49b1bc0" }, + "vim-spellsync": { "branch": "master", "commit": "3d6dd50de9c4d953cc16638112a6ae196df41463" }, "wezterm.nvim": { "branch": "main", "commit": "f73bba23ab4becd146fa2d0a3a16a84b987eeaca" }, "which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" }, "wrapping.nvim": { "branch": "master", "commit": "3a823200c297885b70515fa8d974e1763c578e26" }, "zen-mode.nvim": { "branch": "main", "commit": "04b52674b8c800f8b7d4609e8bd8d0212e3ffa79" }, - "zk-nvim": { "branch": "main", "commit": "8fdd7032633045ece559273370fc0ec75ee8ffce" } + "zk-nvim": { "branch": "main", "commit": "50d92038d22ad9a537dcfd463c38527591430df6" } } diff --git a/nvim/.config/nvim/lua/core/commands.lua b/nvim/.config/nvim/lua/core/commands.lua index 7323422..70f9365 100644 --- a/nvim/.config/nvim/lua/core/commands.lua +++ b/nvim/.config/nvim/lua/core/commands.lua @@ -1,6 +1,6 @@ -- Highlight whatever is being yanked vim.api.nvim_create_autocmd({ "TextYankPost" }, { - command = 'silent! lua require"vim.hl".on_yank{timeout=500}', + command = 'silent! lua require"vim.highlight".on_yank{timeout=500}', desc = "Highlight yanked text whenevery yanking something", group = vim.api.nvim_create_augroup("highlightyanks", { clear = true }), }) diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua index 84bcf26..28ac9a4 100644 --- a/nvim/.config/nvim/lua/plugins/lsp.lua +++ b/nvim/.config/nvim/lua/plugins/lsp.lua @@ -51,6 +51,7 @@ local lsp = { vim.fn.sign_define("DiagnosticSignHint", { text = "", texthl = "DiagnosticSignHint" }) for server, config in pairs(lspconfig_opts.servers) do + -- TODO: Check if it actually can be ignored in Nvim 0.11+, see https://cmp.saghen.dev/installation.html#lazy-nvim if vim.fn.has("nvim-0.11") == false then config.capabilities = require("blink.cmp").get_lsp_capabilities(config.capabilities) end @@ -165,7 +166,7 @@ local lsp = { end, settings = { ltex = { - language = vim.o.spelllang, + language = vim.opt.spelllang:get(), }, }, }) @@ -205,28 +206,16 @@ vim.api.nvim_create_autocmd("LspAttach", { require("which-key").add({ "l", group = "language" }) end map("n", "ld", "lua vim.diagnostic.open_float()", o({ desc = "Show line diagnostics" })) + map("n", "lI", function() + vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) + end, o({ desc = "Toggle inlay hints" })) map("n", "la", "lua vim.lsp.buf.code_action()", o({ desc = "Codeactions" })) map("n", "ln", "lua vim.lsp.buf.rename()", o({ desc = "Rename element" })) map("n", "lc", "lua vim.lsp.buf.declaration()", o({ desc = "Declaration" })) map("n", "ls", "lua vim.lsp.buf.signature_help()", o({ desc = "Signature help" })) - - map("n", "lI", function() - vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) - end, o({ desc = "Toggle inlay hints" })) - map("n", "lD", function() + map("n", "lo", function() vim.diagnostic.enable(not vim.diagnostic.is_enabled()) end, o({ desc = "Toggle Diagnostics" })) - -- FIXME: Will be re-enabled with insert-mode autocmd above - map("n", "lo", function() - local c = vim.diagnostic.config() or {} - vim.diagnostic.config({ virtual_text = not c["virtual_text"] }) - end, o({ desc = "Toggle virtual diag text" })) - if vim.fn.has("nvim-0.11") == true then -- new feature https://gpanders.com/blog/whats-new-in-neovim-0-11/#virtual-lines - map("n", "lO", function() - local c = vim.diagnostic.config() or {} - vim.diagnostic.config({ virtual_lines = not c["virtual_lines"] }) - end, o({ desc = "Toggle virtual diag lines" })) - end local pref = function(glances, telescope, fallback) if glances and vim.fn.exists(":Glance") > 0 then diff --git a/nvim/.config/nvim/snippets/markdown.json b/nvim/.config/nvim/snippets/markdown.json deleted file mode 100644 index 091f390..0000000 --- a/nvim/.config/nvim/snippets/markdown.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "Footnote": { - "prefix": "fn", - "body": ["[^${1:id}]${0}", "", "[^${1:id}]: ${2:text}"], - "description": "insert footnote" - }, - "italic": { - "prefix": "italic", - "body": ["_${0}_"], - "description": "surround with italics" - }, - "sup": { - "prefix": "sup", - "body": ["^${0}^"], - "description": "superscript" - }, - "frontmatter": { - "prefix": "frontmatter", - "body": ["---", "${0}", "---"], - "description": "insert footnote" - }, - "blog frontmatter": { - "prefix": "blogfront", - "body": ["---", "title: ${1:title}", "description: ${2: desc}", "pubDate: ${3:date}", "tags: ${4:tags}", "${0}", "---"], - "description": "add frontmatter" - } -} diff --git a/nvim/.config/nvim/snippets/markdown.snippets b/nvim/.config/nvim/snippets/markdown.snippets new file mode 100644 index 0000000..d4b5709 --- /dev/null +++ b/nvim/.config/nvim/snippets/markdown.snippets @@ -0,0 +1,80 @@ +# Markdown snippets +# Combination of snips from friendly-snippets and vim-snippets repos + +snippet h1 Heading level 1 + # ${0} + +snippet h2 Heading level 2 + ## ${0} + +snippet h3 Heading level 3 + ### ${0} + +snippet h4 Heading level 4 + #### ${0} + +snippet h5 Heading level 5 + ##### ${0} + +snippet h6 Heading level 6 + ##### ${0} + +snippet ] Link + [${1:text}](${2:link}) + +snippet ]h Weblink + [${1:text}](https://${2:address}) + +snippet ]c Link filled with clipboard contents + [${1:text}](${2:`@+`}) + +snippet ]: Link reference style + [${1:id}]: ${2:text} + +snippet ]] Footnote + [^${1:id}]${0} + + [^${1:id}]: ${2:text} + +snippet img Image link + ![${1:alt}](${2:link}) + +snippet imgc Image link with clipboard content + ![${1:alt}](${2:`@+`}) + +snippet ** Bold + **$0** +snippet __ Bold + __$0__ +snippet --- Frontmatter + --- + $0 + --- + +# codeblocks +snippet `` Codeblock with language + \`\`\`${1:language} + ${2:code} + \`\`\` + +# table +snippet tb Simple table + | ${5:factors} | ${1:a} | ${2:b} | + | ------------- |------------- | ------- | + | ${3:f1} | ${0} | N | + | ${4:f2} | N | N | + +# tasklists +snippet tl Tasklist item + - [ ] ${0:item} + +snippet tl3 Tasklist item + - [ ] ${1:item} + - [ ] ${2:item} + - [ ] ${0:item} + +# super/subscript - pandoc/extended markdown only +snippet sub Subscript + ~${0}~ +snippet sup Superscript + ^${0}^ diff --git a/nvim/.config/nvim/snippets/quarto.snippets b/nvim/.config/nvim/snippets/quarto.snippets new file mode 100644 index 0000000..0f0786d --- /dev/null +++ b/nvim/.config/nvim/snippets/quarto.snippets @@ -0,0 +1,95 @@ +# Quarto extensions to markdown + +extends markdown + +# definitions list +snippet : Definition list + $1 + : $0 + +snippet `` Codecell with language + \`\`\`{${1:language}} + ${2:code} + \`\`\` + +snippet ``p Codecell with language + \`\`\`{python} + ${2:code} + \`\`\` + +snippet ``r Codecell with language + \`\`\`{r} + ${2:code} + \`\`\` + +snippet pyfig2 Sub-Figures from python codecell + \`\`\`{python} + #| label: fig-${1:label} + #| fig-cap: "${2:caption}" + #| fig-subcap: + #| - "${3:subcap1}" + #| - "${3:subcap2}" + #| layout-ncol: 2 + + ${0:code} + \`\`\` + +snippet pyfig Figure from python codecell + \`\`\`{python} + #| label: fig-${1:label} + #| fig-cap: "${2:caption}" + + ${0:code} + \`\`\` + +snippet fig General figure + ![${1:caption}](${3:figure}){#fig-${2:label}} + +snippet pytab Figure from python codecell + \`\`\`{python} + #| label: tbl-${1:label} + #| tbl-cap: "${2:caption}" + + ${0:code} + \`\`\` + +snippet fref Figure crossref + @fig-${1:label} +snippet tref Table crossref + @tbl-${1:label} +snippet sref Section crossref + @sec-${1:label} +snippet eref Equation crossref + @eq-${1:label} + +snippet cite Citation + [@${1:bib-key}] + +snippet shortcode Shortcode + {{< $0 >}} + +snippet div Div block + ::: {.${1:class}} + $0 + ::: + +snippet note Callout note + ::: {.callout-note} + $0 + ::: +snippet warn Callout warning + ::: {.callout-warning} + $0 + ::: +snippet import Callout important + ::: {.callout-important} + $0 + ::: +snippet tip Callout tip + ::: {.callout-tip} + $0 + ::: +snippet caut Callout caution + ::: {.callout-caution} + $0 + ::: diff --git a/nvim/.config/nvim/spell/de.utf-8.add b/nvim/.config/nvim/spell/de.utf-8.add index 8a4f9a3..fb8fe37 100644 --- a/nvim/.config/nvim/spell/de.utf-8.add +++ b/nvim/.config/nvim/spell/de.utf-8.add @@ -1,2 +1 @@ Mitgliedern -IKT diff --git a/office/.config/sh/alias.d/taskwarrior.sh b/office/.config/sh/alias.d/taskwarrior.sh index 526c452..9df34f4 100644 --- a/office/.config/sh/alias.d/taskwarrior.sh +++ b/office/.config/sh/alias.d/taskwarrior.sh @@ -12,7 +12,7 @@ t() { } # copy the `task` zsh completions over to my little alias 😉 -# FIXME: this is not very pretty and not super portable (needs ps) but +# this is not very pretty and not super portable (needs ps) but # works for now. from here: https://unix.stackexchange.com/a/72564/414758 if exist task && [ "$(ps -p $$ -o comm --no-headers)" = "zsh" ]; then compdef t=task; fi @@ -34,4 +34,4 @@ alias trw="task end.after:today-1wk completed" alias tad="task +ACTIVE done" alias tas="task +ACTIVE stop" -alias to="task note" +alias to="task open" diff --git a/office/.config/task/taskrc b/office/.config/task/taskrc index cbd5951..12270ae 100644 --- a/office/.config/task/taskrc +++ b/office/.config/task/taskrc @@ -23,9 +23,7 @@ weekstart=monday # Make daily burndown default alias alias.burndown=burndown.daily - -alias.note=exec topen -alias.o=exec topen +alias.open=exec taskopen # Sort the columns a little differently active.indicator=> diff --git a/office/.local/bin/render-prettyhtml b/office/.local/bin/render-prettyhtml index d6037e2..26fd0aa 100755 --- a/office/.local/bin/render-prettyhtml +++ b/office/.local/bin/render-prettyhtml @@ -1,17 +1,6 @@ #!/usr/bin/env bash # render html as markdown and display in glow, supports syntax highlighting -# requires: html2text, glow or bat +# requires: html2text, glow # author: CEUK -fpath=/tmp/mutt.md - -perl -0777pe 's/()(.*?)(<\/code>)/\1\2\3\n```\2\n\4\n```\n\5/gs' "$1" | html2text | sed -re 's/^\s+(```(\w+)?)/\1/gm' -e 's/\x1b\[[6-9;]*m//g' >"$fpath" - -if command -v bat >/dev/null 2>&1; then - bat "$fpath" -elif command -v glow >/dev/null 2>&1; then - glow -s ~/.config/glow/email.json "$fpath" -else - sed 's/\x1b\[[6-9;]*m//g' <"$fpath" -fi - -rm "$fpath" || exit 1 +perl -0777pe 's/()(.*?)(<\/code>)/\1\2\3\n```\2\n\4\n```\n\5/gs' "$1" | html2text | sed -re 's/^\s+(```(\w+)?)/\1/gm' >/tmp/mutt.md +glow -s ~/.config/glow/email.json /tmp/mutt.md | sed 's/\x1b\[[6-9;]*m//g' diff --git a/services/sv/loadenv/run b/services/sv/loadenv/run index fe29f7c..4e45759 100755 --- a/services/sv/loadenv/run +++ b/services/sv/loadenv/run @@ -16,7 +16,7 @@ [ -r ./conf ] && . ./conf if [ -e "$HOME/.config/sh/profile" ]; then - XDG_PROFILE="${XDG_PROFILE:-$HOME/.config/sh/profile}" + XDG_PROFILE="${XDG_PROFILE:-HOME/.config/sh/profile}" fi ENV=${XDG_PROFILE:-$HOME/.profile} sh -i -c env | while IFS= read -r line; do diff --git a/terminal/.config/wezterm/wezterm.lua b/terminal/.config/wezterm/wezterm.lua index 8fa9cf3..2681191 100644 --- a/terminal/.config/wezterm/wezterm.lua +++ b/terminal/.config/wezterm/wezterm.lua @@ -61,7 +61,7 @@ local settings = { italic = true, intensity = "Normal", font = wezterm.font_with_fallback({ - { family = "Iosevka", weight = "Regular", italic = true }, + { family = "Iosevka", weight = "Bold", italic = true }, { family = "VictorMono Nerd Font", style = "Italic" }, }), },