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

.github/typos.toml

@@ -12,5 +12,6 @@ default.extend-ignore-words-re = [
   "Emac",
   "tese", # for glsl shaders
   "Caue",
+  "bse", # ./modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix:20:78: "bse" should be "base".
 ]
 

.github/workflows/cachix.yml

@@ -25,7 +25,7 @@ jobs:
         name: Checkout
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v31.10.5
+        uses: cachix/install-nix-action@v31.10.6
         with:
           nix_path: nixpkgs=channel:nixos-unstable
           extra_nix_config: |

.github/workflows/check.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v6
-      - uses: cachix/install-nix-action@v31.10.5
+      - uses: cachix/install-nix-action@v31.10.6
         with:
           nix_path: nixpkgs=channel:nixos-unstable
           extra_nix_config: |
@@ -37,7 +37,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v31.10.5
+        uses: cachix/install-nix-action@v31.10.6
         with:
           nix_path: nixpkgs=channel:nixos-unstable
           extra_nix_config: |
@@ -93,7 +93,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v6
-      - uses: cachix/install-nix-action@v31.10.5
+      - uses: cachix/install-nix-action@v31.10.6
         with:
           nix_path: nixpkgs=channel:nixos-unstable
           extra_nix_config: |
@@ -130,7 +130,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v6
-      - uses: cachix/install-nix-action@v31.10.5
+      - uses: cachix/install-nix-action@v31.10.6
         with:
           nix_path: nixpkgs=channel:nixos-unstable
           extra_nix_config: |
@@ -168,7 +168,7 @@ jobs:
           cat "$HOME/changed_files"
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v31.10.5
+        uses: cachix/install-nix-action@v31.10.6
         with:
           nix_path: nixpkgs=channel:nixos-unstable
           extra_nix_config: |

.github/workflows/docs-preview.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - uses: cachix/install-nix-action@v31.10.5
+      - uses: cachix/install-nix-action@v31.10.6
         with:
           nix_path: nixpkgs=channel:nixos-unstable
           extra_nix_config: |

.github/workflows/manual.yml

@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - uses: cachix/install-nix-action@v31.10.5
+      - uses: cachix/install-nix-action@v31.10.6
         with:
           nix_path: nixpkgs=channel:nixos-unstable
           extra_nix_config: |

.github/workflows/update.yml

@@ -12,7 +12,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: "Install Nix"
-        uses: cachix/install-nix-action@v31.10.5
+        uses: cachix/install-nix-action@v31.10.6
 
       - name: Set up Git
         run: |

configuration.nix

