Add test for 25.05, drop 24.11

Author: SuperSandro2000

.github/workflows/flake-build.yaml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ "24.11", "unstable" ]
+        target: [ "25.05", "unstable" ]
 
     steps:
       - uses: actions/checkout@v4
@@ -30,9 +30,8 @@ jobs:
         if: matrix.target != 'unstable'
         run: |
           nix build -L \
-            --override-input nixpkgs github:NixOS/nixpkgs/nixos-24.11 \
-            --override-input home-manager github:nix-community/home-manager/release-24.11 \
-            --override-input nixvim github:nix-community/nixvim/nixos-24.11
+            --override-input nixpkgs github:NixOS/nixpkgs/nixos-25.05 \
+            --override-input nixvim github:nix-community/nixvim/nixos-25.05
 
       - name: build unstable
         if: matrix.target == 'unstable'

flake.lock

@@ -4,13 +4,15 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
-    flake-utils.url = "github:numtide/flake-utils";
+    flake-utils = {
+      url = "github:numtide/flake-utils";
+      inputs.systems.follows = "nixvim/systems";
+    };
 
     nixvim = {
       url = "github:nix-community/nixvim";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-
         # https://github.com/nix-community/nixvim/blob/main/flake.nix#L12-L34
         nuschtosSearch.follows = "";
       };

flake.nix

@@ -1,8 +1,5 @@
 { lib, options, pkgs, ... }:
 
-let
-  colorizer = if lib.versionAtLeast lib.version "25.05pre" then "colorizer" else "nvim-colorizer";
-in
 {
   imports = [
     ./cmp.nix
@@ -71,47 +68,43 @@ in
     secure = true;
   };
 
-  diagnostics.virtual_text = true;
+  diagnostic.settings.virtual_text = true;
 
-  plugins =
-    let
-      crates = if options.plugins?crates then "crates" else "crates-nvim";
-    in
-    {
-      bufferline.enable = true;
-      commentary.enable = true;
-      "${crates}".enable = true;
-      fidget.enable = true;
-      gitsigns.enable = true;
-      indent-blankline.enable = true;
-      lastplace.enable = true;
-      lualine = {
-        enable = true;
-        settings = {
-          options = {
-            globalstatus = true;
-            theme = "onedark";
-          };
-          # https://github.com/nvim-lualine/lualine.nvim?tab=readme-ov-file#filename-component-options
-          sections = {
-            lualine_b = [{
-              sources = [ "nvim_diagnostic" "nvim_lsp" ];
-            }];
-            lualine_c = [{
-              path = 1;
-            }];
-          };
+  plugins = {
+    bufferline.enable = true;
+    commentary.enable = true;
+    crates.enable = true;
+    fidget.enable = true;
+    gitsigns.enable = true;
+    indent-blankline.enable = true;
+    lastplace.enable = true;
+    lualine = {
+      enable = true;
+      settings = {
+        options = {
+          globalstatus = true;
+          theme = "onedark";
+        };
+        # https://github.com/nvim-lualine/lualine.nvim?tab=readme-ov-file#filename-component-options
+        sections = {
+          lualine_b = [{
+            sources = [ "nvim_diagnostic" "nvim_lsp" ];
+          }];
+          lualine_c = [{
+            path = 1;
+          }];
         };
       };
-      nvim-autopairs.enable = true; # brackets, html, ...
-      ${colorizer}.enable = true;
-      rainbow-delimiters.enable = true;
-      ts-context-commentstring.enable = true; # set comment string dynamically
-      vim-matchup.enable = true; # extends % key with comments
-      web-devicons.enable = true;
-      which-key.enable = true;
-      vim-suda.enable = true;
     };
+    nvim-autopairs.enable = true; # brackets, html, ...
+    colorizer.enable = true;
+    rainbow-delimiters.enable = true;
+    ts-context-commentstring.enable = true; # set comment string dynamically
+    vim-matchup.enable = true; # extends % key with comments
+    web-devicons.enable = true;
+    which-key.enable = true;
+    vim-suda.enable = true;
+  };
 
   userCommands = {
     # Command aliases for common typos

modules/default.nix

@@ -1,16 +1,12 @@
 { lib, options, ... }:
 
-let
-  # TODO: drop with 25.05
-  hasDependencies = lib.versionAtLeast lib.version "25.05";
-in
-lib.optionalAttrs hasDependencies {
+{
   dependencies = {
     gcc.enable = false;
     nodejs.enable = false;
     tree-sitter.enable = false;
   };
-} // {
+
   plugins.treesitter = {
     enable = true;
     # exclude some big (above 10 MB) and rarely used languages
@@ -22,11 +18,6 @@ lib.optionalAttrs hasDependencies {
     ) options.plugins.treesitter.grammarPackages.default;
 
     settings.highlight.enable = true;
-  } // lib.optionalAttrs (!hasDependencies) {
-    # we are not installing packages by hand
-    gccPackage = null;
-    nodejsPackage = null;
-    treesitterPackage = null;
   };
 
   # Enable automatically closing and renaming HTML tags