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

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 {