Wroclaw/nixos-configuration
1
0
Fork 0
Code Issues Pull requests Activity

Cosmic+Cosmic greeter: Align to upstream changes

Browse source
This commit is contained in:
Wroclaw 2024-04-19 22:51:28 +02:00
parent 755958c603
commit 9fffce71cd
2 changed files with 2 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
nix-os/desktopManagers/cosmic.nix
View file

@ -16,35 +16,11 @@ in
"${nixos-cosmic}/nixos/cosmic/module.nix" "${nixos-cosmic}/nixos/cosmic/module.nix"
]; ];
config = { config = {
services.xserver.desktopManager.cosmic.enable = true; services.desktopManager.cosmic.enable = true;
nixpkgs.overlays = [ cosmicPkgsOverlay ]; nixpkgs.overlays = [ cosmicPkgsOverlay ];
nix.settings = { nix.settings = {
substituters = [ "https://cosmic.cachix.org/" ]; substituters = [ "https://cosmic.cachix.org/" ];
trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
}; };
}; };
options = {
cosmic-applets = lib.mkOption {default = pkgs.cosmic-applets;};
cosmic-applibrary = lib.mkOption {default = pkgs.cosmic-applibrary;};
cosmic-bg = lib.mkOption {default = pkgs.cosmic-bg;};
cosmic-comp = lib.mkOption {default = pkgs.cosmic-comp;};
cosmic-design-demo = lib.mkOption {default = pkgs.cosmic-design;};
cosmic-edit = lib.mkOption {default = pkgs.cosmic-edit;};
cosmic-files = lib.mkOption {default = pkgs.cosmic-files;};
cosmic-icons = lib.mkOption {default = pkgs.cosmic-icons;};
cosmic-launcher = lib.mkOption {default = pkgs.cosmic-launcher;};
cosmic-notifications = lib.mkOption {default = pkgs.cosmic-notifications;};
cosmic-osd = lib.mkOption {default = pkgs.cosmic-osd;};
cosmic-panel = lib.mkOption {default = pkgs.cosmic-panel;};
cosmic-protocols = lib.mkOption {default = pkgs.cosmic-protocols;};
cosmic-randr = lib.mkOption {default = pkgs.cosmic-randr;};
cosmic-screenshot = lib.mkOption {default = pkgs.cosmic-screenshot;};
cosmic-session = lib.mkOption {default = pkgs.cosmic-session;};
cosmic-settings = lib.mkOption {default = pkgs.cosmic-settings;};
cosmic-settings-daemon = lib.mkOption {default = pkgs.cosmic-settings;};
cosmic-term = lib.mkOption {default = pkgs.cosmic-term;};
cosmic-workspaces-epoch = lib.mkOption {default = pkgs.cosmic-workspaces;};
wrapCosmicAppsHook = lib.mkOption {default = pkgs.wrapCosmicAppsHook;};
xdg-desktop-portal-cosmic = lib.mkOption {default = pkgs.xdg-desktop-portal-cosmic;};
};
} }

6
nix-os/displayManagers/cosmic-greeter.nix
View file

@ -16,15 +16,11 @@ in
"${nixos-cosmic}/nixos/cosmic-greeter/module.nix" "${nixos-cosmic}/nixos/cosmic-greeter/module.nix"
]; ];
config = { config = {
services.xserver.desktopManager.cosmic.enable = true; services.displayManager.cosmic-greeter.enable = true;
services.xserver.displayManager.cosmic-greeter.enable = true;
nixpkgs.overlays = [ cosmicPkgsOverlay ]; nixpkgs.overlays = [ cosmicPkgsOverlay ];
nix.settings = { nix.settings = {
substituters = [ "https://cosmic.cachix.org/" ]; substituters = [ "https://cosmic.cachix.org/" ];
trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
}; };
}; };
options = {
cosmic-greeter = lib.mkOption {default = pkgs.cosmic-greeter;};
};
} }