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

nixos/cosmic: move overlay and substituters to hosts/vm-cosmic

Browse source 
use cosmic-packages overlay
This commit is contained in:
Wroclaw 2024-08-08 07:14:07 +02:00
parent dae61508df
commit 6b1ea56d8b
3 changed files with 13 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
hosts/vm-cosmic.nix
View file

@ -1,4 +1,4 @@
{ ... }: { inputs, ... }:
{ {
imports = [ imports = [
@ -6,4 +6,12 @@
../nix-os/desktopManagers/cosmic.nix ../nix-os/desktopManagers/cosmic.nix
../nix-os/displayManagers/cosmic-greeter.nix ../nix-os/displayManagers/cosmic-greeter.nix
]; ];
config = {
nixpkgs.overlays = [(import ../pkgs/overlays/cosmic-packages.nix { inherit inputs; })];
nix.settings = {
substituters = [ "https://cosmic.cachix.org/" ];
trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
};
};
} }

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

@ -1,26 +1,10 @@
{pkgs, lib, ... }: { inputs, lib, pkgs, ... }:
let
nixos-cosmic = builtins.fetchGit {
url = "https://github.com/lilyinstarlight/nixos-cosmic.git";
# rev = "b61e7a0da2fa1d5f05d41e3db6386b2ac5f5079b";
};
cosmicPkgsMainDir = builtins.readDir "${nixos-cosmic}/pkgs";
cosmicPkgsDirs = builtins.filter (v: cosmicPkgsMainDir."${v}" == "directory") (builtins.attrNames cosmicPkgsMainDir);
cosmicPkgsOverlay = final: prev: builtins.listToAttrs (
builtins.map (v: {name = v; value = final.callPackage "${nixos-cosmic}/pkgs/${v}/package.nix" {};}) cosmicPkgsDirs
);
in
{ {
imports = [ imports = [
"${nixos-cosmic}/nixos/cosmic/module.nix" "${inputs.cosmic-modules}/nixos/cosmic/module.nix"
]; ];
config = { config = {
services.desktopManager.cosmic.enable = true; services.desktopManager.cosmic.enable = true;
nixpkgs.overlays = [ cosmicPkgsOverlay ];
nix.settings = {
substituters = [ "https://cosmic.cachix.org/" ];
trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
};
}; };
} }

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

@ -1,26 +1,10 @@
{pkgs, lib, ... }: { inputs, lib, pkgs, ... }:
let
nixos-cosmic = builtins.fetchGit {
url = "https://github.com/lilyinstarlight/nixos-cosmic.git";
# rev = "b61e7a0da2fa1d5f05d41e3db6386b2ac5f5079b";
};
cosmicPkgsMainDir = builtins.readDir "${nixos-cosmic}/pkgs";
cosmicPkgsDirs = builtins.filter (v: cosmicPkgsMainDir."${v}" == "directory") (builtins.attrNames cosmicPkgsMainDir);
cosmicPkgsOverlay = final: prev: builtins.listToAttrs (
builtins.map (v: {name = v; value = final.callPackage "${nixos-cosmic}/pkgs/${v}/package.nix" {};}) cosmicPkgsDirs
);
in
{ {
imports = [ imports = [
"${nixos-cosmic}/nixos/cosmic-greeter/module.nix" "${inputs.cosmic-modules}/nixos/cosmic-greeter/module.nix"
]; ];
config = { config = {
services.displayManager.cosmic-greeter.enable = true; services.displayManager.cosmic-greeter.enable = true;
nixpkgs.overlays = [ cosmicPkgsOverlay ];
nix.settings = {
substituters = [ "https://cosmic.cachix.org/" ];
trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
};
}; };
} }