Unverified Commit 47aa5fd2 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

nixos/{budgie,cinnamon,mate}: gcr-ssh-agent follow-ups (#416878)

parents 41ace863 4131df3b

nixos/modules/services/x11/desktop-managers/budgie.nix

+18 −10
Original line number Diff line number Diff line
@@ -130,7 +130,8 @@ in 


    services.xserver.desktopManager.budgie.sessionPath = [ pkgs.budgie-desktop-view ];



    environment.extraInit = ''

    environment.extraInit =

      ''

        ${concatMapStrings (p: ''

          if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then

            export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
@@ -140,6 +141,13 @@ in 
            export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib

          fi

        '') cfg.sessionPath}

      ''

      + lib.optionalString config.services.gnome.gcr-ssh-agent.enable ''

        # Hack: https://bugzilla.redhat.com/show_bug.cgi?id=2250704 still

        # applies to sessions not managed by systemd.

        if [ -z "$SSH_AUTH_SOCK" ] && [ -n "$XDG_RUNTIME_DIR" ]; then

          export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"

        fi

      '';



    environment.systemPackages =

nixos/modules/services/x11/desktop-managers/cinnamon.nix

+19 −11
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ in 
      };



      # Have to take care of GDM + Cinnamon on Wayland users

      environment.extraInit = ''

      environment.extraInit =

        ''

          ${concatMapStrings (p: ''

            if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then

              export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
@@ -98,6 +99,13 @@ in 
              export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib

            fi

          '') cfg.sessionPath}

        ''

        + lib.optionalString config.services.gnome.gcr-ssh-agent.enable ''

          # Hack: https://bugzilla.redhat.com/show_bug.cgi?id=2250704 still

          # applies to sessions not managed by systemd.

          if [ -z "$SSH_AUTH_SOCK" ] && [ -n "$XDG_RUNTIME_DIR" ]; then

            export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"

          fi

        '';



      # Default services

nixos/modules/services/x11/desktop-managers/mate.nix

+8 −0
Original line number Diff line number Diff line
@@ -59,6 +59,14 @@ in 
        pkgs.mate.mate-session-manager

      ];



      environment.extraInit = lib.optionalString config.services.gnome.gcr-ssh-agent.enable ''

        # Hack: https://bugzilla.redhat.com/show_bug.cgi?id=2250704 still

        # applies to sessions not managed by systemd.

        if [ -z "$SSH_AUTH_SOCK" ] && [ -n "$XDG_RUNTIME_DIR" ]; then

          export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"

        fi

      '';



      # Debugging

      environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1";

nixos/tests/budgie.nix

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ 
          cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/budgie-wm)/environ"

          machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie:GNOME'")

          machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie-desktop-with-plugins.pname}'")

          # From the nixos/budgie module

          machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")



      with subtest("Open run dialog"):

          machine.send_key("alt-f2")

nixos/tests/cinnamon-wayland.nix

+7 −0
Original line number Diff line number Diff line
@@ -58,6 +58,13 @@ 
      with subtest("Check if sessionPath option actually works"):

          machine.succeed("${eval "imports.gi.GIRepository.Repository.get_search_path\\(\\)"} | grep gpaste")



      with subtest("Check if various environment variables are set"):

          cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/nemo-desktop)/environ"

          machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'wayland'")

          machine.succeed(f"{cmd} | grep '__NIXOS_SET_ENVIRONMENT_DONE' | grep '1'")

          # From the nixos/cinnamon module

          machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")



      with subtest("Open Cinnamon Settings"):

          machine.succeed("${su "cinnamon-settings themes >&2 &"}")

          machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'cinnamon-settings'")