Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ba088e726a9a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cf05f707d88d
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 16, 2019

  1. nixos/gnome3: fix gnome-flashback 

    This session would fail to start because we didn't have it in systemd.packages
(as we've switched to systemd gnome-session).

Haven't tested custom sessions.
    @worldofpeace
    worldofpeace committed Oct 16, 2019
    Copy the full SHA
    60aedad View commit details

  2. nixos/gnome3: copy flashback gschema overrides

    @worldofpeace
    worldofpeace committed Oct 16, 2019
    Copy the full SHA
    0dbbeab View commit details

Commits on Oct 18, 2019

  1. Merge pull request #71210 from worldofpeace/fix-gnome-flashback 

    nixos/gnome3: fix gnome-flashback
    @worldofpeace
    worldofpeace authored Oct 18, 2019
    Copy the full SHA
    cf05f70 View commit details
Showing with 8 additions and 0 deletions.
  1. +8 −0 nixos/modules/services/x11/desktop-managers/gnome3.nix
8 changes: 8 additions & 0 deletions nixos/modules/services/x11/desktop-managers/gnome3.nix
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,10 @@ let
cp -f ${pkgs.gnome3.gnome-shell}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
${optionalString flashbackEnabled ''
cp -f ${pkgs.gnome3.gnome-flashback}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
''}
chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
[org.gnome.desktop.background]
@@ -176,6 +180,10 @@ in
wmCommand = "${pkgs.gnome3.metacity}/bin/metacity";
} ++ cfg.flashback.customSessions);

systemd.packages = with pkgs.gnome3; [
gnome-flashback
];

security.pam.services.gnome-screensaver = {
enableGnomeKeyring = true;
};