Merge branch 'main' into fix/invalid-keys-in-haskell-tools

configuration.nix

@@ -117,6 +117,7 @@ isMaximal: {
       jq.enable = false;
       fish.enable = false;
       standard-ml.enable = false;
+      pug.enable = false;
 
       # Nim LSP is broken on Darwin and therefore
       # should be disabled by default. Users may still enable

docs/manual/release-notes/rl-0.6.md

@@ -127,7 +127,7 @@ vim.api.nvim_set_keymap('n', '<leader>a', ':lua camelToSnake()<CR>', { noremap =
   and `disabled_filetypes` through the new options:
   {option}`vim.statusline.lualine.alwaysDivideMiddle`,
   {option}`vim.statusline.lualine.ignoreFocus` and
-  {option}`vim.statusline.lualine.disabledFiletypes`).
+  {option}`vim.statusline.lualine.disabledFiletypes.statusline`).
 
 - Updated all plugin inputs to their latest versions (**21.04.2024**) - this
   brought minor color changes to the Catppuccin theme.

docs/manual/release-notes/rl-0.9.md

@@ -133,6 +133,14 @@
 
 ## Changelog {#sec-release-0-9-changelog}
 
+[ErinaYip](https://github.com/ErinaYip):
+
+- Fixed and updated `lualine` options:
+  - Enabled the previously unmapped
+    {option}`vim.statusline.lualine.ignoreFocus`.
+  - Added {option}`vim.statusline.lualine.disabledFiletypes.statusline` and
+    {option}`vim.statusline.lualine.disabledFiletypes.winbar`.
+
 [SecBear](https://github.com/SecBear):
 
 - Renamed `setupOpts.strategies` to `setupOpts.interactions` in the
@@ -273,6 +281,9 @@
 
 - Allow disabling nvf's vendored keymaps by toggling `vendoredKeymaps.enable`.
 
+- Add {option}`vim.languages.pug.enable`, which adds the treesitter grammar and
+  enables `emmet-ls` for pug files.
+
 [pyrox0](https://github.com/pyrox0):
 
 - Added [rumdl](https://github.com/rvben/rumdl) support to `languages.markdown`

flake/pkgs/by-name/prettier-plugin-pug/0001-fix-don-t-touch-git-state-while-building.patch

@@ -0,0 +1,25 @@
+From 85c43d3f45b6a5d301b66fe52c0c92b16ddfbc95 Mon Sep 17 00:00:00 2001
+From: alfarel <alfarelcynthesis@proton.me>
+Date: Sun, 17 May 2026 22:42:21 -0400
+Subject: [PATCH] fix: don't touch git state while building
+
+---
+ package.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/package.json b/package.json
+index 9151c4f..5508237 100644
+--- a/package.json
++++ b/package.json
+@@ -6,7 +6,7 @@
+     "clean": "git clean -fdx",
+     "build:clean": "git clean -fdx dist",
+     "build:code": "tsup-node",
+-    "build": "run-s build:clean build:code",
++    "build": "run-s build:code",
+     "docs:build": "vitepress build docs",
+     "docs:dev": "vitepress dev docs",
+     "docs:serve": "vitepress serve docs --port 5173",
+-- 
+2.53.0
+

flake/pkgs/by-name/prettier-plugin-pug/package.nix

@@ -0,0 +1,57 @@
+{
+  stdenv,
+  nodejs,
+  gitMinimal,
+  pnpm_9,
+  pnpmConfigHook,
+  zstd,
+  fetchPnpmDeps,
+  pins,
+  fetchFromGitHub,
+  writableTmpDirAsHomeHook,
+}: let
+  pin = pins.prettier-plugin-pug;
+in
+  stdenv.mkDerivation (finalAttrs: {
+    pname = "prettier-plugin-pug";
+    version = pin.version or pin.revision;
+
+    patches = [
+      ./0001-fix-don-t-touch-git-state-while-building.patch
+    ];
+
+    src = fetchFromGitHub {
+      inherit (pin.repository) owner repo;
+      rev = finalAttrs.version;
+      sha256 = pin.hash;
+    };
+
+    pnpmDeps = fetchPnpmDeps {
+      pnpm = pnpm_9;
+      inherit (finalAttrs) pname version src;
+      hash = "sha256-NBetqPzn99W0mvv2niL9bJ3iOexOB4VAIGA7CmUn00M=";
+      fetcherVersion = 3;
+    };
+
+    nativeBuildInputs = [
+      nodejs
+      gitMinimal
+      writableTmpDirAsHomeHook
+      (pnpmConfigHook.override {
+        pnpm = pnpm_9;
+      })
+      pnpm_9
+      zstd
+    ];
+
+    buildPhase = ''
+      runHook preBuild
+      pnpm run build
+      runHook postBuild
+    '';
+
+    preInstall = ''
+      cp -r dist/ $out
+      cp -r node_modules $out
+    '';
+  })

modules/plugins/languages/default.nix

@@ -47,6 +47,7 @@ in {
     ./odin.nix
     ./openscad.nix
     ./php.nix
+    ./pug.nix
     ./python.nix
     ./qml.nix
     ./r.nix

modules/plugins/languages/pug.nix

@@ -0,0 +1,105 @@
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  ...
+}: let
+  inherit (lib.attrsets) attrNames genAttrs;
+  inherit (lib.options) mkOption mkEnableOption literalExpression;
+  inherit (lib.meta) getExe;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.types) enum listOf;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.nvim.types) mkGrammarOption;
+
+  cfg = config.vim.languages.pug;
+
+  defaultServers = ["emmet-ls"];
+  servers = ["emmet-ls"];
+
+  defaultFormat = ["prettier"];
+  formats = {
+    prettier = {
+      command = getExe pkgs.prettier;
+      options.ft_parsers.pug = "pug";
+      prepend_args = let
+        parser = "${inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.prettier-plugin-pug}/index.js";
+      in ["--plugin=${parser}"];
+    };
+  };
+in {
+  options.vim.languages.pug = {
+    enable = mkEnableOption "Pug language support";
+
+    treesitter = {
+      enable =
+        mkEnableOption "Pug treesitter"
+        // {
+          default = config.vim.languages.enableTreesitter;
+          defaultText = literalExpression "config.vim.languages.enableTreesitter";
+        };
+      package = mkGrammarOption pkgs "pug";
+    };
+
+    lsp = {
+      enable =
+        mkEnableOption "Pug LSP support"
+        // {
+          default = config.vim.lsp.enable;
+          defaultText = literalExpression "config.vim.lsp.enable";
+        };
+      servers = mkOption {
+        type = listOf (enum servers);
+        default = defaultServers;
+        description = "Pug LSP server to use";
+      };
+    };
+
+    format = {
+      enable =
+        mkEnableOption "Pug formatting"
+        // {
+          default = config.vim.languages.enableFormat;
+          defaultText = literalExpression "config.vim.languages.enableFormat";
+        };
+
+      type = mkOption {
+        type = listOf (enum (attrNames formats));
+        default = defaultFormat;
+        description = "Pug formatter to use";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter = {
+        enable = true;
+        grammars = [cfg.treesitter.package];
+      };
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp = {
+        presets = genAttrs cfg.lsp.servers (_: {enable = true;});
+        servers = genAttrs cfg.lsp.servers (_: {filetypes = ["pug"];});
+      };
+    })
+
+    (mkIf cfg.format.enable {
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts = {
+          formatters_by_ft.pug = cfg.format.type;
+          formatters =
+            mapListToAttrs (name: {
+              inherit name;
+              value = formats.${name};
+            })
+            cfg.format.type;
+        };
+      };
+    })
+  ]);
+}

