Merge branch 'main' into cosmic

This commit is contained in:
Wroclaw 2024-03-13 11:01:15 +01:00
commit cb4d369d96
11 changed files with 294 additions and 227 deletions

View file

@ -0,0 +1,26 @@
{pkgs, lib, ... }:
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 = [
"${nixos-cosmic}/nixos/cosmic-greeter/module.nix"
];
config = {
services.xserver.desktopManager.cosmic.enable = true;
services.xserver.displayManager.cosmic-greeter.enable = true;
nixpkgs.overlays = [ cosmicPkgsOverlay ];
};
options = {
cosmic-greeter = lib.mkOption {default = pkgs.cosmic-greeter;};
};
}

View file

@ -0,0 +1,25 @@
{pkgs, ... } @ moduleArgs:
{
config = {
services.xserver.displayManager.gdm = {
enable = true;
wayland = false;
autoSuspend = false;
};
programs.dconf.profiles.gdm.databases = [{
settings = import ../dconf-common.nix moduleArgs [
"org/gnome/desktop/interface"
"org/gnome/desktop/peripherals/mouse"
"org/gnome/desktop/sound"
"org/gnome/settings-daemon/plugins/power"
"org/gnome/shell/keybindings"
];
}];
environment.systemPackages = with pkgs; [
google-cursor
];
};
}

View file

@ -0,0 +1,7 @@
{ ... }:
{
config = {
services.xserver.displayManager.sddm.enable = true;
};
}