Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pantheon cleanups #76116

Merged
merged 7 commits into from
Dec 23, 2019
Merged

Pantheon cleanups #76116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1ec2b54
nixos/pantheon/files: remove
worldofpeace Dec 20, 2019
ee75a46
nixos/pantheon: move contractor module into xservice
worldofpeace Dec 20, 2019
4fb91d1
nixos/pantheon: add an apps.enable option
worldofpeace Dec 20, 2019
4ed65a8
nixos/pantheon: don't abstract default packages to pkgs
worldofpeace Dec 20, 2019
96e711b
pantheon.wingpanel-with-indicators: have indicators argument only app…
worldofpeace Dec 20, 2019
4f49053
pantheon.switchboard-with-plugs: have plugs argument only append to …
worldofpeace Dec 20, 2019
016c589
nixos/pantheon: options for extra switchboard plugs and wingpanel ind…
worldofpeace Dec 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 1 addition & 24 deletions nixos/modules/services/desktops/pantheon/contractor.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,12 @@ with lib;

{

meta.maintainers = pkgs.pantheon.maintainers;

###### interface

options = {

services.pantheon.contractor = {

enable = mkEnableOption "contractor, a desktop-wide extension service used by pantheon";

};

};


###### implementation

config = mkIf config.services.pantheon.contractor.enable {

environment.systemPackages = with pkgs.pantheon; [
contractor
extra-elementary-contracts
];

services.dbus.packages = [ pkgs.pantheon.contractor ];

environment.pathsToLink = [
"/share/contractor"
];


};

Expand Down
31 changes: 3 additions & 28 deletions nixos/modules/services/desktops/pantheon/files.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,8 @@ with lib;

{

meta.maintainers = pkgs.pantheon.maintainers;

###### interface

options = {

services.pantheon.files = {

enable = mkEnableOption "pantheon files daemon";

};

};


###### implementation

config = mkIf config.services.pantheon.files.enable {

environment.systemPackages = [
pkgs.pantheon.elementary-files
];

services.dbus.packages = [
pkgs.pantheon.elementary-files
];

};
imports = [
(mkRemovedOptionModule [ "services" "pantheon" "files" "enable" ] "Use `environment.systemPackages [ pkgs.pantheon.elementary-files ];`")
];

}