diff --git a/machines/hermes.nix b/machines/hermes.nix
index e8de9a4..7290392 100644
--- a/machines/hermes.nix
+++ b/machines/hermes.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ../profiles/minimal.nix
+    ../profiles/desktop.darwin.nix
   ];
 
   environment.darwinConfig = "/Users/${config.system.primaryUser}/Development/systems";
diff --git a/machines/persephone.nix b/machines/persephone.nix
index 8d00e21..cc93ec3 100644
--- a/machines/persephone.nix
+++ b/machines/persephone.nix
@@ -16,7 +16,7 @@ in
     (modulesPath + "/installer/scan/not-detected.nix")
     ./persephone/hardware.nix
     ./persephone/networking.nix
-    ../profiles/minimal.nix
+    ../profiles/minimal.linux.nix
     ../profiles/desktop.linux.nix
   ];
 
@@ -108,7 +108,6 @@ in
     mesa-demos
   ];
 
-  programs.regreet.enable = true;
   # BOOTLOADER
   boot.bootspec.enable = true;
 
@@ -145,7 +144,6 @@ in
   };
 
   # CPU
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   hardware.enableRedistributableFirmware = true;
 
   # GPU
@@ -200,7 +198,6 @@ in
     trusted-public-keys = [ "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" ];
   };
 
-  fonts.fontconfig.enable = true;
   fonts.packages = with pkgs; [
     apple-fonts.sf-pro
     noto-fonts-cjk-sans
@@ -246,9 +243,7 @@ in
     })
   ];
 
-  # USERSPACE
-
-  programs.zsh.enable = true;
+  programs._1password.enable = true;
 
   users.users.pml = {
     isNormalUser = true;
diff --git a/profiles/desktop.darwin.nix b/profiles/desktop.darwin.nix
new file mode 100644
index 0000000..1ea63d5
--- /dev/null
+++ b/profiles/desktop.darwin.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  
+}
\ No newline at end of file
diff --git a/profiles/desktop.linux.nix b/profiles/desktop.linux.nix
index 6030dbc..7ee3c7f 100644
--- a/profiles/desktop.linux.nix
+++ b/profiles/desktop.linux.nix
@@ -1,5 +1,12 @@
-{ lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
+  inherit (lib) mkForce mkIf;
+
   sessionVariables = {
     NIXOS_OZONE_WL = "1";
   };
@@ -15,19 +22,10 @@ in
 {
   environment = {
     inherit sessionVariables systemPackages;
-
-    etc = {
-      "1password/custom_allowed_browsers" = {
-        text = ''
-          firefox
-          brave
-        '';
-        mode = "0755";
-      };
-    };
   };
 
   fonts.fontconfig = {
+    enable = true;
     antialias = true;
     hinting = {
       enable = true;
@@ -54,37 +52,49 @@ in
     };
   };
 
-  hardware.bluetooth = {
+  hardware.bluetooth = mkIf config.hardware.bluetooth.enable {
     settings = {
       General.Experimental = true;
     };
   };
 
-  programs.dconf.enable = true;
-  security.polkit.enable = true;
+  programs.dconf.enable = config.programs.niri.enable;
+  security.polkit.enable = config.programs.niri.enable;
 
-  programs._1password.enable = true;
-  programs._1password-gui = {
+  programs._1password-gui = mkIf config.programs._1password.enable {
     enable = true;
     polkitPolicyOwners = [ "pml" ];
   };
 
+  environment.etc = mkIf config.programs._1password-gui.enable {
+    "1password/custom_allowed_browsers" = {
+      text = ''
+        firefox
+        brave
+      '';
+      mode = "0755";
+    };
+  };
+
   programs.niri.enable = true;
 
   programs.regreet = {
+    enable = true;
     font.name = "SF Pro";
     font.size = 16;
     font.package = pkgs.apple-fonts.sf-pro;
     settings = {
       GTK = {
-        font_name = lib.mkForce "SF Pro 16";
+        font_name = mkForce "SF Pro 16";
       };
     };
   };
 
-  security.rtkit.enable = true;
+  programs.zsh.enable = true;
 
-  services.pipewire = {
+  security.rtkit.enable = config.services.pipewire.enable;
+
+  services.pipewire = mkIf config.services.pipewire.enable {
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
diff --git a/profiles/minimal.linux.nix b/profiles/minimal.linux.nix
new file mode 100644
index 0000000..126e7c7
--- /dev/null
+++ b/profiles/minimal.linux.nix
@@ -0,0 +1,7 @@
+{ config, lib, ... }:
+
+{
+  imports = [ ./minimal.nix ];
+
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}