diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-07-23 04:53:54 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-01 19:14:31 +0200 |
commit | eb65e5ce56ab2f55ae5ee74d2fd883672a35ab42 (patch) | |
tree | cbb50f10d1501a374aa42b0c68a2031240764a72 | |
parent | f63d94eba340c05cd241c478deb518204514fce8 (diff) | |
download | nixlib-eb65e5ce56ab2f55ae5ee74d2fd883672a35ab42.tar nixlib-eb65e5ce56ab2f55ae5ee74d2fd883672a35ab42.tar.gz nixlib-eb65e5ce56ab2f55ae5ee74d2fd883672a35ab42.tar.bz2 nixlib-eb65e5ce56ab2f55ae5ee74d2fd883672a35ab42.tar.lz nixlib-eb65e5ce56ab2f55ae5ee74d2fd883672a35ab42.tar.xz nixlib-eb65e5ce56ab2f55ae5ee74d2fd883672a35ab42.tar.zst nixlib-eb65e5ce56ab2f55ae5ee74d2fd883672a35ab42.zip |
nixos/gnome3: remove session path
Global environment variables are not very Nix-y.
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 08a7af59116f..61a0c9e95d71 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -54,14 +54,6 @@ in { description = "Enable Gnome 3 desktop manager."; }; - sessionPath = mkOption { - default = []; - example = literalExample "[ pkgs.gnome3.gpaste ]"; - description = "Additional list of packages to be added to the session search path. - Useful for gnome shell extensions or gsettings-conditionated autostart."; - apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ]; - }; - extraGSettingsOverrides = mkOption { default = ""; type = types.lines; @@ -138,17 +130,6 @@ in { export XDG_MENU_PREFIX=gnome- - ${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} - fi - - if [ -d "${p}/lib/girepository-1.0" ]; then - export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0 - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib - fi - '') cfg.sessionPath} - # Override default mimeapps export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share @@ -171,7 +152,7 @@ in { environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules" "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" "${pkgs.gnome3.gvfs}/lib/gio/modules" ]; - environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath + environment.systemPackages = pkgs.gnome3.corePackages ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages) ++ [ pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ ]; |