nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

treewide: remove xorg package set

Browse source 
Xorg package set removed, now aliases.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
This commit is contained in:
Austin Horstman 2026-02-07 09:00:55 -06:00
parent 6cee082157
commit cbd8a72e5f
11 changed files with 13 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/config/home-cursor.nix
View file

@ -224,7 +224,7 @@ in
(mkIf cfg.x11.enable {
xsession.profileExtra = ''
${pkgs.xorg.xsetroot}/bin/xsetroot -xcf ${cursorPath} ${toString cfg.size}
${lib.getExe pkgs.xsetroot} -xcf ${cursorPath} ${toString cfg.size}
'';
xresources.properties = {

2
modules/programs/autorandr.nix
View file

@ -371,7 +371,7 @@ in
exit 1
esac
echo "Xft.dpi: $DPI" | ''${pkgs.xorg.xrdb}/bin/xrdb -merge
echo "Xft.dpi: $DPI" | ''${lib.getExe pkgs.xrdb} -merge
'''
};
}

6
modules/services/fusuma.nix
View file

@ -100,11 +100,11 @@ in
default = with pkgs; [
xdotool
coreutils
xorg.xprop
xprop
];
defaultText = literalExpression "pkgs.xdotool pkgs.coreutils pkgs.xorg.xprop";
defaultText = literalExpression "pkgs.xdotool pkgs.coreutils pkgs.xprop";
example = literalExpression ''
with pkgs; [ xdotool coreutils xorg.xprop ];
with pkgs; [ xdotool coreutils xprop ];
'';
description = ''
Extra packages needs to bring to the scope of fusuma service.

6
modules/services/grobi.nix
View file

@ -45,7 +45,7 @@ in
primary = true;
atomic = true;
execute_after = [
"''${pkgs.xorg.xrandr}/bin/xrandr --dpi 96"
"''${lib.getExe pkgs.xrandr} --dpi 96"
"''${pkgs.xmonad-with-packages}/bin/xmonad --restart";
];
}
@ -56,7 +56,7 @@ in
primary = true;
atomic = true;
execute_after = [
"''${pkgs.xorg.xrandr}/bin/xrandr --dpi 120"
"''${lib.getExe pkgs.xrandr} --dpi 120"
"''${pkgs.xmonad-with-packages}/bin/xmonad --restart";
];
}
@ -92,7 +92,7 @@ in
ExecStart = "${lib.getExe cfg.package} watch -v";
Restart = "always";
RestartSec = "2s";
Environment = [ "PATH=${pkgs.xorg.xrandr}/bin:${pkgs.bash}/bin" ];
Environment = [ "PATH=${pkgs.xrandr}/bin:${pkgs.bash}/bin" ];
};
Install = {

2
modules/services/screen-locker.nix
View file

@ -161,7 +161,7 @@ in
};
}
(mkIf (!cfg.xautolock.enable) {
systemd.user.services.xss-lock.Service.ExecStartPre = "${pkgs.xorg.xset}/bin/xset s ${
systemd.user.services.xss-lock.Service.ExecStartPre = "${lib.getExe pkgs.xset} s ${
toString (cfg.inactiveInterval * 60)
} ${toString cfg.xss-lock.screensaverCycle}";
})

2
modules/xresources.nix
View file

@ -31,7 +31,7 @@ let
in
"${n}: ${formatValue v}";
xrdbMerge = "${pkgs.xorg.xrdb}/bin/xrdb -merge ${cfg.path}";
xrdbMerge = "${lib.getExe pkgs.xrdb} -merge ${cfg.path}";
in
{

2
modules/xsession.nix
View file

@ -150,7 +150,7 @@ in
++ [ "-option ''" ]
++ map (v: "-option '${v}'") options;
in
"${pkgs.xorg.setxkbmap}/bin/setxkbmap ${toString args}";
"${lib.getExe pkgs.setxkbmap} ${toString args}";
};
};

10
tests/modules/misc/xsession/basic.nix
View file

@ -8,16 +8,6 @@
profileExtra = "profile extra commands";
};
nixpkgs.overlays = [
(self: super: {
xorg = super.xorg // {
setxkbmap = super.xorg.setxkbmap // {
outPath = "@setxkbmap@";
};
};
})
];
nmt.script = ''
assertFileExists home-files/.xprofile
assertFileContent \

10
tests/modules/misc/xsession/keyboard-without-layout.nix
View file

@ -17,16 +17,6 @@
profileExtra = "profile extra commands";
};
nixpkgs.overlays = [
(self: super: {
xorg = super.xorg // {
setxkbmap = super.xorg.setxkbmap // {
outPath = "@setxkbmap@";
};
};
})
];
nmt.script = ''
assertFileExists home-files/.config/systemd/user/setxkbmap.service
assertFileContent \

2
tests/modules/services/fusuma/expected-service.service
View file

@ -2,7 +2,7 @@
WantedBy=graphical-session.target
[Service]
Environment=PATH=@coreutils@/bin:@xdotool@/bin:@xorg.xprop@/bin
Environment=PATH=@coreutils@/bin:@xdotool@/bin:@xprop@/bin
ExecStart=@fusuma@/bin/fusuma
[Unit]

2
tests/modules/services/fusuma/service.nix
View file

@ -8,7 +8,7 @@
extraPackages = [
(config.lib.test.mkStubPackage { outPath = "@coreutils@"; })
(config.lib.test.mkStubPackage { outPath = "@xdotool@"; })
(config.lib.test.mkStubPackage { outPath = "@xorg.xprop@"; })
(config.lib.test.mkStubPackage { outPath = "@xprop@"; })
];
settings = { };
};