@@ -60,6 +60,7 @@ isMaximal: {
       clang.enable = isMaximal;
       cmake.enable = isMaximal;
       css.enable = isMaximal;
+      scss.enable = isMaximal;
       html.enable = isMaximal;
       json.enable = isMaximal;
       sql.enable = isMaximal;

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

@@ -108,6 +108,10 @@
   `languages.go.treesitter.gotmplPackage` to
   {option}`vim.languages.go.treesitter.gotmpl.package`
 
+- Split SCSS from `languages.css` into `languages.scss` and add extra tools for
+  SCSS/SASS. This also changes the default LSP to `some-sass-language-server`
+  for SCSS/SASS.
+
 [CaueAnjos](https://github.com/caueanjos)
 
 - Renamed `roslyn_ls` to `roslyn-ls`
@@ -320,6 +324,8 @@
 - Added {option}`vim.lsp.presets.vue-language-server.enable` for Vue Template
   support.
 
+- Added {option}`vim.lsp.presets.some-sass-language-server.enable`.
+
 - Fix `vim.lsp.presets.vala-language-server` to be wrapped correctly with
   `uncrustify`.
 
@@ -329,6 +335,8 @@
 - Fix {option}`vim.utility.nvim-biscuits.enable` by upgrading, to fix
   tree-sitter incompatibilities.
 
+- Fix image.nvim processor configuration and cleanup module.
+
 - Added [Selenen](https://github.com/kampfkarren/selene) for more diagnostics in
   `languages.lua`.
 

flake.lock

@@ -38,11 +38,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1770419553,
-        "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
+        "lastModified": 1777828893,
+        "narHash": "sha256-gVWVnmyNr74BVKfhMMZDWkhx2699dhmZ2g0W8TTHtkk=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
+        "rev": "c1c0b544bfabe6669b5a6a0383ccb475fe60258b",
         "type": "github"
       },
       "original": {

flake/pkgs/by-name/some-sass-language-server/package.nix

@@ -0,0 +1,70 @@
+# Stolen from <https://github.com/NixOS/nixpkgs/pull/459753>
+# because <nixpkgs> is slower than your mom
+{
+  lib,
+  fetchFromGitHub,
+  buildNpmPackage,
+  pkg-config,
+  libsecret,
+  stdenv,
+}:
+buildNpmPackage (finalAttrs: {
+  pname = "some-sass-language-server";
+  version = "2.3.5";
+
+  src = fetchFromGitHub {
+    owner = "wkillerud";
+    repo = "some-sass";
+    tag = "some-sass-language-server@${finalAttrs.version}";
+    hash = "sha256-rtoHrnMAf3xa1U9vkhPiQ17gsY2yW2knjctod3TbKuo=";
+  };
+
+  npmDepsHash = "sha256-8jKrxqn8jSWUjZURHl53STTD4hcU0Q3iPH9E4r+lKTc=";
+
+  env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
+  npmInstallFlags = ["--ignore-scripts"];
+
+  nativeBuildInputs = lib.optionals stdenv.isLinux [pkg-config];
+  buildInputs = lib.optionals stdenv.isLinux [libsecret];
+
+  dontNpmBuild = true;
+
+  buildPhase = ''
+    runHook preBuild
+
+    echo "Building vscode-css-languageservice..."
+    npm run build --workspace=packages/vscode-css-languageservice
+
+    echo "Building language-services..."
+    npm run build --workspace=packages/language-services
+
+    echo "Building language-server..."
+    npm run build:production --workspace=packages/language-server
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/node_modules/some-sass-language-server
+    cp -r packages/language-server/dist \
+    packages/language-server/bin \
+    packages/language-server/package.json \
+    $out/lib/node_modules/some-sass-language-server/
+
+    mkdir -p $out/bin
+    ln -s $out/lib/node_modules/some-sass-language-server/bin/some-sass-language-server \
+    $out/bin/some-sass-language-server
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Language server with advanced feature support for Scss and Sass files";
+    homepage = "https://wkillerud.github.io/some-sass/";
+    changelog = "https://github.com/wkillerud/some-sass/releases/tag/some-sass-language-server@${finalAttrs.version}";
+    license = lib.licenses.mit;
+    mainProgram = "some-sass-language-server";
+  };
+})

modules/plugins/languages/css.nix

@@ -91,7 +91,6 @@ in {
           filetypes = [
             "css"
             # TODO: split in their own modules
-            "scss"
             "less"
           ];
         });

modules/plugins/languages/default.nix

@@ -13,6 +13,7 @@ in {
     ./clojure.nix
     ./cmake.nix
     ./css.nix
+    ./scss.nix
     ./elixir.nix
     ./elm.nix
     ./fsharp.nix

modules/plugins/languages/scss.nix

@@ -0,0 +1,143 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (builtins) attrNames;
+  inherit (lib.options) mkEnableOption mkOption literalExpression;
+  inherit (lib) genAttrs;
+  inherit (lib.meta) getExe;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.types) enum listOf;
+  inherit (lib.nvim.types) mkGrammarOption diagnostics;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
+
+  cfg = config.vim.languages.scss;
+
+  defaultServer = ["some-sass-language-server"];
+  servers = ["some-sass-language-server" "vscode-css-language-server"];
+
+  defaultFormat = ["prettier"];
+  formats = {
+    prettier = {
+      command = getExe pkgs.prettier;
+    };
+
+    prettierd = {
+      command = getExe pkgs.prettierd;
+    };
+  };
+
+  defaultDiagnosticsProvider = ["stylelint"];
+  diagnosticsProviders = {
+    stylelint = {
+      config = {
+        cmd = getExe pkgs.stylelint;
+      };
+    };
+  };
+in {
+  options.vim.languages.scss = {
+    enable = mkEnableOption "SCSS/SASS language support";
+
+    treesitter = {
+      enable =
+        mkEnableOption "SCSS/SASS treesitter"
+        // {
+          default = config.vim.languages.enableTreesitter;
+          defaultText = literalExpression "config.vim.languages.enableTreesitter";
+        };
+      package = mkGrammarOption pkgs "scss";
+    };
+
+    lsp = {
+      enable =
+        mkEnableOption "SCSS/SASS LSP support"
+        // {
+          default = config.vim.lsp.enable;
+          defaultText = literalExpression "config.vim.lsp.enable";
+        };
+
+      servers = mkOption {
+        type = listOf (enum servers);
+        default = defaultServer;
+        description = "SCSS/SASS LSP server to use";
+      };
+    };
+
+    format = {
+      enable =
+        mkEnableOption "SCSS/SASS formatting"
+        // {
+          default = config.vim.languages.enableFormat;
+          defaultText = literalExpression "config.vim.languages.enableFormat";
+        };
+      type = mkOption {
+        description = "SCSS/SASS formatter to use";
+        type = listOf (enum (attrNames formats));
+        default = defaultFormat;
+      };
+    };
+
+    extraDiagnostics = {
+      enable =
+        mkEnableOption "extra SCSS/SASS diagnostics"
+        // {
+          default = config.vim.languages.enableExtraDiagnostics;
+          defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
+        };
+      types = diagnostics {
+        langDesc = "SCSS";
+        inherit diagnosticsProviders;
+        inherit defaultDiagnosticsProvider;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp = {
+        presets = genAttrs cfg.lsp.servers (_: {enable = true;});
+        servers = genAttrs cfg.lsp.servers (_: {
+          filetypes = [
+            "scss"
+            "sass"
+          ];
+        });
+      };
+    })
+
+    (mkIf cfg.format.enable {
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts = {
+          formatters_by_ft.scss = cfg.format.type;
+          formatters_by_ft.sass = cfg.format.type;
+          formatters =
+            mapListToAttrs (name: {
+              inherit name;
+              value = formats.${name};
+            })
+            cfg.format.type;
+        };
+      };
+    })
+
+    (mkIf cfg.extraDiagnostics.enable {
+      vim.diagnostics.nvim-lint = {
+        enable = true;
+        linters_by_ft.scss = cfg.extraDiagnostics.types;
+        linters_by_ft.sass = cfg.extraDiagnostics.types;
+        linters =
+          mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
+            cfg.extraDiagnostics.types);
+      };
+    })
+  ]);
+}

