feat: merge desktop + desktop-minimal + calibre with sub-options

features/calibre.nix

@@ -1,22 +0,0 @@
-{
-  nixos =
-    { pkgs, ... }:
-    {
-      environment.systemPackages = [ pkgs.calibre ];
-
-      # udev rules for kindle and mtp device access
-      # NOTE:(@janezicmatej) uses services.udev.packages instead of extraRules
-      # because extraRules writes to 99-local.rules which is too late for uaccess
-      # see https://github.com/NixOS/nixpkgs/issues/308681
-      services.udev.packages = [
-        pkgs.libmtp
-        (pkgs.writeTextFile {
-          name = "kindle-udev-rules";
-          text = ''
-            ACTION!="remove", SUBSYSTEM=="usb", ATTRS{idVendor}=="1949", TAG+="uaccess"
-          '';
-          destination = "/etc/udev/rules.d/70-kindle.rules";
-        })
-      ];
-    };
-}

features/desktop-minimal.nix

@@ -1,45 +0,0 @@
-{
-  nixos =
-    { pkgs, inputs, ... }:
-    {
-      imports = [ inputs.stylix.nixosModules.stylix ];
-
-      # audio
-      services.pipewire = {
-        enable = true;
-        pulse.enable = true;
-      };
-
-      security.polkit.enable = true;
-      services.dbus.enable = true;
-      services.playerctld.enable = true;
-
-      xdg.portal = {
-        enable = true;
-        xdgOpenUsePortal = true;
-        extraPortals = [
-          pkgs.xdg-desktop-portal-wlr
-          pkgs.xdg-desktop-portal-gtk
-        ];
-      };
-
-      fonts.packages = with pkgs; [
-        font-awesome
-        nerd-fonts.jetbrains-mono
-      ];
-
-      # theming
-      stylix = {
-        enable = true;
-        polarity = "dark";
-        image = "${inputs.assets}/wallpaper.png";
-        base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-medium.yaml";
-      };
-    };
-
-  home =
-    { inputs, ... }:
-    {
-      home.file.".assets".source = inputs.assets;
-    };
-}

features/desktop.nix

@@ -1,19 +1,57 @@
 {
   nixos =
-    { pkgs, inputs, ... }:
+    { config, lib, pkgs, inputs, ... }:
+    let
+      cfg = config.features.desktop;
+    in
     {
-      imports = [ inputs.stylix.nixosModules.stylix ];
+      options.features.desktop = {
+        enable = lib.mkEnableOption "desktop environment";
 
-      # audio
+        audio.enable = lib.mkOption {
-      services.pipewire = {
+          type = lib.types.bool;
-        enable = true;
+          default = true;
-        pulse.enable = true;
         };
 
-      # bluetooth
+        bluetooth.enable = lib.mkOption {
-      hardware.bluetooth.enable = true;
+          type = lib.types.bool;
-      services.blueman.enable = true;
+          default = false;
+        };
 
+        apps.enable = lib.mkOption {
+          type = lib.types.bool;
+          default = true;
+        };
+
+        theme = {
+          wallpaper = lib.mkOption {
+            type = lib.types.path;
+            default = "${inputs.assets}/wallpaper.png";
+          };
+
+          scheme = lib.mkOption {
+            type = lib.types.str;
+            default = "gruvbox-material-dark-medium";
+          };
+
+          polarity = lib.mkOption {
+            type = lib.types.enum [
+              "dark"
+              "light"
+            ];
+            default = "dark";
+          };
+        };
+
+        internalCA.enable = lib.mkOption {
+          type = lib.types.bool;
+          default = true;
+        };
+      };
+
+      config = lib.mkIf cfg.enable (lib.mkMerge [
+        # base desktop
+        {
           security.polkit.enable = true;
           services.dbus.enable = true;
           services.playerctld.enable = true;
@@ -21,9 +59,9 @@
           xdg.portal = {
             enable = true;
             xdgOpenUsePortal = true;
-        extraPortals = [
+            extraPortals = with pkgs; [
-          pkgs.xdg-desktop-portal-wlr
+              xdg-desktop-portal-wlr
-          pkgs.xdg-desktop-portal-gtk
+              xdg-desktop-portal-gtk
             ];
           };
 
@@ -32,24 +70,41 @@
             nerd-fonts.jetbrains-mono
           ];
 
-      # theming
           stylix = {
             enable = true;
-        polarity = "dark";
+            polarity = cfg.theme.polarity;
-        image = "${inputs.assets}/wallpaper.png";
+            image = cfg.theme.wallpaper;
-        base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-medium.yaml";
+            base16Scheme = "${pkgs.base16-schemes}/share/themes/${cfg.theme.scheme}.yaml";
           };
+        }
 
+        # audio
+        (lib.mkIf cfg.audio.enable {
+          services.pipewire = {
+            enable = true;
+            pulse.enable = true;
+          };
+          environment.systemPackages = with pkgs; [
+            pavucontrol
+            easyeffects
+          ];
+        })
+
+        # bluetooth
+        (lib.mkIf cfg.bluetooth.enable {
+          hardware.bluetooth.enable = true;
+          services.blueman.enable = true;
+        })
+
+        # apps
+        (lib.mkIf cfg.apps.enable {
           programs.thunderbird.enable = true;
-      programs._1password.enable = true;
-      programs._1password-gui.enable = true;
 
           environment.systemPackages = with pkgs; [
-        easyeffects
             ghostty
             google-chrome
             zathura
-        pavucontrol
+            calibre
             bolt-launcher
             libnotify
             bibata-cursors
@@ -67,19 +122,31 @@
             ledger-live-desktop
           ];
 
-      # internal CA
-      security.pki.certificateFiles = [
-        inputs.self.outputs.packages.${pkgs.stdenv.hostPlatform.system}.ca-matheo-si
-      ];
-
           xdg.mime.defaultApplications = {
             "application/pdf" = "org.pwmt.zathura.desktop";
           };
+
+          # kindle udev rules for calibre
+          features.udev.kindle.enable = lib.mkDefault true;
+        })
+
+        # internal CA
+        (lib.mkIf cfg.internalCA.enable {
+          security.pki.certificateFiles = [
+            inputs.self.outputs.packages.${pkgs.stdenv.hostPlatform.system}.ca-matheo-si
+          ];
+        })
+      ]);
     };
 
   home =
-    { inputs, ... }:
+    { lib, inputs, osConfig, ... }:
+    let
+      cfg = osConfig.features.desktop;
+    in
     {
+      config = lib.mkIf cfg.enable {
         home.file.".assets".source = inputs.assets;
       };
+    };
 }