feat(nixos/desktop): enable desktop module by default
This commit is contained in:
parent
a654a6b9b6
commit
63b80b67ce
3 changed files with 11 additions and 4 deletions
|
@ -7,13 +7,14 @@
|
|||
}:
|
||||
let
|
||||
cfg = config.desktop;
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
upstreamCfg = osConfig.desktop;
|
||||
inherit (lib) mkMerge mkIf mkEnableOption;
|
||||
in
|
||||
{
|
||||
options.desktop = {
|
||||
wayland.enableUtils = mkEnableOption "common Wayland utilities";
|
||||
};
|
||||
config = lib.mkMerge [
|
||||
config = mkIf upstreamCfg.enable (mkMerge [
|
||||
(mkIf cfg.wayland.enableUtils {
|
||||
home.packages = with pkgs; [
|
||||
wl-clipboard-rs
|
||||
|
@ -43,5 +44,5 @@ in
|
|||
".config/sunshine"
|
||||
];
|
||||
})
|
||||
];
|
||||
]);
|
||||
}
|
||||
|
|
|
@ -4,14 +4,19 @@
|
|||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) mkEnableOption;
|
||||
inherit (lib.pantheon) mkStrOption;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./windowManager.nix
|
||||
];
|
||||
|
||||
options.desktop = {
|
||||
enable = mkEnableOption "";
|
||||
mainMonitor = {
|
||||
id = lib.pantheon.mkStrOption;
|
||||
id = mkStrOption;
|
||||
scale = lib.pantheon.mkStrOption;
|
||||
resolution = lib.pantheon.mkStrOption;
|
||||
refresh-rate = lib.pantheon.mkStrOption;
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
desktop = {
|
||||
enable = true;
|
||||
browser.firefox = {
|
||||
enable = true;
|
||||
syncedProfiles = [
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue