From 8bb9c6586ac6ebe859f20bbeeda6a5a75d070233 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 16 Sep 2024 08:50:01 -0400 Subject: [PATCH] Added cosmic --- hosts/fwbook.nix | 26 +++++++++++++++----------- modules/nixos/desktop/cosmic.nix | 12 +++++------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 46af843..65b5b94 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -10,20 +10,24 @@ in { imports = [ ./fwbook.hardware-configuration.nix ]; # Skyg - skyg.user.enabled = true; - skyg.server.admin.enable = true; - skyg.nixos.desktop = { - enabled = true; - kde.enabled = true; - cosmic.enabled = true; - hyprland = { - enabled = true; - useNWG = false; + skyg = { + user.enabled = true; + server.admin.enable = true; + nixos = { + common.hardware.sound.enable = true; + desktop = { + enabled = true; + kde.enabled = true; + cosmic.enabled = true; + hyprland = { + enabled = true; + useNWG = false; + }; + crypto.enabled = true; + }; }; - crypto.enabled = true; }; services.displayManager.defaultSession = "plasma"; - skyg.nixos.common.hardware.sound.enable = true; # Firmware updater services.fwupd.enable = true; services.fwupd.package = (import diff --git a/modules/nixos/desktop/cosmic.nix b/modules/nixos/desktop/cosmic.nix index 7c0c321..f009593 100644 --- a/modules/nixos/desktop/cosmic.nix +++ b/modules/nixos/desktop/cosmic.nix @@ -1,18 +1,16 @@ -{ config, lib, pkgs, ... }: -with lib; - +{ config, lib, ... }: let - cfg = config.skyg.nixos.cosmic.kde; + cfg = config.skyg.nixos.desktop.cosmic; in { options = { skyg.nixos.desktop.cosmic = { - enabled = mkEnableOption + enabled = lib.mkEnableOption "Cosmic"; }; }; - config = mkIf cfg.enabled { + config = lib.mkIf cfg.enabled { services.desktopManager.cosmic.enable = true; - services.displayManager.cosmic-greeter.enable = true; + # services.displayManager.cosmic-greeter.enable = true; }; }