eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-10 21:29:48 +01:00
Code Issues Releases Wiki Activity

sway: un-extract single-use variable

Browse source
This commit is contained in:
Andrew Marshall 2024-04-20 12:46:05 -04:00 committed by Robert Helgesson
parent 25479e29d1
commit 76bf779881
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/services/window-managers/i3-sway/sway.nix
View file

@ -331,13 +331,6 @@ let
++ [ cfg.extraConfig ]); ++ [ cfg.extraConfig ]);
}; };
defaultSwayPackage = pkgs.sway.override {
extraSessionCommands = cfg.extraSessionCommands;
extraOptions = cfg.extraOptions;
withBaseWrapper = cfg.wrapperFeatures.base;
withGtkWrapper = cfg.wrapperFeatures.gtk;
};
in { in {
meta.maintainers = with maintainers; [ meta.maintainers = with maintainers; [
Scrumplex Scrumplex
@ -357,7 +350,12 @@ in {
package = mkOption { package = mkOption {
type = with types; nullOr package; type = with types; nullOr package;
default = defaultSwayPackage; default = pkgs.sway.override {
extraSessionCommands = cfg.extraSessionCommands;
extraOptions = cfg.extraOptions;
withBaseWrapper = cfg.wrapperFeatures.base;
withGtkWrapper = cfg.wrapperFeatures.gtk;
};
defaultText = literalExpression "${pkgs.sway}"; defaultText = literalExpression "${pkgs.sway}";
description = '' description = ''
Sway package to use. Will override the options Sway package to use. Will override the options