modules/plugins/statusline/lualine/config.nix

@@ -68,6 +68,8 @@ in {
             globalstatus = mkDefault cfg.globalStatus;
             refresh = mkDefault cfg.refresh;
             always_divide_middle = mkDefault cfg.alwaysDivideMiddle;
+            ignore_focus = mkDefault cfg.ignoreFocus;
+            disabled_filetypes = mkDefault cfg.disabledFiletypes;
           };
 
           sections = {

modules/plugins/statusline/lualine/lualine.nix

@@ -102,10 +102,17 @@ in {
       default = true;
     };
 
-    disabledFiletypes = mkOption {
-      type = listOf str;
-      description = "Filetypes to disable lualine on";
-      default = ["alpha"];
+    disabledFiletypes = {
+      statusline = mkOption {
+        type = listOf str;
+        default = ["alpha"];
+        description = "Filetypes to disable lualine on for statusline";
+      };
+      winbar = mkOption {
+        type = listOf str;
+        default = [];
+        description = "Filetypes to disable lualine on for winbar";
+      };
     };
 
     ignoreFocus = mkOption {

npins/sources.json

@@ -2395,6 +2395,22 @@
       "url": "https://api.github.com/repos/withastro/prettier-plugin-astro/tarball/refs/tags/v0.14.1",
       "hash": "sha256-XGPz4D2UKOonet0tX3up5mCxw3/69XYPScxb9l7nzpE="
     },
+    "prettier-plugin-pug": {
+      "type": "GitRelease",
+      "repository": {
+        "type": "GitHub",
+        "owner": "prettier",
+        "repo": "plugin-pug"
+      },
+      "pre_releases": false,
+      "version_upper_bound": null,
+      "release_prefix": null,
+      "submodules": false,
+      "version": "3.4.2",
+      "revision": "33c86341f0addf48b09968f2545efcf18331d046",
+      "url": "https://api.github.com/repos/prettier/plugin-pug/tarball/refs/tags/3.4.2",
+      "hash": "sha256-4CsKMj8Xnq+dlGzLAG2hV8jTCMYBYhaV/uoKAfztSGs="
+    },
     "prettier-plugin-svelte": {
       "type": "GitRelease",
       "repository": {