modules/plugins/lsp/presets/bash-language-server.nix

@@ -21,7 +21,7 @@ in {
       cmd = [(getExe pkgs.bash-language-server) "start"];
       root_markers = [".git"];
       settings = {
-        basheIde = {
+        bashIde = {
           globPattern = mkLuaInline "vim.env.GLOB_PATTERN or '*@(.sh|.inc|.bash|.command)'";
         };
       };

modules/plugins/lsp/presets/default.nix

@@ -55,6 +55,7 @@
     ./ruff.nix
     ./rumdl.nix
     ./solargraph.nix
+    ./some-sass-language-server.nix
     ./sqls.nix
     ./superhtml.nix
     ./svelte-language-server.nix

modules/plugins/lsp/presets/some-sass-language-server.nix

@@ -0,0 +1,32 @@
+{
+  inputs,
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib.meta) getExe;
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.types) mkLspPresetEnableOption;
+
+  cfg = config.vim.lsp.presets.some-sass-language-server;
+in {
+  options.vim.lsp.presets.some-sass-language-server = {
+    enable = mkLspPresetEnableOption "some-sass-language-server" "Some Sass" [];
+  };
+
+  config = mkIf cfg.enable {
+    vim.lsp.servers.some-sass-language-server = {
+      enable = true;
+      cmd = [(getExe inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.some-sass-language-server) "--stdio"];
+      root_markers = [".git" "package.json"];
+      # <https://wkillerud.github.io/some-sass/language-server/settings.html>
+      settings = {
+        somesass = {
+          scss.completion.suggestFromUseOnly = true;
+          sass.completion.suggestFromUseOnly = true;
+        };
+      };
+    };
+  };
+}

modules/plugins/utility/images/image-nvim/config.nix

@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }: let
   inherit (lib.modules) mkIf;
@@ -15,10 +16,14 @@ in {
         "image-nvim"
       ];
 
