flake: bump nixpkgs from d7a713c to 687f05a

Bumps [nixpkgs](https://github.com/NixOS/nixpkgs) from `d7a713c` to `687f05a`.
- [Commits](https://github.com/NixOS/nixpkgs/compare/d7a713c0b7e47c908258e71cba7a2d77cc8d71d5...687f05a9184cad4eaf905c48b63649e3a86f5433)

---
updated-dependencies:
- dependency-name: nixpkgs
  dependency-version: 687f05a9184cad4eaf905c48b63649e3a86f5433
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/backport.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Create GitHub App token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         if: vars.CI_APP_ID
         id: app-token
         with:

.github/workflows/github_pages.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v16
+      - uses: cachix/cachix-action@v17
         with:
           name: nix-community
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'

.github/workflows/tag-maintainers.yml

@@ -16,7 +16,7 @@ jobs:
       github.event.pull_request.state == 'open'
     steps:
       - name: Create GitHub App token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         if: vars.CI_APP_ID
         id: app-token
         with:

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
       tests: ${{ steps.changes.outputs.tests }}
     steps:
       - uses: actions/checkout@v6
-      - uses: dorny/paths-filter@v3
+      - uses: dorny/paths-filter@v4
         id: changes
         with:
           filters: |

.github/workflows/update-flake.yml

@@ -13,7 +13,7 @@ jobs:
         branch: [master, release-25.05]
     steps:
       - name: Create GitHub App token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         if: vars.CI_APP_ID
         id: app-token
         with:

.github/workflows/update-maintainers.yml

@@ -27,7 +27,7 @@ jobs:
       pr_branch: update/maintainers-${{ github.ref_name }}
     steps:
       - name: Create GitHub App token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         if: vars.CI_APP_ID
         id: app-token
         with:

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771903837,
-        "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=",
+        "lastModified": 1779102034,
+        "narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951",
+        "rev": "687f05a9184cad4eaf905c48b63649e3a86f5433",
         "type": "github"
       },
       "original": {

modules/lib/stdlib-extended.nix

@@ -7,7 +7,16 @@ let
   mkHmLib = import ./.;
 in
 nixpkgsLib.extend (
-  self: super: {
-    hm = mkHmLib { lib = self; };
+  self: super:
+  let
+    hmLib = mkHmLib { lib = self; };
+  in
+  {
+    hm = hmLib;
+
+    # Nixpkgs now validates meta.maintainers against lib.maintainers.
+    # Mirror Home Manager-only maintainers there so existing lib.hm.maintainers
+    # references continue to satisfy the upstream type check.
+    maintainers = super.maintainers // hmLib.maintainers;
   }
 )

modules/misc/news/2026/03/2026-03-19_20-34-29.nix

@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+  time = "2026-03-20T02:34:29+00:00";
+  condition = pkgs.stdenv.hostPlatform.isLinux;
+  message = ''
+    A new module is available: 'services.wayle'.
+
+    Wayle is a fast, configurable desktop environment shell for Wayland
+    compositors. Built in Rust with Relm4 and focused on performance,
+    modularity, and a great user experience. A successor to HyprPanel without
+    the pain or dependency on Hyprland.
+  '';
+}

modules/programs/chromium.nix

@@ -40,7 +40,7 @@ let
 
       finalPackage = mkOption {
         inherit visible;
-        type = types.package;
+        type = types.nullOr types.package;
         readOnly = true;
         description = ''
           Resulting customized ${name} package
@@ -220,15 +220,22 @@ let
       };
 
     in
+
     lib.mkIf cfg.enable {
-      programs.${browser}.finalPackage = lib.mkIf (cfg.package != null) (
+      assertions = [
+        {
+          assertion = !(cfg.package == null && cfg.commandLineArgs != [ ]);
+          message = "Cannot set `commandLineArgs` when `package` is null for ${browser}.";
+        }
+      ];
+
+      programs.${browser}.finalPackage =
         if cfg.commandLineArgs != [ ] then
           cfg.package.override {
             commandLineArgs = lib.concatStringsSep " " cfg.commandLineArgs;
           }
         else
-          cfg.package
-      );
+          cfg.package;
 
       home.packages = lib.mkIf (cfg.finalPackage != null) [
         cfg.finalPackage

modules/programs/desktoppr.nix

@@ -22,7 +22,7 @@ in
 
         options = {
           picture = lib.mkOption {
-            type = with lib.types; nullOr (either path (strMatching "^http(s)?:\/\/.*$"));
+            type = with lib.types; nullOr (either path (strMatching "^http(s)?://.*$"));
             default = null;
             example = "/System/Library/Desktop Pictures/Solid Colors/Stone.png";
             description = ''

modules/programs/difftastic.nix

@@ -67,11 +67,14 @@ in
     options = mkOption {
       type =
         with types;
-        attrsOf (oneOf [
-          str
-          int
-          bool
-        ]);
+        let
+          atom = oneOf [
+            str
+            int
+            bool
+          ];
+        in
+        attrsOf (either atom (listOf atom));
       default = { };
       example = {
         color = "dark";

modules/programs/foot.nix

@@ -16,7 +16,23 @@ in
 
     package = lib.mkPackageOption pkgs "foot" { };
 
-    server.enable = lib.mkEnableOption "Foot terminal server";
+    server = {
+      enable = lib.mkEnableOption "Foot terminal server";
+
+      systemdTarget = lib.mkOption {
+        type = lib.types.str;
+        default = config.wayland.systemd.target;
+        defaultText = lib.literalExpression "config.wayland.systemd.target";
+        example = "sway-session.target";
+        description = ''
+          The systemd target that will automatically start the Foot server service.
+
+          When setting this value to `"sway-session.target"`,
+          make sure to also enable {option}`wayland.windowManager.sway.systemd.enable`,
+          otherwise the service may never be started.
+        '';
+      };
+    };
 
     settings = lib.mkOption {
       type = iniFormat.type;
@@ -59,8 +75,9 @@ in
         Unit = {
           Description = "Fast, lightweight and minimalistic Wayland terminal emulator.";
           Documentation = "man:foot(1)";
-          PartOf = [ "graphical-session.target" ];
-          After = [ "graphical-session.target" ];
+          PartOf = [ cfg.server.systemdTarget ];
+          After = [ cfg.server.systemdTarget ];
+          ConditionEnvironment = "WAYLAND_DISPLAY";
         };
 
         Service = {
@@ -70,7 +87,7 @@ in
         };
 
         Install = {
-          WantedBy = [ "graphical-session.target" ];
+          WantedBy = [ cfg.server.systemdTarget ];
         };
       };
     };

modules/services/wayle.nix

@@ -0,0 +1,140 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  inherit (builtins) elem;
+  inherit (lib.attrsets) recursiveUpdate;
+  inherit (lib) lists getExe';
+  inherit (lib.modules) mkIf;
+  inherit (lib.options) mkEnableOption mkOption mkPackageOption;
+
+  cfg = config.services.wayle;
+
+  tomlFormat = pkgs.formats.toml { };
+in
+{
+  meta.maintainers = with lib.maintainers; [
+    perchun
+  ];
+
+  options.services.wayle = {
+    enable = mkEnableOption "wayle shell";
+    package = mkPackageOption pkgs "wayle" { };
+
+    autoInstallDependencies = mkOption {
+      type = lib.types.bool;
+      default = true;
+      example = false;
+      description = ''
+        Whether to automatically install soft dependencies used by wayle that
+        will be required based on your config.
+      '';
+    };
+
+    settings = mkOption {
+      inherit (tomlFormat) type;
+      description = ''
+        Standard configuration options for wayle.
+      '';
+
+      default = { };
+
+      example = {
+        styling = {
+          theme-provider = "wayle";
+
+          palette = {
+            bg = "#16161e";
+            fg = "#c0caf5";
+            primary = "#7aa2f7";
+          };
+        };
+
+        bar = {
+          scale = 1;
+          location = "top";
+          rounding = "sm";
+
+          layout = [
+            {
+              monitor = "*";
+              left = [ "clock" ];
+              center = [ "media" ];
+              right = [ "battery" ];
+            }
+          ];
+        };
+
+        modules.clock = {
+          format = "%H:%M";
+          icon-show = true;
+          label-show = true;
+        };
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (
+    let
+      # Define default settings.
+      # This is not used to generate the config.toml file for wayle, only for
+      # internal module configuration that require (possibly user unset)
+      # default settings. These are the same defaults wayle uses.
+      settings_with_fallbacks = recursiveUpdate {
+        wallpaper.engine-enabled = false;
+        styling.theme-provider = "wayle";
+      } cfg.settings;
+    in
+    {
+      assertions = [
+        (lib.hm.assertions.assertPlatform "services.wayle" pkgs lib.platforms.linux)
+      ];
+
+      home.packages = (
+        [ cfg.package ]
+        # Install the appropriate theme-provider, if set.
+        ++ (lists.optional (
+          cfg.autoInstallDependencies
+          && elem settings_with_fallbacks.styling.theme-provider [
+            "matugen"
+            "wallust"
+            "pywal"
+          ]
+        ) pkgs.${settings_with_fallbacks.styling.theme-provider})
+      );
+
+      # Main config file.
+      xdg.configFile."wayle/config.toml" = mkIf (cfg.settings != { }) {
+        source = tomlFormat.generate "wayle-config" cfg.settings;
+      };
+
+      # Systemd service for main wayle shell.
+      systemd.user.services.wayle = {
+        Unit = {
+          Description = ''
+            Wayland Elements - A compositor agnostic shell with extensive customization
+          '';
+          Documentation = "https://github.com/wayle-rs/wayle";
+          PartOf = [ config.wayland.systemd.target ];
+          After = [ config.wayland.systemd.target ];
+          ConditionEnvironment = "WAYLAND_DISPLAY";
+        };
+        Service = {
+          ExecStart = "${getExe' cfg.package "wayle"} shell";
+          Restart = "on-failure";
+        };
+        Install = {
+          WantedBy = [ config.wayland.systemd.target ];
+        };
+      };
+
+      # Wallpaper-engine dependency.
+      services.swww.enable = mkIf (
+        cfg.autoInstallDependencies && settings_with_fallbacks.wallpaper.engine-enabled
+      ) (lib.mkDefault true);
+    }
+  );
+}

modules/services/wlsunset.nix

@@ -129,6 +129,7 @@ in
         Description = "Day/night gamma adjustments for Wayland compositors.";
         After = [ cfg.systemdTarget ];
         PartOf = [ cfg.systemdTarget ];
+        ConditionEnvironment = "WAYLAND_DISPLAY";
       };
 
       Service = {

tests/modules/programs/difftastic/difftastic-with-git-external-diff.nix

@@ -8,6 +8,10 @@
     options = {
       color = "always";
       display = "side-by-side";
+      override = [
+        "*.mill:Scala"
+        "*.yuck:Emacs Lisp"
+      ];
     };
   };
 
@@ -17,7 +21,7 @@
     assertFileExists home-files/.config/git/config
     assertFileContains home-files/.config/git/config '[diff]'
     # Should have diff.external set
-    assertFileRegex home-files/.config/git/config 'external = .*/difft.*--color.*--display'
+    assertFileRegex home-files/.config/git/config 'external = .*/difft.*--color.*--display.*--override.*mill:Scala.*--override.*yuck:Emacs Lisp.*'
     # Should NOT have difftool config when diffToolMode is explicitly false
     assertFileNotRegex home-files/.config/git/config 'tool = "difftastic"'
     assertFileNotRegex home-files/.config/git/config '\[difftool "difftastic"\]'

tests/modules/programs/foot/systemd-user-service-expected.service

@@ -8,6 +8,7 @@ Restart=on-failure
 
 [Unit]
 After=graphical-session.target
+ConditionEnvironment=WAYLAND_DISPLAY
 Description=Fast, lightweight and minimalistic Wayland terminal emulator.
 Documentation=man:foot(1)
 PartOf=graphical-session.target

tests/modules/programs/go/old-options.nix

@@ -30,7 +30,7 @@
 
   nmt.script =
     let
-      goCfgDir = if !pkgs.stdenv.isDarwin then ".config/go" else "Library/Application\ Support/go";
+      goCfgDir = if !pkgs.stdenv.isDarwin then ".config/go" else "Library/Application Support/go";
     in
     ''
       assertFileExists "home-files/${goCfgDir}/env"

tests/modules/programs/go/suboptions-unset.nix

@@ -14,7 +14,7 @@
 
   nmt.script =
     let
-      goCfgDir = if !pkgs.stdenv.isDarwin then ".config/go" else "Library/Application\ Support/go";
+      goCfgDir = if !pkgs.stdenv.isDarwin then ".config/go" else "Library/Application Support/go";
     in
     ''
       assertFileExists "home-files/${goCfgDir}/env"

tests/modules/programs/vicinae/example-settings.nix

@@ -1,9 +1,16 @@
 {
   pkgs,
-  config,
   ...
 }:
 
+let
+  mkExtensionStub =
+    name:
+    pkgs.runCommandLocal name { } ''
+      mkdir -p $out
+      echo '{}' > $out/package.json
+    '';
+in
 {
   programs.vicinae = {
     enable = true;
@@ -61,22 +68,8 @@
     };
 
     extensions = [
-      (config.lib.vicinae.mkRayCastExtension {
-        name = "gif-search";
-        sha256 = "sha256-G7il8T1L+P/2mXWJsb68n4BCbVKcrrtK8GnBNxzt73Q=";
-        rev = "4d417c2dfd86a5b2bea202d4a7b48d8eb3dbaeb1";
-      })
-      (config.lib.vicinae.mkExtension {
-        name = "test-extension";
-        src =
-          pkgs.fetchFromGitHub {
-            owner = "schromp";
-            repo = "vicinae-extensions";
-            rev = "f8be5c89393a336f773d679d22faf82d59631991";
-            sha256 = "sha256-zk7WIJ19ITzRFnqGSMtX35SgPGq0Z+M+f7hJRbyQugw=";
-          }
-          + "/test-extension";
-      })
+      (mkExtensionStub "cdnjs")
+      (mkExtensionStub "test-extension")
     ];
   };
 
@@ -84,7 +77,7 @@
     assertFileExists      "home-files/.config/vicinae/vicinae.json"
     assertFileExists      "home-files/.config/systemd/user/vicinae.service"
     assertFileExists      "home-files/.local/share/vicinae/themes/catppuccin-mocha.toml"
-    assertFileExists      "home-files/.local/share/vicinae/extensions/gif-search/package.json"
+    assertFileExists      "home-files/.local/share/vicinae/extensions/cdnjs/package.json"
     assertFileExists      "home-files/.local/share/vicinae/extensions/test-extension/package.json"
   '';
 }

tests/modules/services/wayle/basic-config.nix

@@ -0,0 +1,44 @@
+{ config, ... }:
+{
+  services.wayle = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { name = "wayle"; };
+
+    settings = {
+      styling = {
+        theme-provider = "wayle";
+
+        palette = {
+          bg = "#16161e";
+          fg = "#c0caf5";
+          primary = "#7aa2f7";
+        };
+      };
+
+      bar = {
+        scale = 1;
+        location = "top";
+        rounding = "sm";
+
+        layout = {
+          monitor = "*";
+          left = [ "clock" ];
+          center = [ "media" ];
+          right = [ "battery" ];
+        };
+      };
+
+      modules.clock = {
+        format = "%H:%M";
+        icon-show = true;
+        label-show = true;
+      };
+    };
+  };
+
+  nmt.script = ''
+    assertFileContent \
+      "home-files/.config/wayle/config.toml" \
+      ${./basic-config.toml}
+  '';
+}

tests/modules/services/wayle/basic-config.toml

@@ -0,0 +1,23 @@
+[bar]
+location = "top"
+rounding = "sm"
+scale = 1
+
+[bar.layout]
+center = ["media"]
+left = ["clock"]
+monitor = "*"
+right = ["battery"]
+
+[modules.clock]
+format = "%H:%M"
+icon-show = true
+label-show = true
+
+[styling]
+theme-provider = "wayle"
+
+[styling.palette]
+bg = "#16161e"
+fg = "#c0caf5"
+primary = "#7aa2f7"

tests/modules/services/wayle/default.nix

@@ -0,0 +1,5 @@
+{ lib, pkgs, ... }:
+
+lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
+  wayle-basic-config = ./basic-config.nix;
+}

tests/modules/services/wlsunset/wlsunset-service-expected.service

@@ -6,5 +6,6 @@ ExecStart=@wlsunset@/bin/wlsunset -L 128.8 -T 6000 -g 0.6 -l 12.3 -t 3500
 
 [Unit]
 After=test.target
+ConditionEnvironment=WAYLAND_DISPLAY
 Description=Day/night gamma adjustments for Wayland compositors.
 PartOf=test.target