diff --git a/flake.lock b/flake.lock
index f61d2c65..7b4bbb0e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1455,11 +1455,11 @@
         "rust-overlay": "rust-overlay_4"
       },
       "locked": {
-        "lastModified": 1741627832,
-        "narHash": "sha256-/doumzI83bj7z6Bmpr1rccOVWsAWOx1L877EKGercLI=",
+        "lastModified": 1742854660,
+        "narHash": "sha256-5ZnNYxcChfYy5TkyvMiVpj++4JFE8VG1C24R9mIVU00=",
         "owner": "JakeStanger",
         "repo": "ironbar",
-        "rev": "9c7a562469feea2357c97e294b623df0fcddd2bb",
+        "rev": "355cf394465180b5ca1c423125ad2806e6a1df48",
         "type": "github"
       },
       "original": {
diff --git a/home/apps/default.nix b/home/apps/default.nix
index ea3e21ae..ca3ffe0e 100644
--- a/home/apps/default.nix
+++ b/home/apps/default.nix
@@ -18,5 +18,6 @@ lib.optionalAttrs device.hasGui {
     ./wezterm.nix
     ./zathura.nix
     ./zed.nix
+    ./gimp.nix
   ];
 }
diff --git a/home/linux/foot.nix b/home/apps/foot.nix
similarity index 94%
rename from home/linux/foot.nix
rename to home/apps/foot.nix
index c4d1a2df..28563692 100644
--- a/home/linux/foot.nix
+++ b/home/apps/foot.nix
@@ -4,7 +4,7 @@
   ...
 }: {
   programs.foot = {
-    enable = device.hasGui;
+    enable = device.hasGui && pkgs.stdenv.isLinux;
     server.enable = true;
     settings = {
       main = {
diff --git a/home/programs/gimp.nix b/home/apps/gimp.nix
similarity index 100%
rename from home/programs/gimp.nix
rename to home/apps/gimp.nix
diff --git a/home/default.nix b/home/default.nix
index 38f0c5fb..7fa7dc18 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -14,7 +14,7 @@
     ./linux
     ./programs
     ./scripts.nix
-    ./services
+    # ./services
   ];
 
   xdg.enable = true;
diff --git a/home/linux/anyrun.nix b/home/linux/anyrun.nix
index d2f601ea..b08d172e 100644
--- a/home/linux/anyrun.nix
+++ b/home/linux/anyrun.nix
@@ -7,7 +7,7 @@
 }: {
   imports = [inputs.anyrun.homeManagerModules.default];
   programs.anyrun = {
-    enable = device.hasGui;
+    enable = device.hasGui && pkgs.stdenv.isLinux;
     config = {
       plugins = with inputs.anyrun.packages.${pkgs.system}; [
         inputs.anyrun-nixos-options.packages.${pkgs.system}.default
diff --git a/home/linux/default.nix b/home/linux/default.nix
index 9f8c5cc7..08668051 100644
--- a/home/linux/default.nix
+++ b/home/linux/default.nix
@@ -1,24 +1,22 @@
 {
-  lib,
-  device,
   pkgs,
+  device,
   ...
-}:
-lib.optionalAttrs (pkgs.stdenv.isLinux && device.hasGui) {
+}: let
+  linux_gui = device.hasGui && pkgs.stdenv.isLinux;
+in {
   imports = [
     ./hyprland.nix
     ./gtk.nix
     ./anyrun.nix
     ./ironbar
-    ./foot.nix
-    ./mpd.nix
     ./gui.nix
   ];
 
-  services.kdeconnect.enable = device.hasGui;
-  services.kdeconnect.indicator = device.hasGui;
-  services.swayosd.enable = device.hasGui;
-  services.swaync.enable = device.hasGui;
+  services.kdeconnect.enable = linux_gui;
+  services.kdeconnect.indicator = linux_gui;
+  services.swayosd.enable = linux_gui;
+  services.swaync.enable = linux_gui;
   # services.nextcloud-client = {
   #   enable = device.hasGui;
   #   startInBackground = true;
diff --git a/home/linux/gtk.nix b/home/linux/gtk.nix
index 3f04cc31..4f9a3755 100644
--- a/home/linux/gtk.nix
+++ b/home/linux/gtk.nix
@@ -1,10 +1,11 @@
 {
   pkgs,
+  lib,
   device,
   ...
 }: {
   gtk = {
-    enable = true;
+    enable = device.hasGui && pkgs.stdenv.isLinux;
     theme = {
       name = "catppuccin-mocha-mauve-standard+normal";
       package = pkgs.catppuccinThemes.gtk;
@@ -32,8 +33,11 @@
     gtk3.extraConfig = {gtk-application-prefer-dark-theme = 1;};
     gtk4.extraConfig = {gtk-application-prefer-dark-theme = 1;};
   };
-  home.packages = [
-    # pkgs.catppuccinThemes.gtk
-    pkgs.catppuccinThemes.papirus-folders
-  ];
+  home.packages =
+    lib.optionals
+    (device.hasGui
+      && pkgs.stdenv.isLinux) [
+      # pkgs.catppuccinThemes.gtk
+      pkgs.catppuccinThemes.papirus-folders
+    ];
 }
diff --git a/home/linux/gui.nix b/home/linux/gui.nix
index 2d149319..56a92e3e 100644
--- a/home/linux/gui.nix
+++ b/home/linux/gui.nix
@@ -3,8 +3,7 @@
   device,
   lib,
   ...
-}:
-lib.attrsets.optionalAttrs device.hasGui {
+}: {
   systemd.user.services.onepassword-gui = lib.optionalAttrs pkgs.stdenv.isLinux {
     Unit = {
       Description = "1Password GUI";
@@ -20,10 +19,8 @@ lib.attrsets.optionalAttrs device.hasGui {
       WantedBy = ["graphical-session.target"];
     };
   };
-
   home.packages = with pkgs;
-    []
-    ++ lib.optionals device.hasGui [
+    lib.optionals pkgs.stdenv.isLinux [
       discord
       jdk
       mullvad-closest
diff --git a/home/linux/hyprland.nix b/home/linux/hyprland.nix
index aad82de8..1e4aa624 100644
--- a/home/linux/hyprland.nix
+++ b/home/linux/hyprland.nix
@@ -10,7 +10,7 @@
   programs.hyprpaper = let
     wallpapers = import ../../utils/wallhaven.nix {inherit pkgs;};
   in {
-    enable = device.hasGui;
+    enable = device.hasGui && pkgs.stdenv.isLinux;
     # enable = true;
     systemd.enable = true;
     systemd.target = "hyprland-session.target";
@@ -22,10 +22,10 @@
     };
   };
   programs.hyprlock = {
-    enable = device.hasGui;
+    enable = device.hasGui && pkgs.stdenv.isLinux;
   };
   wayland.windowManager.hyprland = {
-    enable = device.hasGui;
+    enable = device.hasGui && pkgs.stdenv.isLinux;
 
     settings = {
       source = "${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf";
diff --git a/home/linux/ironbar/default.nix b/home/linux/ironbar/default.nix
index a90aa499..3498ed9d 100644
--- a/home/linux/ironbar/default.nix
+++ b/home/linux/ironbar/default.nix
@@ -6,7 +6,7 @@
 }: {
   imports = [inputs.ironbar.homeManagerModules.default];
   programs.ironbar = {
-    enable = device.hasGui;
+    enable = device.hasGui && pkgs.stdenv.isLinux;
     config.monitors = {
       "${device.monitors.secondary}" = {
         position = "bottom";
diff --git a/home/linux/mpd.nix b/home/linux/mpd.nix
deleted file mode 100644
index 382f2c2d..00000000
--- a/home/linux/mpd.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  services.mpd = {
-    enable = true;
-  };
-}
diff --git a/home/programs/default.nix b/home/programs/default.nix
index 0181d6d4..5ba18e08 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -31,7 +31,7 @@
     # ./zellij.nix
     ./zoxide.nix
     #./template.nix
-    ./gimp.nix
+    ./mpd.nix
   ];
   home.packages = with pkgs;
     [
diff --git a/home/programs/mpd.nix b/home/programs/mpd.nix
new file mode 100644
index 00000000..b017f1a2
--- /dev/null
+++ b/home/programs/mpd.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  services.mpd = {
+    enable = pkgs.stdenv.isLinux;
+  };
+}