Unverified Commit e147f2f6 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

`nixos/`: remove references to the xorg namespace (#482828)

parents b61b3e53 3e622a51

nixos/lib/systemd-lib.nix

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ let 
  inherit (lib.strings) toJSON;



  cfg = config.systemd;

  lndir = "${pkgs.buildPackages.xorg.lndir}/bin/lndir";

  lndir = "${pkgs.buildPackages.lndir}/bin/lndir";

  systemd = cfg.package;

in

rec {

nixos/modules/config/fonts/fontdir.nix

+5 −4
Original line number Diff line number Diff line
@@ -12,15 +12,16 @@ let 
    {

      runCommand,

      gzip,

      xorg,

      font-alias,

      mkfontscale,

    }:

    runCommand "X11-fonts"

      {

        preferLocalBuild = true;

        nativeBuildInputs = [

          gzip

          xorg.mkfontscale

          xorg.mkfontdir

          mkfontscale

          mkfontscale

        ];

      }

      ''
@@ -34,7 +35,7 @@ let 
        ''}

        mkfontscale

        mkfontdir

        cat $(find ${pkgs.xorg.fontalias}/ -name fonts.alias) >fonts.alias

        cat $(find ${pkgs.font-alias}/ -name fonts.alias) >fonts.alias

      ''

  ) { };

nixos/modules/hardware/video/displaylink.nix

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ in 


    # make the device available

    services.xserver.displayManager.sessionCommands = ''

      ${lib.getBin pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource 1 0

      ${lib.getBin pkgs.xrandr}/bin/xrandr --setprovideroutputsource 1 0

    '';



    # Those are taken from displaylink-installer.sh and from Arch Linux AUR package.

nixos/modules/hardware/video/nvidia.nix

+4 −4
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ in 
            lib.optional primeEnabled {

              name = igpuDriver;

              display = offloadCfg.enable;

              modules = lib.optional (igpuDriver == "amdgpu") pkgs.xorg.xf86videoamdgpu;

              modules = lib.optional (igpuDriver == "amdgpu") pkgs.xf86-video-amdgpu;

              deviceSection = ''

                BusID "${igpuBusId}"

              ''
@@ -538,7 +538,7 @@ in 
              gpuProviderName =

                if igpuDriver == "amdgpu" then

                  # find the name of the provider if amdgpu

                  "`${lib.getExe pkgs.xorg.xrandr} --listproviders | ${lib.getExe pkgs.gnugrep} -i AMD | ${lib.getExe pkgs.gnused} -n 's/^.*name://p'`"

                  "`${lib.getExe pkgs.xrandr} --listproviders | ${lib.getExe pkgs.gnugrep} -i AMD | ${lib.getExe pkgs.gnused} -n 's/^.*name://p'`"

                else

                  igpuDriver;

              providerCmdParams =
@@ -548,8 +548,8 @@ in 
              (syncCfg.enable || (reverseSyncCfg.enable && reverseSyncCfg.setupCommands.enable))

              ''

                # Added by nvidia configuration module for Optimus/PRIME.

                ${lib.getExe pkgs.xorg.xrandr} --setprovideroutputsource ${providerCmdParams}

                ${lib.getExe pkgs.xorg.xrandr} --auto

                ${lib.getExe pkgs.xrandr} --setprovideroutputsource ${providerCmdParams}

                ${lib.getExe pkgs.xrandr} --auto

              '';



          environment.etc = {

nixos/modules/programs/ssh.nix

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ in 
        "GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}"

      ]

      ++ lib.optional (!config.networking.enableIPv6) "AddressFamily inet"

      ++ lib.optional cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth"

      ++ lib.optional cfg.setXAuthLocation "XAuthLocation ${pkgs.xauth}/bin/xauth"

      ++ lib.optional (cfg.forwardX11 != null) "ForwardX11 ${lib.boolToYesNo cfg.forwardX11}"

      ++ lib.optional (

        cfg.pubkeyAcceptedKeyTypes != [ ]