-      luaPackages = [
+      luaPackages = mkIf (cfg.setupOpts.processor == "magick_rock") [
         "magick"
       ];
 
+      extraPackages = mkIf (cfg.setupOpts.processor == "magick_cli") [
+        pkgs.imagemagick
+      ];
+
       pluginRC.image-nvim = entryAnywhere ''
         require("image").setup(
           ${toLuaObject cfg.setupOpts}

modules/plugins/utility/images/image-nvim/image-nvim.nix

@@ -1,11 +1,14 @@
 {lib, ...}: let
   inherit (lib.options) mkEnableOption mkOption;
 
-  inherit (lib.types) enum listOf str nullOr int;
+  inherit (lib.types) enum listOf str;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.utility.images.image-nvim = {
-    enable = mkEnableOption "image support in Neovim [image.nvim]";
+    enable = mkEnableOption ''
+      image support in Neovim [image.nvim].
+      See <https://github.com/3rd/image.nvim#default-configuration> for all configuration options.
+    '';
 
     setupOpts = mkPluginSetupOption "image.nvim" {
       backend = mkOption {
@@ -21,91 +24,15 @@ in {
           * `sixel` - uses the Sixel graphics protocol, widely supported by many terminals
         '';
       };
-
-      integrations = {
-        markdown = {
-          enable = mkEnableOption " image.nvim in markdown files" // {default = true;};
-          clearInInsertMode = mkEnableOption "clearing of images when entering insert mode";
-          downloadRemoteImages = mkEnableOption "downloading remote images";
-          onlyRenderAtCursor = mkEnableOption "only rendering images at cursor";
-          filetypes = mkOption {
-            type = listOf str;
-            default = ["markdown" "vimwiki"];
-            description = ''
-              Filetypes to enable image.nvim in. Markdown extensions
-              (i.e. quarto) can go here
-            '';
-          };
-        };
-
-        neorg = {
-          enable = mkEnableOption "image.nvim in Neorg files" // {default = true;};
-          clearInInsertMode = mkEnableOption "clearing of images when entering insert mode";
-          downloadRemoteImages = mkEnableOption "downloading remote images";
-          onlyRenderAtCursor = mkEnableOption "only rendering images at cursor";
-          filetypes = mkOption {
-            type = listOf str;
-            default = ["neorg"];
-            description = ''
-              Filetypes to enable image.nvim in.
-            '';
-          };
-        };
-
-        maxWidth = mkOption {
-          type = nullOr int;
-          default = null;
-          description = ''
-            The maximum width of images to render. Images larger than
-            this will be scaled down to fit within this width.
-          '';
-        };
+      processor = mkOption {
+        type = enum ["magick_cli" "magick_rock"];
+        default = "magick_rock";
+        description = "The processor to use for image magick.";
       };
 
-      maxHeight = mkOption {
-        type = nullOr int;
-        default = null;
-        description = ''
-          The maximum height of images to render. Images larger than
-          this will be scaled down to fit within this height.
-        '';
-      };
-
-      maxWidthWindowPercentage = mkOption {
-        type = nullOr int;
-        default = null;
-        description = ''
-          The maximum width of images to render as a percentage of the
-          window width. Images larger than this will be scaled down to
-          fit within this width.
-        '';
-      };
-
-      maxHeightWindowPercentage = mkOption {
-        type = nullOr int;
-        default = 50;
-        description = ''
-          The maximum height of images to render as a percentage of the
-          window height. Images larger than this will be scaled down to
-          fit within this height.
-        '';
-      };
-
-      windowOverlapClear = {
-        enable = mkEnableOption "clearing of images when they overlap with the window";
-        ftIgnore = mkOption {
-          type = listOf str;
-          default = ["cmp_menu" "cmp_docs" ""];
-          description = ''
-            Filetypes to ignore window overlap clearing in.
-          '';
-        };
-      };
-
-      editorOnlyRenderWhenFocused = mkEnableOption "only rendering images when the editor is focused";
-      hijackFilePatterns = mkOption {
+      hijack_file_patterns = mkOption {
         type = listOf str;
-        default = ["*.png" "*.jpg" "*.jpeg" "*.gif" "*.webp"];
+        default = ["*.png" "*.jpg" "*.jpeg" "*.gif" "*.webp" "*.svg"];
         description = ''
           File patterns to hijack for image.nvim. This is useful for
           filetypes that don't have a dedicated integration.