gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-09-03 06:05:49 +00:00
committed by GitHub
parent a413106654 d96dab0c50
commit ffc43a6d5a
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/x11/desktop-managers/lxqt.nix
+22 -10
View File
@@ -9,8 +9,7 @@
with lib;
let
xcfg = config.services.xserver;
cfg = xcfg.desktopManager.lxqt;
cfg = config.services.xserver.desktopManager.lxqt;
in
@@ -21,16 +20,27 @@ in
options = {
services.xserver.desktopManager.lxqt.enable = mkOption {
type = types.bool;
default = false;
description = "Enable the LXQt desktop manager";
services.xserver.desktopManager.lxqt.enable = mkEnableOption "the LXQt desktop manager";
services.xserver.desktopManager.lxqt.iconThemePackage =
lib.mkPackageOption pkgs [ "kdePackages" "breeze-icons" ] { }
// {
description = "The package that provides a default icon theme.";
};
services.xserver.desktopManager.lxqt.extraPackages = lib.mkOption {
type = with lib.types; listOf package;
default = [ ];
defaultText = lib.literalExpression "[ ]";
example = lib.literalExpression "with pkgs; [ xscreensaver ]";
description = "Extra packages to be installed system wide.";
};
environment.lxqt.excludePackages = mkOption {
type = with lib.types; listOf package;
default = [ ];
example = literalExpression "[ pkgs.lxqt.qterminal ]";
type = types.listOf types.package;
defaultText = lib.literalExpression "[ ]";
example = lib.literalExpression "with pkgs; [ lxqt.qterminal ]";
description = "Which LXQt packages to exclude from the default environment";
};
@@ -61,7 +71,9 @@ in
environment.systemPackages =
pkgs.lxqt.preRequisitePackages
++ pkgs.lxqt.corePackages
++ (utils.removePackagesByName pkgs.lxqt.optionalPackages config.environment.lxqt.excludePackages);
++ [ cfg.iconThemePackage ]
++ (utils.removePackagesByName pkgs.lxqt.optionalPackages config.environment.lxqt.excludePackages)
++ cfg.extraPackages;
# Link some extra directories in /run/current-system/software/share
environment.pathsToLink = [ "/share" ];
@@ -69,7 +81,7 @@ in
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
# virtual file systems support for PCManFM-QT
services.gvfs.enable = true;
services.gvfs.enable = mkDefault true;
services.upower.enable = config.powerManagement.enable;
pkgs/by-name/cl/cloudflare-warp/package.nix
+3 -3
View File
@@ -24,15 +24,15 @@
}:
let
version = "2025.5.943";
version = "2025.6.1335";
sources = {
x86_64-linux = fetchurl {
url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_amd64.deb";
hash = "sha256-d4H3w+X3i3Hqqz8jbGx8eZ7ZuKrYJScbpFgeXKK71yI=";
hash = "sha256-zb+DrBKUOsNBaUE+2CNtocsDs3bcYpG0nHCnjcnH2Mo=";
};
aarch64-linux = fetchurl {
url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_arm64.deb";
hash = "sha256-E6+vSUSVNEd4+fNYsWcflk1fZb4dzNcjG8Mep7ZHw84=";
hash = "sha256-5DuJKyyr8AUkvuSVrcJYmrc+HAG19wmvrWNN8jrm+wY=";
};
};
in