mac-nix

hosts/mac-nixos/configuration.nix

@@ -8,6 +8,8 @@
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
     ../default.nix
+    ./gnome
+#    ./cosmic
   ];
 
   hardware.asahi.enable = true;
@@ -15,14 +17,12 @@
   hardware.asahi.peripheralFirmwareDirectory = ./firmware;
   hardware.asahi.setupAsahiSound = true;
 
-  sound.enable = true;
-
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.systemd-boot.configurationLimit = 3;
   boot.loader.efi.canTouchEfiVariables = false;
 
-  apps.discover-wrapped.enable = true;
+  apps.discover-wrapped.enable = lib.mkDefault true;
 
   boot.extraModprobeConfig = ''
     options hid_apple iso_layout=0
@@ -32,17 +32,9 @@
   networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
 
   services = {
-    # Enable the X11 windowing system.
-    xserver = {
-      enable = true;
-
-      desktopManager.gnome.enable = false;
-      # Enable the Plasma 6 Desktop Environment.
-      displayManager.gdm.enable = false;
-    };
-
-    displayManager.sddm.enable = true;
-    desktopManager.plasma6.enable = true;
+    displayManager.sddm.wayland.enable = lib.mkDefault true;
+    displayManager.sddm.enable = lib.mkDefault true;
+    desktopManager.plasma6.enable = lib.mkDefault true;
 
     # enable auto discovery of printers
     avahi = {
@@ -52,7 +44,7 @@
     };
 
     # Enable Flatpak
-    flatpak.enable = true;
+    flatpak.enable = lib.mkDefault true;
   };
 
   # Define a user account. Don't forget to set a password with ‘passwd’.