rrvsh/pantheon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(nixos/desktop): enable desktop module by default

Browse source
This commit is contained in:
Mohammad Rafiq 2025-06-14 04:15:28 +08:00
parent a654a6b9b6
commit 63b80b67ce
No known key found for this signature in database
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/home/desktop/default.nix
View file

@ -7,13 +7,14 @@
}: }:
let let
cfg = config.desktop; cfg = config.desktop;
inherit (lib) mkIf mkEnableOption; upstreamCfg = osConfig.desktop;
inherit (lib) mkMerge mkIf mkEnableOption;
in in
{ {
options.desktop = { options.desktop = {
wayland.enableUtils = mkEnableOption "common Wayland utilities"; wayland.enableUtils = mkEnableOption "common Wayland utilities";
}; };
config = lib.mkMerge [ config = mkIf upstreamCfg.enable (mkMerge [
(mkIf cfg.wayland.enableUtils { (mkIf cfg.wayland.enableUtils {
home.packages = with pkgs; [ home.packages = with pkgs; [
wl-clipboard-rs wl-clipboard-rs
@ -43,5 +44,5 @@ in
".config/sunshine" ".config/sunshine"
]; ];
}) })
]; ]);
} }

7
modules/nixos/desktop/default.nix
View file

@ -4,14 +4,19 @@
pkgs, pkgs,
... ...
}: }:
let
inherit (lib) mkEnableOption;
inherit (lib.pantheon) mkStrOption;
in
{ {
imports = [ imports = [
./windowManager.nix ./windowManager.nix
]; ];
options.desktop = { options.desktop = {
enable = mkEnableOption "";
mainMonitor = { mainMonitor = {
id = lib.pantheon.mkStrOption; id = mkStrOption;
scale = lib.pantheon.mkStrOption; scale = lib.pantheon.mkStrOption;
resolution = lib.pantheon.mkStrOption; resolution = lib.pantheon.mkStrOption;
refresh-rate = lib.pantheon.mkStrOption; refresh-rate = lib.pantheon.mkStrOption;

1
systems/x86_64-linux/desktop.nix
View file

@ -1,5 +1,6 @@
{ {
desktop = { desktop = {
enable = true;
browser.firefox = { browser.firefox = {
enable = true; enable = true;
syncedProfiles = [ syncedProfiles = [