treewide: s/(pkgs)\.xorg\>/\1/g

5 files changed, 8 insertions, 8 deletions

diff --git a/pkgs/simple/font-size-alacritty.nix b/pkgs/simple/font-size-alacritty.nix
index d37f0f0..28e91e6 100644
--- a/pkgs/simple/font-size-alacritty.nix
+++ b/pkgs/simple/font-size-alacritty.nix
@@ -16,20 +16,20 @@ pkgs.writeDashBin "font-size-alacritty" ''
   window_id=$(${pkgs.xdotool}/bin/xdotool getactivewindow)
 
   current_size=$(
-    ${pkgs.xorg.xprop}/bin/xprop -notype -id $window_id FONT_SIZE |
+    ${pkgs.xprop}/bin/xprop -notype -id $window_id FONT_SIZE |
     ${pkgs.gnused}/bin/sed -rn 's/.* = ([0-9]+)$/\1/p'
   )
 
   # usage: set_font_size WINDOW_ID FONT_SIZE
   set_font_size() {
     ${pkgs.alacritty}/bin/alacritty msg config -w $1 font.size=$2
-    ${pkgs.xorg.xprop}/bin/xprop -id $1 -f FONT_SIZE 32c -set FONT_SIZE $2
+    ${pkgs.xprop}/bin/xprop -id $1 -f FONT_SIZE 32c -set FONT_SIZE $2
   }
 
   # usage: reset_font_size WINDOW_ID
   reset_font_size() {
     ${pkgs.alacritty}/bin/alacritty msg config -w $1 font.size=$min_size
-    ${pkgs.xorg.xprop}/bin/xprop -id $1 -remove FONT_SIZE
+    ${pkgs.xprop}/bin/xprop -id $1 -remove FONT_SIZE
   }
 
   # usage: make_next_size
diff --git a/pkgs/simple/pinentry-urxvt/default.nix b/pkgs/simple/pinentry-urxvt/default.nix
index e79b09f..ce37a98 100644
--- a/pkgs/simple/pinentry-urxvt/default.nix
+++ b/pkgs/simple/pinentry-urxvt/default.nix
@@ -59,12 +59,12 @@ in
       displayers=$(${pkgs.coreutils}/bin/mktemp -t pinentry-urxvt.$$.displayers.XXXXXXXX)
       screenshot=$(${pkgs.coreutils}/bin/mktemp -t pinentry-urxvt.$$.screenshot.XXXXXXXX)
 
-      ${pkgs.xorg.xwd}/bin/xwd -root |
+      ${pkgs.xwd}/bin/xwd -root |
       ${pkgs.imagemagick}/bin/convert xwd:- -fill \#424242 -colorize 80% xwd:"$screenshot"
 
       display_screenshot() {
         ${pkgs.exec "pinentry-urxvt.display_screenshot" {
-            filename = "${pkgs.xorg.xwud}/bin/xwud";
+            filename = "${pkgs.xwud}/bin/xwud";
             argv = [
               cfg.xwud.className
               "-noclick"
diff --git a/pkgs/simple/xextras.nix b/pkgs/simple/xextras.nix
index c9c0308..e8a3615 100644
--- a/pkgs/simple/xextras.nix
+++ b/pkgs/simple/xextras.nix
@@ -6,7 +6,7 @@ pkgs.write "xextras" {
       # SYNOPSIS
       #   net-current-desktop
       #
-      ${pkgs.xorg.xprop}/bin/xprop -notype -root 32i _NET_CURRENT_DESKTOP 8s _NET_DESKTOP_NAMES |
+      ${pkgs.xprop}/bin/xprop -notype -root 32i _NET_CURRENT_DESKTOP 8s _NET_DESKTOP_NAMES |
       ${pkgs.jq}/bin/jq -Rrs '
         split("\n") | map(select(.!="") | split(" = ") | { name: .[0], value: .[1] }) | from_entries |
         {
diff --git a/pkgs/simple/xkiller.nix b/pkgs/simple/xkiller.nix
index 9d83047..6f8326b 100644
--- a/pkgs/simple/xkiller.nix
+++ b/pkgs/simple/xkiller.nix
@@ -10,7 +10,7 @@ pkgs.writeDash "xkiller" ''
     {
       exit_code=$(
         DISPLAY=:$display ${pkgs.coreutils}/bin/timeout 1 \
-            ${pkgs.xorg.xset}/bin/xset q >/dev/null 2>&1 &&
+            ${pkgs.xset}/bin/xset q >/dev/null 2>&1 &&
             echo 0 || echo $?
       )
       if test $exit_code = 124; then
diff --git a/pkgs/simple/xtoggledpms.nix b/pkgs/simple/xtoggledpms.nix
index d164ad7..1e39a97 100644
--- a/pkgs/simple/xtoggledpms.nix
+++ b/pkgs/simple/xtoggledpms.nix
@@ -2,7 +2,7 @@
 
 let
   grep = "${pkgs.gnugrep}/bin/grep";
-  xset = "${pkgs.xorg.xset}/bin/xset";
+  xset = "${pkgs.xset}/bin/xset";
 in
 
 pkgs.writeDashBin "xtoggledpms" ''