Merge pull request #1169 from NotAShelf/notashelf/push-lnklzrqrwnym

Merge branch 'main' into 'v0.8'

.github/typos.toml

@@ -5,6 +5,7 @@ default.extend-ignore-words-re = [
   "befores",
   "annote",
   "viw",
+  "typ",
   "edn",
   "esy",
   "BA", # somehow "BANanaD3V" is valid, but BA is not...

.github/workflows/docs-preview.yml

@@ -90,7 +90,7 @@ jobs:
           echo "Preview can be found at ${URL}" >> "$GITHUB_STEP_SUMMARY"
 
       - name: Find Comment
-        uses: peter-evans/find-comment@v3
+        uses: peter-evans/find-comment@v4
         id: fc
         with:
           comment-author: "github-actions[bot]"
@@ -98,7 +98,7 @@ jobs:
           body-includes: "Live preview deployed"
 
       - name: Post live preview comment
-        uses: peter-evans/create-or-update-comment@v4
+        uses: peter-evans/create-or-update-comment@v5
         env:
           COMMENT_ID: ${{ steps.fc.outputs.comment-id }}
           URL: ${{ steps.prelude.outputs.URL }}
@@ -177,7 +177,7 @@ jobs:
           fi
 
       - name: Post cleanup verification
-        uses: peter-evans/create-or-update-comment@v4
+        uses: peter-evans/create-or-update-comment@v5
         with:
           issue-number: ${{ github.event.pull_request.number }}
           body: |

docs/release-notes/rl-0.8.md

@@ -564,6 +564,12 @@
 - Add [nvim-highlight-colors] plugin in `vim.ui.nvim-highlight-colors` with
   `enable` and `setupOpts`
 
+[PartyWumpus](https://github.com/PartyWumpus):
+
+[typst-concealer]: https://github.com/PartyWumpus/typst-concealer
+
+- Add inline typst concealing support under `vim.languages.typst` using
+  [typst-concealer].
 [simon-wg](https://github.com/simon-wg):
 
 - Update `python` language module to use correct lsp binary.

flake.lock

@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756770412,
-        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
+        "lastModified": 1759362264,
+        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
+        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1756659871,
-        "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=",
+        "lastModified": 1758834834,
+        "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16",
+        "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
         "type": "github"
       },
       "original": {
@@ -53,11 +53,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1756696532,
-        "narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=",
+        "lastModified": 1759386674,
+        "narHash": "sha256-wg1Lz/1FC5Q13R+mM5a2oTV9TA9L/CHHTm3/PiLayfA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "58dcbf1ec551914c3756c267b8b9c8c86baa1b2f",
+        "rev": "625ad6366178f03acd79f9e3822606dd7985b657",
         "type": "github"
       },
       "original": {

modules/plugins/languages/typst.nix

@@ -178,6 +178,57 @@ in {
           };
         };
       };
+      typst-concealer = {
+        enable = mkEnableOption ''
+          [typst-concealer]: https://github.com/PartyWumpus/typst-concealer
+
+          Inline typst preview for Neovim via [typst-concealer]
+        '';
+
+        mappings = {
+          toggleConcealing = mkMappingOption "Enable typst-concealer in buffer" "<leader>TT";
+        };
+
+        setupOpts = mkPluginSetupOption "typst-concealer" {
+          do_diagnostics = mkOption {
+            type = nullOr bool;
+            default = !cfg.lsp.enable;
+            description = "Should typst-concealer provide diagnostics on error?";
+          };
+          color = mkOption {
+            type = nullOr str;
+            default = null;
+            example = "rgb(\"#f012be\")";
+            description = "What color should typst-concealer render text/stroke with? (only applies when styling_type is 'colorscheme')";
+          };
+          enabled_by_default = mkOption {
+            type = nullOr bool;
+            default = null;
+            description = "Should typst-concealer conceal newly opened buffers by default?";
+          };
+          styling_type = mkOption {
+            type = nullOr (enum ["simple" "none" "colorscheme"]);
+            default = null;
+            description = "What kind of styling should typst-concealer apply to your typst?";
+          };
+          ppi = mkOption {
+            type = nullOr int;
+            default = null;
+            description = "What PPI should typst render at. Plugin default is 300, typst's normal default is 144.";
+          };
+          typst_location = mkOption {
+            type = str;
+            default = getExe pkgs.typst;
+            description = "Where should typst-concealer look for your typst binary?";
+            example = ''lib.getExe pkgs.typst'';
+          };
+          conceal_in_normal = mkOption {
+            type = nullOr bool;
+            default = null;
+            description = "Should typst-concealer still conceal when the normal mode cursor goes over a line.";
+          };
+        };
+      };
     };
   };
   config = mkIf cfg.enable (mkMerge [
@@ -212,5 +263,18 @@ in {
         require("typst-preview").setup(${toLuaObject cfg.extensions.typst-preview-nvim.setupOpts})
       '';
     })
+
+    (mkIf cfg.extensions.typst-concealer.enable {
+      vim.lazy.plugins.typst-concealer = {
+        event = "BufRead *.typ";
+        package = "typst-concealer";
+        setupModule = "typst-concealer";
+        setupOpts = cfg.extensions.typst-concealer.setupOpts;
+
+        keys = [
+          (mkKeymap "n" cfg.extensions.typst-concealer.mappings.toggleConcealing "<cmd>lua require('typst-concealer').toggle_buf()<CR>" {desc = "Toggle typst-concealer in buffer";})
+        ];
+      };
+    })
   ]);
 }

modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix

@@ -32,7 +32,7 @@ in {
           then
             mkLuaInline ''
               (function()
-                local integration = require("catppuccin.groups.integrations.bufferline")
+                local integration = require("catppuccin.special.bufferline")
                 return (integration.get_theme or integration.get)()
               end)()
             ''
@@ -40,7 +40,7 @@ in {
         defaultText = literalMD ''
           ```lua
           (function()
-            local integration = require("catppuccin.groups.integrations.bufferline")
+            local integration = require("catppuccin.special.bufferline")
             return (integration.get_theme or integration.get)()
           end)()
           ```