modules/nixos+darwin: move to traits + archetypes model

1 files changed, 8 insertions, 51 deletions

diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index 12023ef..17392c4 100644
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -1,68 +1,25 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: let
   cfg = config.desktop;
 in {
-  options.desktop.enable = lib.mkEnableOption "base desktop settings";
+  options.desktop = {
+    enable = lib.mkEnableOption "desktop settings";
+  };
 
   imports = [
+    ./audio.nix
+    ./fonts.nix
+    ./programs.nix
+
     ./budgie
     ./gnome
     ./plasma
   ];
 
   config = lib.mkIf cfg.enable {
-    environment = {
-      noXlibs = lib.mkForce false;
-      systemPackages = with pkgs; [wl-clipboard xclip];
-    };
-
-    fonts = {
-      enableDefaultPackages = lib.mkDefault true;
-
-      packages = with pkgs; [
-        (nerdfonts.override {fonts = ["FiraCode" "Hack" "Noto"];})
-        noto-fonts
-        noto-fonts-extra
-        noto-fonts-color-emoji
-        noto-fonts-cjk-sans
-      ];
-
-      fontconfig = {
-        enable = lib.mkDefault true;
-        cache32Bit = true;
-        defaultFonts = lib.mkDefault {
-          serif = ["Noto Serif"];
-          sansSerif = ["Noto Sans"];
-          emoji = ["Noto Color Emoji"];
-          monospace = ["Noto Sans Mono"];
-        };
-      };
-    };
-
-    hardware.pulseaudio.enable = false;
-
-    programs = {
-      chromium.enable = lib.mkDefault true;
-      firefox.enable = lib.mkDefault true;
-      xwayland.enable = lib.mkDefault true;
-    };
-
-    services = {
-      pipewire = lib.mkDefault {
-        enable = true;
-        wireplumber.enable = true;
-        alsa.enable = true;
-        jack.enable = true;
-        pulse.enable = true;
-      };
-
-      xserver.enable = lib.mkDefault true;
-    };
-
-    xdg.portal.enable = lib.mkDefault true;
+    services.xserver.enable = true;
   };
 }