diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-02-03 20:37:27 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-03 20:37:27 +0800 |
| commit | 95dab32edc2e82bb8aaf81cbf41dfacbf35aa605 (patch) | |
| tree | d921e4c936eba98e6f93f401179d5c0fc00482bf /nixos | |
| parent | 4a6f352305e19ba4b683dee56948459b86a20298 (diff) | |
| parent | 4fcca9b41fd46f2c67b282c3d79abffe2a72f730 (diff) | |
| download | nixpkgs-95dab32edc2e82bb8aaf81cbf41dfacbf35aa605.tar nixpkgs-95dab32edc2e82bb8aaf81cbf41dfacbf35aa605.tar.gz nixpkgs-95dab32edc2e82bb8aaf81cbf41dfacbf35aa605.tar.bz2 nixpkgs-95dab32edc2e82bb8aaf81cbf41dfacbf35aa605.tar.lz nixpkgs-95dab32edc2e82bb8aaf81cbf41dfacbf35aa605.tar.xz nixpkgs-95dab32edc2e82bb8aaf81cbf41dfacbf35aa605.tar.zst nixpkgs-95dab32edc2e82bb8aaf81cbf41dfacbf35aa605.zip | |
Merge pull request #157716 from bobby285271/pantheon
Pantheon updates 2022-02-01
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/rename.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/services/desktops/pantheon/files.nix | 13 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 |
4 files changed, 3 insertions, 15 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1e3b8f3099b..c8b45724b3c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -356,7 +356,6 @@ ./services/desktops/cpupower-gui.nix ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix - ./services/desktops/pantheon/files.nix ./services/desktops/espanso.nix ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 31538c42219..17ec13b770a 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -60,6 +60,9 @@ with lib; (mkRemovedOptionModule [ "services" "moinmoin" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed") + (mkRemovedOptionModule [ "services" "pantheon" "files" ] '' + This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly. + '') (mkRemovedOptionModule [ "services" "prey" ] '' prey-bash-client is deprecated upstream '') diff --git a/nixos/modules/services/desktops/pantheon/files.nix b/nixos/modules/services/desktops/pantheon/files.nix deleted file mode 100644 index 8cee9f42b62..00000000000 --- a/nixos/modules/services/desktops/pantheon/files.nix +++ /dev/null @@ -1,13 +0,0 @@ -# pantheon files daemon. - -{ config, pkgs, lib, ... }: - -with lib; - -{ - - imports = [ - (mkRemovedOptionModule [ "services" "pantheon" "files" "enable" ] "Use `environment.systemPackages [ pkgs.pantheon.elementary-files ];`") - ]; - -} diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 980a6b939d5..70911e02f7e 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -224,7 +224,6 @@ in programs.file-roller.package = pkgs.pantheon.file-roller; # Settings from elementary-default-settings - environment.sessionVariables.GTK_CSD = "1"; environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini"; xdg.portal.extraPortals = with pkgs.pantheon; [ |