nixos,flake,readme: rename options to be outside of services.xserver

lilyinstarlight · Mar 17, 2024 · 9332bcd · 9332bcd
1 parent 71fd90b
commit 9332bcd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/flake.nix b/flake.nix
@@ -67,8 +67,8 @@
                 "${builtins.toString modulesPath}/virtualisation/qemu-vm.nix"
               ];
 
-              services.xserver.desktopManager.cosmic.enable = true;
-              services.xserver.displayManager.cosmic-greeter.enable = true;
+              services.desktopManager.cosmic.enable = true;
+              services.displayManager.cosmic-greeter.enable = true;
 
               services.flatpak.enable = true;
 

diff --git a/nixos/cosmic-greeter/module.nix b/nixos/cosmic-greeter/module.nix
@@ -1,12 +1,12 @@
 { config, pkgs, lib, ... }:
 
 let
-  cfg = config.services.xserver.displayManager.cosmic-greeter;
+  cfg = config.services.displayManager.cosmic-greeter;
 in
 {
   meta.maintainers = with lib.maintainers; [ nyanbinary lilyinstarlight ];
 
-  options.services.xserver.displayManager.cosmic-greeter = {
+  options.services.displayManager.cosmic-greeter = {
     enable = lib.mkEnableOption (lib.mdDoc "COSMIC greeter");
   };
 

diff --git a/nixos/cosmic/module.nix b/nixos/cosmic/module.nix
@@ -1,13 +1,13 @@
 { config, pkgs, lib, utils, ... }:
 
 let
-  cfg = config.services.xserver.desktopManager.cosmic;
+  cfg = config.services.desktopManager.cosmic;
 in
 {
   meta.maintainers = with lib.maintainers; [ nyanbinary lilyinstarlight ];
 
   options = {
-    services.xserver.desktopManager.cosmic = {
+    services.desktopManager.cosmic = {
       enable = lib.mkEnableOption (lib.mdDoc "COSMIC desktop environment");
     };
 
@@ -23,8 +23,8 @@ in
     # seed configuration in nixos-generate-config
     system.nixos-generate-config.desktopConfiguration = [''
       # Enable the COSMIC Desktop Environment.
-      services.xserver.displayManager.cosmic-greeter.enable = true;
-      services.xserver.desktopManager.cosmic.enable = true;
+      services.displayManager.cosmic-greeter.enable = true;
+      services.desktopManager.cosmic.enable = true;
     ''];
 
     # environment packages

diff --git a/readme.md b/readme.md
@@ -39,4 +39,4 @@ If you have an existing `configuration.nix`, you can use the `nixos-cosmic` flak
 }
 ```
 
-After rebuilding with that configuration to get the binary cache substituters set up, enable COSMIC with `services.xserver.desktopManager.cosmic.enable = true` and `services.xserver.displayManager.cosmic-greeter.enable = true` in your NixOS configuration
+After rebuilding with that configuration to get the binary cache substituters set up, enable COSMIC with `services.desktopManager.cosmic.enable = true` and `services.displayManager.cosmic-greeter.enable = true` in your NixOS configuration
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     ```
-    After rebuilding with that configuration to get the binary cache substituters set up, enable COSMIC with `services.xserver.desktopManager.cosmic.enable = true` and `services.xserver.displayManager.cosmic-greeter.enable = true` in your NixOS configuration
+    After rebuilding with that configuration to get the binary cache substituters set up, enable COSMIC with `services.desktopManager.cosmic.enable = true` and `services.displayManager.cosmic-greeter.enable = true` in your NixOS configuration